From 7aeb9e0ab13c09f35e60d39ea5961426561d8d94 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 15 Sep 2025 09:26:35 +0200 Subject: [PATCH 01/27] Zugferd --- SDL/Fakturierung/cFakturierung.vb | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index 08297513..6b3d9f92 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -2114,6 +2114,13 @@ Public Class cFakturierung desc.Type = InvoiceType.CreditNote End Select + + 'Die „Berechnung BT-10“ bezieht sich auf das Feld BT-10 „Buyer reference“ (Käuferreferenz) in der elektronischen Rechnung, speziell im XRechnung-Standard. Dieses Feld dient zur Angabe der Leitweg-ID + 'für öffentliche Auftraggeber oder anderer Referenzinformationen für interne Zuordnungsprozesse. + 'Die Leitweg-ID ist in Deutschland eine Pflichtangabe für elektronische Rechnungen an die Bundesverwaltung und muss vom Rechnungssteller vom Auftraggeber erhalten werden. + + desc.ReferenceOrderNo = IIf(RECHNUNG.KdAuftragsNr Is Nothing, "", RECHNUNG.KdAuftragsNr) + 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) @@ -2319,6 +2326,17 @@ Public Class cFakturierung End Select + 'Die „Berechnung BT-10“ bezieht sich auf das Feld BT-10 „Buyer reference“ (Käuferreferenz) in der elektronischen Rechnung, speziell im XRechnung-Standard. Dieses Feld dient zur Angabe der Leitweg-ID + 'für öffentliche Auftraggeber oder anderer Referenzinformationen für interne Zuordnungsprozesse. + 'Die Leitweg-ID ist in Deutschland eine Pflichtangabe für elektronische Rechnungen an die Bundesverwaltung und muss vom Rechnungssteller vom Auftraggeber erhalten werden. + + Dim BestellungsRefNr As String = "" + If ROW("KdAuftragsNr") IsNot DBNull.Value AndAlso ROW("KdAuftragsNr") <> "" Then + desc.ReferenceOrderNo = ROW("KdAuftragsNr") + Else + desc.ReferenceOrderNo = " " + End If + Dim Rechnugnsname2 As String = "" If ROW("RechnungsName 2") IsNot DBNull.Value AndAlso ROW("RechnungsName 2") <> "" Then Rechnugnsname2 = ROW("RechnungsName 2") @@ -2394,7 +2412,6 @@ Public Class cFakturierung ' Optionally, to support Peppol----------------------------- - If RE_UID <> "" Then desc.AddBuyerTaxRegistration(RE_UID, TaxRegistrationSchemeID.VA) If vatBuyer Then From 4625286e43e61d2c019a5fd3e644cc7e8bca0b31 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 18 Sep 2025 11:18:50 +0200 Subject: [PATCH 02/27] Verbuchnug von VZ bei MDM --- VERAG_PROG_ALLGEMEIN/Classes/cTrdInvoice.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cTrdInvoice.vb b/VERAG_PROG_ALLGEMEIN/Classes/cTrdInvoice.vb index d1ef0f89..85bdf3d3 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cTrdInvoice.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cTrdInvoice.vb @@ -576,7 +576,7 @@ Class TrdInvoice_FUNCTIONS If isVZ > 0 Then Select Case ROW("RP_LeistungsNr") - Case "124", "125", "126", "117", "118", "119" + Case "123", "124", "125", "126", "128", "117", "118", "119" TRD_PRODUCT.VZBetrag = TRD_PRODUCT.SteuerfreierBetragLokal Case Else From fd1f235d990e128b6f2803856ce62998f73313a7 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 19 Sep 2025 12:01:07 +0200 Subject: [PATCH 03/27] RMC Einarbeitung von EasyTrip, Sammelrechnung, Creditsafe, etc. --- SDL/Fakturierung/cAutomailversand.vb | 41 ++++++++++++++++--- SDL/Fakturierung/cFakturierung.vb | 31 ++++++++++++-- SDL/Fakturierung/frmFaktSammelRgDrucken.vb | 2 +- SDL/Formulare/KDFormulare/frmFormulare.vb | 2 +- SDL/USTV/frmMDM_USTVAntrag.vb | 16 +++++--- SDL/kunden/frmKundenblatt.Designer.vb | 4 +- VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb | 2 +- .../Creditsafe/cCreditSafeAPI.vb | 4 +- 8 files changed, 80 insertions(+), 22 deletions(-) diff --git a/SDL/Fakturierung/cAutomailversand.vb b/SDL/Fakturierung/cAutomailversand.vb index 2d5cfa8b..41c1c409 100644 --- a/SDL/Fakturierung/cAutomailversand.vb +++ b/SDL/Fakturierung/cAutomailversand.vb @@ -1,4 +1,5 @@ -Imports Microsoft.Office.Interop +Imports com.sun.tools.doclets.internal.toolkit.util +Imports Microsoft.Office.Interop Imports VERAG_PROG_ALLGEMEIN Public Class cAutomailversand @@ -256,6 +257,9 @@ Public Class cAutomailversand ATTACHMENTS.Clear() 'Rechnungsanhänge anfügen + Dim zielPfadZusammenfassung = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("Belegsanhänge", ".pdf",, False, "Zusammenfassung") + + For Each l In listPDFs ATTACHMENTS.Add(New cFakt_MailATTach(l, "")) @@ -263,12 +267,39 @@ Public Class cAutomailversand Next '----------------------------------------------------------------- If SR_DT IsNot Nothing AndAlso SR_DT.Rows.Count > 0 Then - For Each r In SR_DT.Rows + For Each r As DataRow In SR_DT.Rows Dim RG_ANH = VERAG_PROG_ALLGEMEIN.cRechnungsausgang.LOAD_ANHAENGE_LIST(r("RK_ID")) If RG_ANH IsNot Nothing Then - For Each ANH In RG_ANH - ATTACHMENTS.Add(New cFakt_MailATTach(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(ANH.dsId), ANH.Bezeichnung)) - Next + + Dim FilialenNr = IIf(Not IsDBNull(r.Item("FilialenNr")) AndAlso IsNumeric(r.Item("FilialenNr")), CInt(r.Item("FilialenNr")), 0) + + If FilialenNr = 4817 Then 'diese immer zusammenfassen! + + Dim myList As List(Of String) + + For Each ANH In RG_ANH + + Dim path = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(ANH.dsId) + If Not path.ToString.Contains("Sammelrechnung") Then + myList.Add(ANH.Bezeichnung) + Else + ATTACHMENTS.Add(New cFakt_MailATTach(path, ANH.Bezeichnung)) + End If + + Next + + If FormularManagerNEU.MergePdfFiles(myList, zielPfadZusammenfassung) Then + ATTACHMENTS.Add(New cFakt_MailATTach(zielPfadZusammenfassung, "")) + End If + + Else + For Each ANH In RG_ANH + ATTACHMENTS.Add(New cFakt_MailATTach(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(ANH.dsId), ANH.Bezeichnung)) + Next + End If + + + End If Next End If diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index 6b3d9f92..5d810b4b 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -5111,6 +5111,8 @@ Public Class cFakturierung Dim RG As New VERAG_PROG_ALLGEMEIN.cRechnungsausgang(r("RK_ID")) If RG IsNot Nothing Then RG.LOAD_ANHAENGE() + Dim PDFList As New List(Of String) + Dim mergedPDFList = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("Attachment_" & RG.RechnungsNr & ".pdf", "pdf",, False, "Zusammenfassung") For Each RG_AH In RG.ANHAENGE.Where(Function(x) x.Bezeichnung.ToLower.EndsWith(extTyp)) Select Case extTyp @@ -5123,16 +5125,30 @@ Public Class cFakturierung End If Else - If RG_AH.Bezeichnung.ToUpper.Contains("MAUT") Or RG_AH.Bezeichnung.ToUpper.Contains("DIESEL") Or RG_AH.Bezeichnung.ToUpper.Contains("INVOICE") Then + + If RG.Firma_ID = 19 AndAlso RG.Sammelrechnung = 6 AndAlso RG.FilialenNr = 4817 Then 'in diesem Fall PDFs zusammenfassen! + Dim Path = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(RG_AH.dsId) - If Not listAnh.Contains(Path) Then + If Not Path.ToString.Contains("Sammelrechnung") Then + PDFList.Add(Path) + Else + listAnh.Add(Path) + End If - If Not (listAnh.Any(Function(f) f.Contains("COPY_INVOICE")) And Path.ToUpper.Contains("COPY_INVOICE")) Then 'damit diesel IDS-Rechnung nicht doppelt hinzugefügt wird. - listAnh.Add(Path) + Else + If RG_AH.Bezeichnung.ToUpper.Contains("MAUT") Or RG_AH.Bezeichnung.ToUpper.Contains("DIESEL") Or RG_AH.Bezeichnung.ToUpper.Contains("INVOICE") Then + Dim Path = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(RG_AH.dsId) + If Not listAnh.Contains(Path) Then + + If Not (listAnh.Any(Function(f) f.Contains("COPY_INVOICE")) And Path.ToUpper.Contains("COPY_INVOICE")) Then 'damit diesel IDS-Rechnung nicht doppelt hinzugefügt wird. + listAnh.Add(Path) + + End If End If End If End If + End If @@ -5152,7 +5168,14 @@ Public Class cFakturierung Next + + If mergedPDFList.Count > 0 Then + If FormularManagerNEU.MergePdfFiles(PDFList, mergedPDFList) Then + listAnh.Add(mergedPDFList) + End If + End If End If + Next diff --git a/SDL/Fakturierung/frmFaktSammelRgDrucken.vb b/SDL/Fakturierung/frmFaktSammelRgDrucken.vb index 8856fc5c..6ab76c76 100644 --- a/SDL/Fakturierung/frmFaktSammelRgDrucken.vb +++ b/SDL/Fakturierung/frmFaktSammelRgDrucken.vb @@ -679,7 +679,7 @@ Public Class frmFaktSammelRgDrucken If MyDatagridview1.SelectedRows.Count > 0 Then - If Not vbYes = MsgBox("Möchten Sie für alle markieren Rechnungen den automatischen Emailversand JETZT versenden?" & vbNewLine & "Ansonten werden sie im Nachtlauf automatisch versendet!", vbYesNoCancel) Then Exit Sub + If Not vbYes = MsgBox("Möchten Sie für alle markieren Rechnungen den automatischen Emailversand JETZT durchführen?" & vbNewLine & "Ansonten werden sie im Nachtlauf automatisch versendet!", vbYesNoCancel) Then Exit Sub Dim fun As New cAutomailversand For Each r In MyDatagridview1.SelectedRows diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index 9029adce..5b4d3c70 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -6701,7 +6701,7 @@ Public Class FormularManagerNEU End If Finally - If document IsNot Nothing Then + If document IsNot Nothing AndAlso document.PageNumber > 0 Then document.Close() End If End Try diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 9eca60de..40e1e192 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -1039,20 +1039,24 @@ Public Class frmMDM_USTVAntrag USTV_POS.UStVPo_Schnittstelle = True USTV_POS.UStVPo_Leistungsbezeichnung = "Diesel" - Dim leistender As New cUStVLeistender("RMC Service GmbH" & " " & Antrag_LandKz, Antrag_LandKz) + Dim leist As String = "RMC Service GmbH" + + If USTV_POS.UStVPo_ReNr.ToString.ToLower.StartsWith("fit") Then leist = "Con.Tir Scar" + + Dim leistender As New cUStVLeistender(leist & " " & Antrag_LandKz, Antrag_LandKz) If leistender.UStV_LeistenderId < 1 Then - leistender = New cUStVLeistender("RMC Service GmbH") + leistender = New cUStVLeistender(leist) End If USTV_POS.UStVPo_Leistender = leistender.UStV_Leistender.ToString - - USTV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME USTV_POS.UStVPo_Zeitstempel = Now() ' Berechnungen 'von RMC bekommen wir Fremdwährung und EUR, d.b. wir können und den Umrechnungskurs selbst berechnen! + 'EasyTrip können wir nicht auslesen, deshalb geben wir immer 0,1 als Betrag mit! + Dim umrechKurs As Double = 1 If (CDbl(r.Item("rmc_betragBrutto")) <> 0 AndAlso CDbl(r.Item("rmc_euroBrutto")) <> 0) Then @@ -1072,7 +1076,7 @@ Public Class frmMDM_USTVAntrag End If If USTV_POS.INSERT() Then - cRMC.UPDATE_ARCHIV(USTV_POS.UStVPo_ReDat, USTV_POS.UStVPo_ReNr, kdNr, USTV_POS.UStVAn_ID) + cRMC.UPDATE_ARCHIV(USTV_POS.UStVPo_ReDat, USTV_POS.UStVPo_ReNr.ToString, kdNr, USTV_POS.UStVAn_ID) End If End If @@ -2135,7 +2139,7 @@ Public Class frmMDM_USTVAntrag If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") Case 7 'RMC - neue Schnittstelle - OK - sqlText = "Update [tblRMCImport] Set rmc_archiv=0, [rmc_archiviertDatum] = NULL, UStVAn_ID = NULL FROM [tblRMCImport] inner join adressen on adressen.WölflKundenNr = tblRMCImport.rmc_kdNr Where cast(rmc_reDatum as date) = '" & RechnungsDatum.ToShortDateString & "' And rmc_reNr = " & RechnungsNr & " AND adressen.AdressenNr=" & USTV_ANTRAG.UStVAn_KuNr + sqlText = "Update [tblRMCImport] Set rmc_archiv=0, [rmc_archiviertDatum] = NULL, UStVAn_ID = NULL FROM [tblRMCImport] inner join adressen on adressen.WölflKundenNr = tblRMCImport.rmc_kdNr Where cast(rmc_reDatum as date) = '" & RechnungsDatum.ToShortDateString & "' And rmc_reNr = '" & RechnungsNr & "' AND adressen.AdressenNr=" & USTV_ANTRAG.UStVAn_KuNr If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") Case 8, 12 'IDS neue Schnittstelle - OK sqlText = "update tblIDSTransactionsNew set UStVAn_ID = NULL diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index 6a430dcc..ad6c467f 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -2446,7 +2446,7 @@ Partial Class frmKundenblatt ' Me.btnFirmendatenFormularSpeichern.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnFirmendatenFormularSpeichern.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnFirmendatenFormularSpeichern.Location = New System.Drawing.Point(91, 18) + Me.btnFirmendatenFormularSpeichern.Location = New System.Drawing.Point(-1361, 18) Me.btnFirmendatenFormularSpeichern.Name = "btnFirmendatenFormularSpeichern" Me.btnFirmendatenFormularSpeichern.Size = New System.Drawing.Size(71, 52) Me.btnFirmendatenFormularSpeichern.TabIndex = 17 @@ -2724,7 +2724,7 @@ Partial Class frmKundenblatt ' Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24) Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM" - Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4 + Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8 Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4) Me.cntxtCntxtMDM.Text = "cntxtMDM" ' diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb b/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb index e0a6905e..782be058 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb @@ -196,7 +196,7 @@ Public Class cRMC End Function - Public Shared Function UPDATE_ARCHIV(reDat As Date, reNr As Integer, rmc_kdNr As Integer, UStVAn_ID As Integer) As Boolean + Public Shared Function UPDATE_ARCHIV(reDat As Date, reNr As String, rmc_kdNr As Integer, UStVAn_ID As Integer) As Boolean Try Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb index 7be67150..5f5d58d5 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb @@ -348,9 +348,9 @@ Public Class cCreditSafeAPI End Function - Shared Function AddCompaniesCSVToPortfolio(csvFilePath As String, Optional PortfolioID As String = "1662419") As String + Shared Function AddCompaniesCSVToPortfolio(csvFilePath As String, sync As Boolean, Optional PortfolioID As String = "1662419") As String - Dim myUri As String = API_STRING & "/v1/monitoring/portfolios/" & PortfolioID & "/import" 'Default + Dim myUri As String = API_STRING & "/v1/monitoring/portfolios/" & PortfolioID & IIf(sync, "/sync", "/import") 'Default Dim jsonRespString = SendGetRequestWithAuthHeader(myUri, Nothing, "application/json", "POST", token, "", True, True, csvFilePath) From 813b23bb12566de3ef1b281fb720e8256ca5e439 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 22 Sep 2025 12:26:39 +0200 Subject: [PATCH 04/27] =?UTF-8?q?Import=5FDY,=20Pr=C3=BCfung=20Belege,=20V?= =?UTF-8?q?AT=5FATEZ,=20etc.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SDL/Creditsafe/usrcntlCreditsafe.vb | 6 +- SDL/Creditsafe/usrcntlVAT_ATEZ.Designer.vb | 48 +++++++++++----- SDL/Creditsafe/usrcntlVAT_ATEZ.resx | 3 + SDL/Creditsafe/usrcntlVAT_ATEZ.vb | 8 +-- SDL/Fakturierung/frmAbrechnungsMaske.vb | 40 +++++++++---- SDL/USTV/frmMDM_USTVAntrag.vb | 32 ++++++----- SDL/USTV/ustCntlUSTV_AntragPosition.vb | 52 ++++++++++++----- SDL/kunden/frmKundenblatt.Designer.vb | 6 +- .../usrCntlFakturierung.Designer.vb | 2 +- .../Classes/cDY_Zollanmeldungen_Import.vb | 2 + .../Classes/cRechnungsausgang.vb | 57 +++++++++++-------- 11 files changed, 166 insertions(+), 90 deletions(-) diff --git a/SDL/Creditsafe/usrcntlCreditsafe.vb b/SDL/Creditsafe/usrcntlCreditsafe.vb index 767ca5cf..163c6318 100644 --- a/SDL/Creditsafe/usrcntlCreditsafe.vb +++ b/SDL/Creditsafe/usrcntlCreditsafe.vb @@ -1,8 +1,4 @@ - -Imports System.Runtime.Serialization -Imports DocumentFormat.OpenXml.Drawing.Diagrams -Imports itextsharp.text.pdf -Imports VERAG_PROG_ALLGEMEIN +Imports VERAG_PROG_ALLGEMEIN Public Class usrcntlCreditsafe diff --git a/SDL/Creditsafe/usrcntlVAT_ATEZ.Designer.vb b/SDL/Creditsafe/usrcntlVAT_ATEZ.Designer.vb index 4b4f4ad6..10a97f08 100644 --- a/SDL/Creditsafe/usrcntlVAT_ATEZ.Designer.vb +++ b/SDL/Creditsafe/usrcntlVAT_ATEZ.Designer.vb @@ -39,6 +39,8 @@ Partial Class usrcntlVAT_ATEZ Me.dgvVAT = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.cboLand = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.lblPagecount = New System.Windows.Forms.Label() + Me.CheckVatService1 = New SDL.eu.europa.ec.checkVatService() + Me.bcxOnlySetPrice = New System.Windows.Forms.CheckBox() CType(Me.dgvVAT, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -47,7 +49,7 @@ Partial Class usrcntlVAT_ATEZ Me.lblUID.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblUID.AutoSize = True Me.lblUID.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.lblUID.Location = New System.Drawing.Point(1129, 10) + Me.lblUID.Location = New System.Drawing.Point(1239, 10) Me.lblUID.Name = "lblUID" Me.lblUID.Size = New System.Drawing.Size(40, 13) Me.lblUID.TabIndex = 1 @@ -58,7 +60,7 @@ Partial Class usrcntlVAT_ATEZ ' Me.txtUID.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.txtUID.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.txtUID.Location = New System.Drawing.Point(1132, 26) + Me.txtUID.Location = New System.Drawing.Point(1242, 26) Me.txtUID.Name = "txtUID" Me.txtUID.Size = New System.Drawing.Size(134, 23) Me.txtUID.TabIndex = 3 @@ -71,7 +73,7 @@ Partial Class usrcntlVAT_ATEZ Me.txtFirma.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) Me.txtFirma.Location = New System.Drawing.Point(73, 27) Me.txtFirma.Name = "txtFirma" - Me.txtFirma.Size = New System.Drawing.Size(633, 23) + Me.txtFirma.Size = New System.Drawing.Size(743, 23) Me.txtFirma.TabIndex = 1 Me.txtFirma.Visible = False ' @@ -112,7 +114,7 @@ Partial Class usrcntlVAT_ATEZ Me.btnUebernehmen.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnUebernehmen.DialogResult = System.Windows.Forms.DialogResult.OK Me.btnUebernehmen.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnUebernehmen.Location = New System.Drawing.Point(1244, 359) + Me.btnUebernehmen.Location = New System.Drawing.Point(1354, 359) Me.btnUebernehmen.Name = "btnUebernehmen" Me.btnUebernehmen.Size = New System.Drawing.Size(136, 41) Me.btnUebernehmen.TabIndex = 9 @@ -123,7 +125,7 @@ Partial Class usrcntlVAT_ATEZ ' Me.txtStrasse.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.txtStrasse.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.txtStrasse.Location = New System.Drawing.Point(712, 27) + Me.txtStrasse.Location = New System.Drawing.Point(822, 27) Me.txtStrasse.Name = "txtStrasse" Me.txtStrasse.Size = New System.Drawing.Size(163, 23) Me.txtStrasse.TabIndex = 101 @@ -134,7 +136,7 @@ Partial Class usrcntlVAT_ATEZ Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label1.AutoSize = True Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.Label1.Location = New System.Drawing.Point(709, 11) + Me.Label1.Location = New System.Drawing.Point(819, 11) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(42, 13) Me.Label1.TabIndex = 100 @@ -145,7 +147,7 @@ Partial Class usrcntlVAT_ATEZ ' Me.txtPLZ.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.txtPLZ.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.txtPLZ.Location = New System.Drawing.Point(1042, 26) + Me.txtPLZ.Location = New System.Drawing.Point(1152, 26) Me.txtPLZ.Name = "txtPLZ" Me.txtPLZ.Size = New System.Drawing.Size(84, 23) Me.txtPLZ.TabIndex = 103 @@ -156,7 +158,7 @@ Partial Class usrcntlVAT_ATEZ Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label2.AutoSize = True Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.Label2.Location = New System.Drawing.Point(1039, 10) + Me.Label2.Location = New System.Drawing.Point(1149, 10) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(27, 13) Me.Label2.TabIndex = 102 @@ -167,7 +169,7 @@ Partial Class usrcntlVAT_ATEZ ' Me.txtOrt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.txtOrt.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.txtOrt.Location = New System.Drawing.Point(881, 26) + Me.txtOrt.Location = New System.Drawing.Point(991, 26) Me.txtOrt.Name = "txtOrt" Me.txtOrt.Size = New System.Drawing.Size(155, 23) Me.txtOrt.TabIndex = 105 @@ -178,7 +180,7 @@ Partial Class usrcntlVAT_ATEZ 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.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.Label3.Location = New System.Drawing.Point(878, 10) + Me.Label3.Location = New System.Drawing.Point(988, 10) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(21, 13) Me.Label3.TabIndex = 104 @@ -201,7 +203,7 @@ Partial Class usrcntlVAT_ATEZ Me.dgvVAT.ReadOnly = True Me.dgvVAT.RowHeadersVisible = False Me.dgvVAT.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvVAT.Size = New System.Drawing.Size(1368, 297) + Me.dgvVAT.Size = New System.Drawing.Size(1478, 297) Me.dgvVAT.TabIndex = 7 ' 'cboLand @@ -223,18 +225,36 @@ Partial Class usrcntlVAT_ATEZ Me.lblPagecount.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblPagecount.AutoSize = True Me.lblPagecount.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.lblPagecount.Location = New System.Drawing.Point(1268, 10) + Me.lblPagecount.Location = New System.Drawing.Point(1378, 10) Me.lblPagecount.Name = "lblPagecount" Me.lblPagecount.Size = New System.Drawing.Size(77, 13) Me.lblPagecount.TabIndex = 106 Me.lblPagecount.Text = "Gesamtseiten: " ' + 'CheckVatService1 + ' + Me.CheckVatService1.Credentials = Nothing + Me.CheckVatService1.Url = "http://ec.europa.eu/taxation_customs/vies/services/checkVatService" + Me.CheckVatService1.UseDefaultCredentials = False + ' + 'bcxOnlySetPrice + ' + Me.bcxOnlySetPrice.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.bcxOnlySetPrice.AutoSize = True + Me.bcxOnlySetPrice.Location = New System.Drawing.Point(1214, 372) + Me.bcxOnlySetPrice.Name = "bcxOnlySetPrice" + Me.bcxOnlySetPrice.Size = New System.Drawing.Size(115, 17) + Me.bcxOnlySetPrice.TabIndex = 107 + Me.bcxOnlySetPrice.Text = "nur Beträge setzen" + Me.bcxOnlySetPrice.UseVisualStyleBackColor = True + ' 'usrcntlVAT_ATEZ ' 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.Controls.Add(Me.bcxOnlySetPrice) Me.Controls.Add(Me.lblPagecount) Me.Controls.Add(Me.txtOrt) Me.Controls.Add(Me.Label3) @@ -252,7 +272,7 @@ Partial Class usrcntlVAT_ATEZ Me.Controls.Add(Me.txtUID) Me.Controls.Add(Me.lblUID) Me.Name = "usrcntlVAT_ATEZ" - Me.Size = New System.Drawing.Size(1398, 403) + Me.Size = New System.Drawing.Size(1508, 403) CType(Me.dgvVAT, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -274,4 +294,6 @@ Partial Class usrcntlVAT_ATEZ Friend WithEvents txtOrt As TextBox Friend WithEvents Label3 As Label Friend WithEvents lblPagecount As Label + Friend WithEvents CheckVatService1 As eu.europa.ec.checkVatService + Friend WithEvents bcxOnlySetPrice As CheckBox End Class diff --git a/SDL/Creditsafe/usrcntlVAT_ATEZ.resx b/SDL/Creditsafe/usrcntlVAT_ATEZ.resx index 1af7de15..0c892a28 100644 --- a/SDL/Creditsafe/usrcntlVAT_ATEZ.resx +++ b/SDL/Creditsafe/usrcntlVAT_ATEZ.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/SDL/Creditsafe/usrcntlVAT_ATEZ.vb b/SDL/Creditsafe/usrcntlVAT_ATEZ.vb index 2c3f8e83..4f4c900b 100644 --- a/SDL/Creditsafe/usrcntlVAT_ATEZ.vb +++ b/SDL/Creditsafe/usrcntlVAT_ATEZ.vb @@ -9,6 +9,7 @@ Public Class usrcntlVAT_ATEZ Public va As VAT Dim uidDefault As String Public createCostumer As Boolean = False + Public setAmountOnly As Boolean = False Sub New() @@ -17,8 +18,6 @@ Public Class usrcntlVAT_ATEZ End Sub - - Sub New(_UID As String, _name As String, _land As String, _PLZ As String, _Strasse As String, _Ort As String) InitializeComponent() @@ -35,8 +34,6 @@ Public Class usrcntlVAT_ATEZ Private Sub init() - - 'cboLand.changeItem(land) 'initDataTable() btnUebernehmen.Enabled = False @@ -56,6 +53,7 @@ Public Class usrcntlVAT_ATEZ End If + bcxOnlySetPrice.Checked = setAmountOnly End Sub @@ -70,6 +68,8 @@ Public Class usrcntlVAT_ATEZ Dim pageCpunterCheck = 0 + + lblPagecount.Text &= dgvVAT.Rows(0).Cells("total_pages").Value With dgvVAT diff --git a/SDL/Fakturierung/frmAbrechnungsMaske.vb b/SDL/Fakturierung/frmAbrechnungsMaske.vb index b6e3cc7d..f3ff2c8c 100644 --- a/SDL/Fakturierung/frmAbrechnungsMaske.vb +++ b/SDL/Fakturierung/frmAbrechnungsMaske.vb @@ -1,4 +1,5 @@ Imports System.IO +Imports com.sun.org.apache.xalan.internal.xsltc.compiler.util Imports Microsoft.Office.Interop Public Class frmAbrechnungsMaske @@ -201,7 +202,7 @@ Public Class frmAbrechnungsMaske ' sqlstr &= " SELECT FilialenNr, AbfertigungsNr, UnterNr, Firma_ID, Status, Sammelrechnung, Sachbearbeiter, SteuerpflichtigerGesamtbetrag, SteuerfreierGesamtbetrag, RechnungsNr, RechnungsDatum, DruckDatumZeit, Buchungsjahr, RK_ID" sqlstr &= " SELECT " & reNrSQL & " FilialenNr, AbfertigungsNr, cast(FilialenNr as varchar) + ' ' + cast(AbfertigungsNr as varchar) as PosNr,UnterNr, Firma_ID,Rechnungsausgang.Sammelrechnung as Art, [RechnungsName 1] as Rechnungsempfänger, (isnull(SteuerpflichtigerGesamtbetrag,0) + isnull(SteuerfreierGesamtbetrag,0)) as Betrag, RK_ID,RechnungsLandKz,RechnungsKundenNr" - sqlstr &= ",(CASE WHEN Rechnungsdruck =0 THEN 'POST' WHEN Rechnungsdruck=1 THEN 'FAX' WHEN Rechnungsdruck=2 THEN 'E-MAIL' WHEN Rechnungsdruck=5 THEN 'MAIL+KOPIE' ELSE '-' END) as Rechnungsdruck " + sqlstr &= ",(CASE WHEN Rechnungsdruck =0 THEN 'POST' WHEN Rechnungsdruck=1 THEN 'FAX' WHEN Rechnungsdruck=2 THEN 'E-MAIL' WHEN Rechnungsdruck=5 THEN 'MAIL+KOPIE' ELSE '-' END) as Rechnungsdruck, isnull(BelegartenKz, '') as BelegartenKz " sqlstr &= " FROM Rechnungsausgang INNER JOIN Adressen ON AdressenNr=Rechnungsausgang.RechnungsKundenNr" sqlstr &= " WHERE 1=1 " @@ -219,25 +220,42 @@ Public Class frmAbrechnungsMaske .Columns("Firma_ID").Visible = False .Columns("RechnungsLandKz").Visible = False .Columns("RechnungsKundenNr").Visible = False + .Columns("BelegartenKz").Visible = False .Columns("PosNr").HeaderText = "Pos-Nr." If cbx.Checked Then .Columns("ReNr").HeaderText = "ReNr." .Columns("UnterNr").Width = 35 - .Columns("Art").Width = 30 - .Columns("Betrag").Width = 100 - .Columns("Rechnungsempfänger").MinimumWidth = 150 - .Columns("Rechnungsempfänger").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns("Art").Width = 30 + .Columns("Betrag").Width = 100 + .Columns("Rechnungsempfänger").MinimumWidth = 150 + .Columns("Rechnungsempfänger").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + + If Not cbxGutschriftenAnVerag.Checked Then + .Columns("Rechnungsdruck").Width = 60 + .Columns("Rechnungsdruck").HeaderText = "Rg.Art" + .Columns("Rechnungsdruck").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter + End If + + + .Columns("Betrag").DefaultCellStyle.Format = "C2" + End If + + If cboFirma._value <> "" AndAlso cboFirma._value = "19" Then + + For Each r In .Rows + + If r.Cells("Betrag").Value IsNot DBNull.Value AndAlso IsNumeric(r.Cells("Betrag").Value) Then + Select Case r.Cells("BelegartenKz").Value.ToString + Case "AR" : If r.Cells("Betrag").Value < 0 Then r.DefaultCellStyle.ForeColor = Color.Red + Case "AG" : If r.Cells("Betrag").Value > 0 Then r.DefaultCellStyle.ForeColor = Color.Red + End Select - If Not cbxGutschriftenAnVerag.Checked Then - .Columns("Rechnungsdruck").Width = 60 - .Columns("Rechnungsdruck").HeaderText = "Rg.Art" - .Columns("Rechnungsdruck").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter End If + Next - .Columns("Betrag").DefaultCellStyle.Format = "C2" - End If + End If End With End Sub diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 40e1e192..e36cddcc 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -1026,7 +1026,7 @@ Public Class frmMDM_USTVAntrag USTV_POS.UStVPo_ReDat = r.Item("rmc_reDatum") USTV_POS.UStVPo_ReNr = r.Item("rmc_reNr").ToString USTV_POS.UStVPo_SchnittstellenNr = bytSchnittstellenNr - 'USTV_POS.UStVPo_daId = r.Item("rmc_daId") + USTV_POS.UStVPo_daId = r.Item("rmc_daId") If IsNumeric(USTV_POS.UStVPo_daId) AndAlso USTV_POS.UStVPo_daId > 0 Then USTV_POS.UStVPo_daId_loeschbar = False Else @@ -1041,7 +1041,10 @@ Public Class frmMDM_USTVAntrag Dim leist As String = "RMC Service GmbH" - If USTV_POS.UStVPo_ReNr.ToString.ToLower.StartsWith("fit") Then leist = "Con.Tir Scar" + If USTV_POS.UStVPo_ReNr.ToString.ToLower.StartsWith("fit") Then + leist = "Con.Tir Scar" + USTV_POS.UStVPo_Leistungsbezeichnung = "Maut" + End If Dim leistender As New cUStVLeistender(leist & " " & Antrag_LandKz, Antrag_LandKz) If leistender.UStV_LeistenderId < 1 Then @@ -1427,10 +1430,6 @@ Public Class frmMDM_USTVAntrag USTV_POS.UStVPo_Leistungsbezeichnung = "Maut/Diesel" USTV_POS.UStVPo_Schnittstelle = True - - - - If Not alreadyExists(USTV_ANTRAG.UStVAn_KuNr, USTV_ANTRAG.UStVAn_LandNr, USTV_POS) Then @@ -1473,11 +1472,6 @@ Public Class frmMDM_USTVAntrag End If - - - - - Dim leistenderName As String = r.Cells("seller_name").Value Dim leistenderUID As String = r.Cells("seller_VAT_id").Value Dim leistender As New cUStVLeistender(leistenderUID, True) @@ -3674,13 +3668,15 @@ Public Class frmMDM_USTVAntrag Select Case spracheRechnung Case "DE" : Attachmens_Bez = "Lief.-Rechn" : Attachmens_Bez_POS = "POS-Liste" - Case "EN", "TR" : Attachmens_Bez = "Supplier Invoice(s)" : Attachmens_Bez_POS = "Item List" - Case "RO" : Attachmens_Bez = "Factura furnizorului" : Attachmens_Bez_POS = "Lista articolelor" + Case "EN", "TR" : Attachmens_Bez = "Supplier-Invoice(s)" : Attachmens_Bez_POS = "Item-List" + Case "RO" : Attachmens_Bez = "Factura-furnizorului" : Attachmens_Bez_POS = "Lista-articolelor" End Select Dim path As String = PDFInvoicesPath(posID) Dim fileInfo As New FileInfo(path) - If path <> "" Then Mail.Attachments.Add(path, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue,, Attachmens_Bez & fileInfo.Extension) + If path <> "" Then + Mail.Attachments.Add(path, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue,, Attachmens_Bez & fileInfo.Extension) + End If If vbYes = MsgBox("Möchten Sie die Positionsliste an die Mail hinzufügen?", vbYesNoCancel) Then @@ -3691,7 +3687,9 @@ Public Class frmMDM_USTVAntrag Dim pathPosList As String = generatePOSListe(spedBuch, posID, False) If pathPosList <> "" Then Dim fileInfoPos As New FileInfo(pathPosList) - If pathPosList <> "" Then Mail.Attachments.Add(pathPosList, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue,, Attachmens_Bez_POS & fileInfoPos.Extension) + If pathPosList <> "" Then + Mail.Attachments.Add(pathPosList, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue,, Attachmens_Bez_POS & fileInfoPos.Extension) + End If End If End If @@ -3710,6 +3708,10 @@ Public Class frmMDM_USTVAntrag Mail.CC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(AD.AdressenNr, "Rechnung an") Mail.BCC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(AD.AdressenNr, "Rechnung an") + If Mail.To = "" Then + Mail.To &= IIf(AD.E_Mail IsNot Nothing, AD.E_Mail, "") + End If + Mail.Display() Me.Cursor = Cursors.Default Catch ex As Exception diff --git a/SDL/USTV/ustCntlUSTV_AntragPosition.vb b/SDL/USTV/ustCntlUSTV_AntragPosition.vb index d62f6ab9..6a7512a9 100644 --- a/SDL/USTV/ustCntlUSTV_AntragPosition.vb +++ b/SDL/USTV/ustCntlUSTV_AntragPosition.vb @@ -633,7 +633,15 @@ Public Class ustCntlUSTV_AntragPosition cnS_KIUPLOAD.Hide() Dim item As ToolStripMenuItem = TryCast(sender, ToolStripMenuItem) - If UStV_POS.UStVPo_daId < 1 Then Exit Sub + 'If UStV_POS.UStVPo_daId Is Nothing AndAlso UStV_POS.UStVPo_USteuerbetragEUR = 0.01 AndAlso UStV_POS.UStVPo_SchnittstellenNr = 7 Then + ' UStV_POS.UStVPo_daId = sql.getValueTxtBySql("SELECT TOP(1) [rmc_daId] FROM [tblRMCImport] where rmc_reDatum='" & UStV_POS.UStVPo_ReDat & "' and rmc_reNr='" & UStV_POS.UStVPo_ReNr & "' and rmc_landKZ='" & Antrag_LandKz & "' AND [rmc_daId] is not null", "FMZOLL",,, -1) + 'End If + + + If UStV_POS.UStVPo_daId < 1 Then + MsgBox("kein Dokument hinterlegt!") + Exit Sub + End If If item IsNot Nothing Then @@ -653,9 +661,10 @@ Public Class ustCntlUSTV_AntragPosition MsgBox("Authentifizierung fehlgeschlagen" & vbNewLine & authResp) Exit Sub Else - 'If API.SendRequestWithAuthHeader("application/json", failreDesc, "/health", "GET") = "200" Then + 'If API.SendRequestWithAuthHeader("application/json", failreDesc, "/health", "GET") = "200" Then 'document_type = vat_invoice or receipt + If API.setJsonVAT(item.Name, UStV_POS.UStVPo_daId) Then resp = API.SendRequestWithAuthHeader("application/json", failreDesc, "/process", "POST", dt, item.Name) @@ -668,15 +677,21 @@ Public Class ustCntlUSTV_AntragPosition f.usrcntlVAT_ATEZ1.btnUebernehmen.Enabled = UStV_POS.UStVPo_daId_loeschbar 'NUR ÜBERNEHMEN WENN LÖSCHBAR! f.usrcntlVAT_ATEZ1.initDGV(dt) f.usrcntlVAT_ATEZ1.setColorIndgv() + f.usrcntlVAT_ATEZ1.setAmountOnly = IIf(UStV_POS.UStVPo_SchnittstellenNr = 7, True, False) + If f.ShowDialog = DialogResult.OK Then - txtRgDatum.Text = f.usrcntlVAT_ATEZ1.va.invoice_date - txtRgNr.Text = f.usrcntlVAT_ATEZ1.va.invoice_id - txtStrasse.Text = f.usrcntlVAT_ATEZ1.va.seller_address_street - txtOrt.Text = f.usrcntlVAT_ATEZ1.va.seller_address_city - txtLand.Text = f.usrcntlVAT_ATEZ1.va.seller_address_country - txtPLZ.Text = f.usrcntlVAT_ATEZ1.va.seller_address_postcode - sbLeistender._value = f.usrcntlVAT_ATEZ1.va.seller_name + + If Not f.usrcntlVAT_ATEZ1.setAmountOnly Then + txtRgDatum.Text = f.usrcntlVAT_ATEZ1.va.invoice_date + txtRgNr.Text = f.usrcntlVAT_ATEZ1.va.invoice_id + txtStrasse.Text = f.usrcntlVAT_ATEZ1.va.seller_address_street + txtOrt.Text = f.usrcntlVAT_ATEZ1.va.seller_address_city + txtLand.Text = f.usrcntlVAT_ATEZ1.va.seller_address_country + txtPLZ.Text = f.usrcntlVAT_ATEZ1.va.seller_address_postcode + sbLeistender._value = f.usrcntlVAT_ATEZ1.va.seller_name + End If + If IsNumeric(f.usrcntlVAT_ATEZ1.va.total_VAT_amount) AndAlso f.usrcntlVAT_ATEZ1.va.total_VAT_amount <> 0 AndAlso f.usrcntlVAT_ATEZ1.va.currency <> "" Then Dim antr As New cUSTVAntrag(UStV_POS.UStVAn_ID) @@ -684,46 +699,54 @@ Public Class ustCntlUSTV_AntragPosition If f.usrcntlVAT_ATEZ1.va.currency = antr.UStVAn_Währungscode Then Dim kurs As New cEZB_Waehrungskurse(antr.UStVAn_Währungscode) If antr.UStVAn_Währungscode = "EUR" Then - UStV_POS.UStVPo_USteuerbetragEUR = f.usrcntlVAT_ATEZ1.va.total_VAT_amount + UStV_POS.UStVPo_USteuerbetragEUR = f.usrcntlVAT_ATEZ1.va.total_VAT_amount.Replace(",", ".") 'If USTV_ANTRAG.UStVAn_Währungscode <> "EUR" Then ' USTV_POS.UStVPo_USteuerbetrag = Math.Round(kurs.EXCHANGE_EURTOCUR(r.Cells("total_VAT_amount").Value, USTV_ANTRAG.UStVAn_Währungscode, CDate(USTV_POS.UStVPo_ReDat)), 2) ' USTV_POS.UStVPo_Umrechnungskurs = Math.Floor((CDbl(USTV_POS.UStVPo_USteuerbetrag) / CDbl(USTV_POS.UStVPo_USteuerbetragEUR) * 100 + 0.5)) / 100 'Else - UStV_POS.UStVPo_USteuerbetrag = f.usrcntlVAT_ATEZ1.va.total_VAT_amount + UStV_POS.UStVPo_USteuerbetrag = f.usrcntlVAT_ATEZ1.va.total_VAT_amount.Replace(",", ".") UStV_POS.UStVPo_Umrechnungskurs = 1 'End If + UStV_POS.SAVE() Else - UStV_POS.UStVPo_USteuerbetrag = f.usrcntlVAT_ATEZ1.va.total_VAT_amount + UStV_POS.UStVPo_USteuerbetrag = f.usrcntlVAT_ATEZ1.va.total_VAT_amount.Replace(",", ".") UStV_POS.UStVPo_USteuerbetragEUR = Math.Round(kurs.EXCHANGE_CURTOEUR(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, f.usrcntlVAT_ATEZ1.va.currency, CDate(UStV_POS.UStVPo_ReDat)), 2) UStV_POS.UStVPo_Umrechnungskurs = Math.Floor((CDbl(UStV_POS.UStVPo_USteuerbetrag) / CDbl(UStV_POS.UStVPo_USteuerbetragEUR) * 100 + 0.5)) / 100 + UStV_POS.SAVE() End If + + Else '2. Antragswährung <> Belegswährung (EUR zu FREMD und FREMD zu EUR) If antr.UStVAn_Währungscode = "EUR" Then Dim kurs As New cEZB_Waehrungskurse(f.usrcntlVAT_ATEZ1.va.currency) If f.usrcntlVAT_ATEZ1.va.currency <> "EUR" Then - UStV_POS.UStVPo_USteuerbetrag = f.usrcntlVAT_ATEZ1.va.total_VAT_amount + UStV_POS.UStVPo_USteuerbetrag = f.usrcntlVAT_ATEZ1.va.total_VAT_amount.Replace(",", ".") UStV_POS.UStVPo_USteuerbetragEUR = Math.Round(kurs.EXCHANGE_CURTOEUR(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, f.usrcntlVAT_ATEZ1.va.currency, CDate(UStV_POS.UStVPo_ReDat)), 2) UStV_POS.UStVPo_Umrechnungskurs = Math.Floor((CDbl(UStV_POS.UStVPo_USteuerbetrag) / CDbl(UStV_POS.UStVPo_USteuerbetragEUR) * 100 + 0.5)) / 100 + UStV_POS.SAVE() ElseIf f.usrcntlVAT_ATEZ1.va.currency = "EUR" Then UStV_POS.UStVPo_USteuerbetrag = Math.Round(kurs.EXCHANGE_EURTOCUR(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, antr.UStVAn_Währungscode, CDate(UStV_POS.UStVPo_ReDat)), 2) UStV_POS.UStVPo_USteuerbetragEUR = UStV_POS.UStVPo_USteuerbetrag UStV_POS.UStVPo_Umrechnungskurs = 1 + UStV_POS.SAVE() End If Else '2.1 Antragswährung <> Belegswährung (FREMD zu FREMD) If f.usrcntlVAT_ATEZ1.va.currency = "EUR" Then - UStV_POS.UStVPo_USteuerbetragEUR = f.usrcntlVAT_ATEZ1.va.total_VAT_amount + UStV_POS.UStVPo_USteuerbetragEUR = f.usrcntlVAT_ATEZ1.va.total_VAT_amount.Replace(",", ".") Dim kurs As New cEZB_Waehrungskurse(antr.UStVAn_Währungscode) UStV_POS.UStVPo_USteuerbetrag = Math.Round(kurs.EXCHANGE_EURTOCUR(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, antr.UStVAn_Währungscode, CDate(UStV_POS.UStVPo_ReDat)), 2) UStV_POS.UStVPo_Umrechnungskurs = Math.Floor((CDbl(UStV_POS.UStVPo_USteuerbetrag) / CDbl(UStV_POS.UStVPo_USteuerbetragEUR) * 100 + 0.5)) / 100 + UStV_POS.SAVE() Else UStV_POS.UStVPo_USteuerbetrag = VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, f.usrcntlVAT_ATEZ1.va.currency, antr.UStVAn_Währungscode) Dim kurs As New cEZB_Waehrungskurse(antr.UStVAn_Währungscode) UStV_POS.UStVPo_USteuerbetragEUR = Math.Round(kurs.EXCHANGE_CURTOEUR(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, f.usrcntlVAT_ATEZ1.va.currency, CDate(UStV_POS.UStVPo_ReDat)), 2) UStV_POS.UStVPo_Umrechnungskurs = Math.Floor((CDbl(UStV_POS.UStVPo_USteuerbetrag) / CDbl(UStV_POS.UStVPo_USteuerbetragEUR) * 100 + 0.5)) / 100 + UStV_POS.SAVE() End If @@ -735,7 +758,6 @@ Public Class ustCntlUSTV_AntragPosition End If - End If End If diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index ad6c467f..faafd0b1 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -635,7 +635,7 @@ Partial Class frmKundenblatt Me.dgvUmsaetze.RowHeadersDefaultCellStyle = DataGridViewCellStyle8 Me.dgvUmsaetze.RowHeadersVisible = False Me.dgvUmsaetze.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 836) + Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 799) Me.dgvUmsaetze.TabIndex = 182 ' 'Label13 @@ -2446,7 +2446,7 @@ Partial Class frmKundenblatt ' Me.btnFirmendatenFormularSpeichern.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnFirmendatenFormularSpeichern.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnFirmendatenFormularSpeichern.Location = New System.Drawing.Point(-1361, 18) + Me.btnFirmendatenFormularSpeichern.Location = New System.Drawing.Point(-2813, 18) Me.btnFirmendatenFormularSpeichern.Name = "btnFirmendatenFormularSpeichern" Me.btnFirmendatenFormularSpeichern.Size = New System.Drawing.Size(71, 52) Me.btnFirmendatenFormularSpeichern.TabIndex = 17 @@ -2724,7 +2724,7 @@ Partial Class frmKundenblatt ' Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24) Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM" - Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8 + Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4 Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4) Me.cntxtCntxtMDM.Text = "cntxtMDM" ' diff --git a/SDL/seriendruck/usrCntlFakturierung.Designer.vb b/SDL/seriendruck/usrCntlFakturierung.Designer.vb index dc198a55..f67d89e3 100644 --- a/SDL/seriendruck/usrCntlFakturierung.Designer.vb +++ b/SDL/seriendruck/usrCntlFakturierung.Designer.vb @@ -418,7 +418,7 @@ Partial Class usrcntlFakturierung Me.Label11.Name = "Label11" Me.Label11.Size = New System.Drawing.Size(440, 17) Me.Label11.TabIndex = 125 - Me.Label11.Text = "6. Fixe Taxe 20€ (bei Belegsumme < 500) berechnen" + Me.Label11.Text = "6. Fixe Taxe 441 (bei Belegsumme < 500) berechnen" ' 'PictureBox6 ' diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cDY_Zollanmeldungen_Import.vb b/VERAG_PROG_ALLGEMEIN/Classes/cDY_Zollanmeldungen_Import.vb index bcc2dd4e..241f0ced 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cDY_Zollanmeldungen_Import.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cDY_Zollanmeldungen_Import.vb @@ -143,6 +143,7 @@ Public Class cDY_Zollanmeldungen_Import Property UST_ID_Fiskalvertreter As Object = Nothing Property Shipmentnummer As Object = Nothing Property Importstatus As Object = Nothing + Property Importdate As Object = Nothing Public hasEntry = False @@ -297,6 +298,7 @@ Public Class cDY_Zollanmeldungen_Import list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UST_ID_Fiskalvertreter", UST_ID_Fiskalvertreter)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Shipmentnummer", Shipmentnummer)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Importstatus", Importstatus)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Importdate", Importdate)) Return list End Function diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb b/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb index 22da1c8d..dd9a7d3c 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb @@ -2,6 +2,7 @@ Imports System.Reflection Imports System.Windows.Forms Imports com.sun.org.apache.xpath.internal.operations +Imports com.sun.source.tree 'Imports DocumentFormat.OpenXml.Drawing.Charts 'Imports DocumentFormat.OpenXml.Spreadsheet @@ -525,38 +526,48 @@ Public Class cRechnungsausgang End If End If - End If + End If - If dgv Is Nothing Then - errMsg = "ERROR: Keine Positionen angegeben!" : Return False - ElseIf dgv.Rows.Count = 0 Then - errMsg = "ERROR: Keine Positionen angegeben!" : Return False - Else - If dgv.Rows.Count > 1 Then - 'Prüfung für doppelte Positionen mit PK: Bezeichnung und LeistungNr! - Dim dt As New DataTable - dt.Columns.Add("name", GetType(String)) + If dgv Is Nothing Then + errMsg = "ERROR: Keine Positionen angegeben!" : Return False + ElseIf dgv.Rows.Count = 0 Then + errMsg = "ERROR: Keine Positionen angegeben!" : Return False + Else + If dgv.Rows.Count > 1 Then + 'Prüfung für doppelte Positionen mit PK: Bezeichnung und LeistungNr! + Dim dt As New DataTable + dt.Columns.Add("name", GetType(String)) - For Each row As DataGridViewRow In dgv.Rows - Dim R As DataRow = dt.NewRow - R("name") = row.Cells(0).Value - dt.Rows.Add(R) - Next - Dim dv As New DataView(dt) - Dim distinct As DataTable = dv.ToTable(True, New String() {"name"}) - - If distinct.Rows.Count <> dt.Rows.Count Then - errMsg = "ERROR: Doppelte Positionen vorhanden!" : Return False - End If + For Each row As DataGridViewRow In dgv.Rows + Dim R As DataRow = dt.NewRow + R("name") = row.Cells(0).Value + dt.Rows.Add(R) + Next + Dim dv As New DataView(dt) + Dim distinct As DataTable = dv.ToTable(True, New String() {"name"}) + If distinct.Rows.Count <> dt.Rows.Count Then + errMsg = "ERROR: Doppelte Positionen vorhanden!" : Return False End If + End If + End If + + + If FIRMA.Firma_ID = 19 Then + + Select Case Me.BelegartenKz + Case "AR" : If (Me.SteuerfreierGesamtbetrag + Me.SteuerpflichtigerGesamtbetrag) < 0 Then errMsg = "ERROR: Vorzeichenfehler!" : Return False + Case "AG" : If (Me.SteuerfreierGesamtbetrag + Me.SteuerpflichtigerGesamtbetrag) > 0 Then errMsg = "ERROR: Vorzeichenfehler!" : Return False + End Select + End If - 'checkFirmen - Return True + 'checkFirmen + + Return True End Function Public Function SAVE_POSITIONEN(RK_ID) As Boolean From dc1255cc74cf4b86a7cbba5a2616b31dea744e42 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 22 Sep 2025 16:13:40 +0200 Subject: [PATCH 05/27] Fremdrechnungen Mailversand --- SDL/mdm/usrcntlFremdrechnungen.Designer.vb | 19 +- SDL/mdm/usrcntlFremdrechnungen.vb | 324 ++++++++++++--------- 2 files changed, 206 insertions(+), 137 deletions(-) diff --git a/SDL/mdm/usrcntlFremdrechnungen.Designer.vb b/SDL/mdm/usrcntlFremdrechnungen.Designer.vb index 6a4f5fad..ce8093cc 100644 --- a/SDL/mdm/usrcntlFremdrechnungen.Designer.vb +++ b/SDL/mdm/usrcntlFremdrechnungen.Designer.vb @@ -61,6 +61,7 @@ Partial Class usrcntlFremdrechnungen Me.cntxtExcel = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripMenuItem() + Me.cbxMailoeffnen = New System.Windows.Forms.CheckBox() Me.FlowLayoutPanel.SuspendLayout() Me.ContextMenuStrip1.SuspendLayout() Me.Panel1.SuspendLayout() @@ -274,6 +275,7 @@ Partial Class usrcntlFremdrechnungen 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.cbxMailoeffnen) Me.Panel1.Controls.Add(Me.cbxPDFhinterlegt) Me.Panel1.Controls.Add(Me.cbx) Me.Panel1.Controls.Add(Me.Label4) @@ -366,7 +368,7 @@ Partial Class usrcntlFremdrechnungen 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(200, 218) + Me.Button1.Location = New System.Drawing.Point(5, 268) Me.Button1.Name = "Button1" Me.Button1.Size = New System.Drawing.Size(50, 44) Me.Button1.TabIndex = 45 @@ -435,7 +437,7 @@ Partial Class usrcntlFremdrechnungen 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(132, 168) + Me.Button8.Location = New System.Drawing.Point(132, 218) Me.Button8.Name = "Button8" Me.Button8.Size = New System.Drawing.Size(118, 44) Me.Button8.TabIndex = 31 @@ -539,6 +541,18 @@ Partial Class usrcntlFremdrechnungen Me.ToolStripMenuItem6.Size = New System.Drawing.Size(210, 22) Me.ToolStripMenuItem6.Text = "Formatiert (dauert länger)" ' + 'cbxMailoeffnen + ' + Me.cbxMailoeffnen.AutoSize = True + Me.cbxMailoeffnen.Checked = True + Me.cbxMailoeffnen.CheckState = System.Windows.Forms.CheckState.Checked + Me.cbxMailoeffnen.Location = New System.Drawing.Point(146, 183) + Me.cbxMailoeffnen.Name = "cbxMailoeffnen" + Me.cbxMailoeffnen.Size = New System.Drawing.Size(91, 17) + Me.cbxMailoeffnen.TabIndex = 54 + Me.cbxMailoeffnen.Text = "Mail anzeigen" + Me.cbxMailoeffnen.UseVisualStyleBackColor = True + ' 'usrcntlFremdrechnungen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -600,4 +614,5 @@ Partial Class usrcntlFremdrechnungen Friend WithEvents dat_Sum_Von As DateTimePicker Friend WithEvents dgvDetails As VERAG_PROG_ALLGEMEIN.MyDatagridview Friend WithEvents cbxPDFhinterlegt As CheckBox + Friend WithEvents cbxMailoeffnen As CheckBox End Class diff --git a/SDL/mdm/usrcntlFremdrechnungen.vb b/SDL/mdm/usrcntlFremdrechnungen.vb index 9bbc93d0..2dabce6d 100644 --- a/SDL/mdm/usrcntlFremdrechnungen.vb +++ b/SDL/mdm/usrcntlFremdrechnungen.vb @@ -226,7 +226,7 @@ Public Class usrcntlFremdrechnungen 'IDS Case "IDS" : SQL_STR = "SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahlTop, "") & - " invoice_id, [YearMonthDay] as Rechnungsdatum,[Invoicenumber] as Rechnungsnummer, CustomerCode as Kundennummer,[daId],[TransactionVolume] as Transaktionsmenge,[AmminclVAT] as Bruttobetrag,[TotalNetAmount] as Nettobetrag,[VATAmount] as MWSt, cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM tblIDSInvoicesNew WHERE [CustomerCode] in (SELECT distinct([CustomerCode]) FROM [VERAG].[dbo].[tbl_IDS_Kunden] WHERE 1 = 1 AND isnull([tbl_IDS_Kunden].KdNrAlt, 0) = 0 " & sqlfehlendePDF & IIf(kdNr > 0, " AND [KdNrVERAG]=" & kdNr, "") & ") and [YearMonthDay] " & setSQLWhere(SDLNrTmp, "") & " order by [YearMonthDay] desc, [Invoicenumber]" + " invoice_id,[tbl_IDS_Kunden].KdNrVERAG as AdressenNr, [YearMonthDay] as Rechnungsdatum,[Invoicenumber] as Rechnungsnummer, tblIDSInvoicesNew.CustomerCode as Kundennummer,[daId],[TransactionVolume] as Transaktionsmenge,[AmminclVAT] as Bruttobetrag,[TotalNetAmount] as Nettobetrag,[VATAmount] as MWSt, cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM tblIDSInvoicesNew inner join [VERAG].[dbo].[tbl_IDS_Kunden] on tblIDSInvoicesNew.CustomerCode = tbl_IDS_Kunden.CustomerCode WHERE tblIDSInvoicesNew.[CustomerCode] in (SELECT distinct([CustomerCode]) FROM [VERAG].[dbo].[tbl_IDS_Kunden] WHERE 1 = 1 AND isnull([tbl_IDS_Kunden].KdNrAlt, 0) = 0 " & sqlfehlendePDF & IIf(kdNr > 0, " AND [KdNrVERAG]=" & kdNr, "") & ") and [YearMonthDay] " & setSQLWhere(SDLNrTmp, "") & " order by [YearMonthDay] desc, [Invoicenumber]" 'UTA Case "UTA" : SQL_STR = "SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahlTop, "") & @@ -252,34 +252,34 @@ Public Class usrcntlFremdrechnungen Case "ALLE" : Dim anzahl As Integer = anzahlTop / 6 : SQL_STR = " select * from (SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " --IDS - 'IDS' as Lieferant,invoice_id, [YearMonthDay] as Rechnungsdatum,[Invoicenumber] as Rechnungsnummer,CustomerCode as Kundennummer,[AmminclVAT] as Bruttobetrag,[TotalNetAmount] as Nettobetrag,[VATAmount] as MWSt,'' as Land, 'RE' as Art,[daId], cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM tblIDSInvoicesNew WHERE [CustomerCode] in (SELECT [CustomerCode] FROM [VERAG].[dbo].[tbl_IDS_Kunden] WHERE 1 = 1 and isnull([tbl_IDS_Kunden].KdNrAlt, 1) = 0 " & sqlfehlendePDF & IIf(kdNr > 0, " AND [KdNrVERAG]=" & kdNr, "") & " ) and [YearMonthDay] " & setSQLWhere("IDS", "") & " -- order by [YearMonthDay], [Invoicenumber] + 'IDS' as Lieferant,invoice_id,[tbl_IDS_Kunden].KdNrVERAG as AdressenNr, [YearMonthDay] as Rechnungsdatum,[Invoicenumber] as Rechnungsnummer,tblIDSInvoicesNew.CustomerCode as Kundennummer,[AmminclVAT] as Bruttobetrag,[TotalNetAmount] as Nettobetrag,[VATAmount] as MWSt,'' as Land, 'RE' as Art,[daId], cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM tblIDSInvoicesNew inner join [VERAG].[dbo].[tbl_IDS_Kunden] on tblIDSInvoicesNew.CustomerCode = tbl_IDS_Kunden.CustomerCode WHERE tblIDSInvoicesNew.[CustomerCode] in (SELECT [CustomerCode] FROM [VERAG].[dbo].[tbl_IDS_Kunden] WHERE 1 = 1 and isnull([tbl_IDS_Kunden].KdNrAlt, 1) = 0 " & sqlfehlendePDF & IIf(kdNr > 0, " AND [KdNrVERAG]=" & kdNr, "") & " ) and [YearMonthDay] " & setSQLWhere("IDS", "") & " -- order by [YearMonthDay], [Invoicenumber] UNION ALL --MSE - SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'MSE' as Lieferant,-1 as invoice_id, [invoice_date] as Rechnungsdatum, cast([invoice_id] as nvarchar) as Rechnungsnummer,[customer_number] as Kundennummer, [total_amount_euro] as Bruttobetrag ,(total_amount_euro - [total_vat_amount_euro]) as Nettobetrag ,[total_vat_amount_euro] as MWST,[country] as Land,'RE' as Art,daId, cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM tblMSEInvoices inner join tblMSECustomers on customer_id = [customer_number] where 1 = 1 " & sqlfehlendePDF & IIf(kdNr > 0, " AND [partner_customer_number]=" & kdNr, "") & " and [invoice_date] " & setSQLWhere("MSE", "country") & " --order by invoice_date, invoice_id + SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'MSE' as Lieferant,-1 as invoice_id,partner_customer_number as AdressenNr, [invoice_date] as Rechnungsdatum, cast([invoice_id] as nvarchar) as Rechnungsnummer,[customer_number] as Kundennummer, [total_amount_euro] as Bruttobetrag ,(total_amount_euro - [total_vat_amount_euro]) as Nettobetrag ,[total_vat_amount_euro] as MWST,[country] as Land,'RE' as Art,daId, cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM tblMSEInvoices inner join tblMSECustomers on customer_id = [customer_number] where 1 = 1 " & sqlfehlendePDF & IIf(kdNr > 0, " AND [partner_customer_number]=" & kdNr, "") & " and [invoice_date] " & setSQLWhere("MSE", "country") & " --order by invoice_date, invoice_id UNION ALL --UTA - SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'UTA' as Lieferant,-1 as invoice_id, [Rechnungsdatum],STR([Rechnungsnummer_pro_Lieferland]) as Rechnungsnummer,Kundennummer,SUM(Gesamtbetrag_Brutto_in_Darstellwährung) as Bruttobetrag,SUM(Gesamtbetrag_Netto_in_Darstellwährung) as Nettobetrag, SUM(Gesamtbetrag_Umsatzsteuer_in_Darstellwährung) as MWSt,[Lieferland_ISO2] as Land, 'RE' as Art,[daId], cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM [VERAG].[dbo].[tblUTAImportNew] inner join adressen on Kundennummer = UTAKundenNr where 1 = 1 " & sqlfehlendePDF & IIf(kdNr > 0, " AND [AdressenNr]=" & kdNr, "") & " and [Rechnungsdatum] " & setSQLWhere("UTA", "Lieferland_ISO2") & " group by [Rechnungsnummer_pro_Lieferland],[Rechnungsdatum],Kundennummer,[daId],[Lieferland_ISO2] UNION ALL SELECT 'UTA',-1, [Datum], cast([RechnungsNr] as nvarchar) ,[KundenNr],0,0,0,'',[DocumentTyp],[daId], cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM [VERAG].[dbo].[tblUTADocuments] inner join adressen on KundenNr = UTAKundenNr where AdressenNr = " & kdNr & " AND Datum " & setSQLWhere("UTA_", "") & " --order by Rechnungsnummer desc + SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'UTA' as Lieferant,-1 as invoice_id,Adressen.AdressenNr, [Rechnungsdatum],STR([Rechnungsnummer_pro_Lieferland]) as Rechnungsnummer,Kundennummer,SUM(Gesamtbetrag_Brutto_in_Darstellwährung) as Bruttobetrag,SUM(Gesamtbetrag_Netto_in_Darstellwährung) as Nettobetrag, SUM(Gesamtbetrag_Umsatzsteuer_in_Darstellwährung) as MWSt,[Lieferland_ISO2] as Land, 'RE' as Art,[daId], cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM [VERAG].[dbo].[tblUTAImportNew] inner join adressen on Kundennummer = UTAKundenNr where 1 = 1 " & sqlfehlendePDF & IIf(kdNr > 0, " AND [AdressenNr]=" & kdNr, "") & " and [Rechnungsdatum] " & setSQLWhere("UTA", "Lieferland_ISO2") & " group by [Rechnungsnummer_pro_Lieferland],[Rechnungsdatum],Kundennummer,AdressenNr,[daId],[Lieferland_ISO2] UNION ALL SELECT 'UTA',-1,AdressenNr, [Datum], cast([RechnungsNr] as nvarchar) ,[KundenNr],0,0,0,'',[DocumentTyp],[daId], cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM [VERAG].[dbo].[tblUTADocuments] inner join adressen on KundenNr = UTAKundenNr where AdressenNr = " & kdNr & " AND Datum " & setSQLWhere("UTA_", "") & " --order by Rechnungsnummer desc UNION ALL --VERAG - SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'VERAG' as Lieferant,-1 as invoice_id, tblTrdinInvoice.Rechnungsdatum, cast(tblTrdinInvoice.Rechnungsnummer as nvarchar) as Rechnungsnummer ,tblTrdinInvoice.KundenNrZentrale as Kundennummer, tblTrdinInvoice.SteuerpflichtigerBetragLokal + tblTrdinInvoice.SteuerfreierBetragLokal as Bruttobetrag ,tblTrdinInvoice.SteuerpflichtigerBetragLokal + tblTrdinInvoice.SteuerfreierBetragLokal - tblTrdinInvoice.SteuerbetragLokal as Nettobetrag ,tblTrdinInvoice.SteuerbetragLokal as MWST, 'AT' as Land, 'RE' as Art, 1 as daId, cast(1 as bit) PDFvorhanden FROM tblTrdinInvoice WHERE 1 = 1 " & IIf(kdNr > 0, " AND tblTrdinInvoice.RechnungsKundenNr=" & kdNr, "") & " and tblTrdinInvoice.Rechnungsdatum " & setSQLWhere("VERAG", "'AT'") & " AND tblTrdinInvoice.FilialenNr = 4814 --ORDER BY tblTrdinInvoice.Rechnungsdatum, tblTrdinInvoice.Rechnungsnummer + SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'VERAG' as Lieferant,-1 as invoice_id,Adressen.AdressenNr, tblTrdinInvoice.Rechnungsdatum, cast(tblTrdinInvoice.Rechnungsnummer as nvarchar) as Rechnungsnummer ,tblTrdinInvoice.KundenNrZentrale as Kundennummer, tblTrdinInvoice.SteuerpflichtigerBetragLokal + tblTrdinInvoice.SteuerfreierBetragLokal as Bruttobetrag ,tblTrdinInvoice.SteuerpflichtigerBetragLokal + tblTrdinInvoice.SteuerfreierBetragLokal - tblTrdinInvoice.SteuerbetragLokal as Nettobetrag ,tblTrdinInvoice.SteuerbetragLokal as MWST, 'AT' as Land, 'RE' as Art, 1 as daId, cast(1 as bit) PDFvorhanden FROM tblTrdinInvoice inner join Adressen on KundenNrZentrale = AdressenNr WHERE 1 = 1 " & IIf(kdNr > 0, " AND tblTrdinInvoice.RechnungsKundenNr=" & kdNr, "") & " and tblTrdinInvoice.Rechnungsdatum " & setSQLWhere("VERAG", "'AT'") & " AND tblTrdinInvoice.FilialenNr = 4814 --ORDER BY tblTrdinInvoice.Rechnungsdatum, tblTrdinInvoice.Rechnungsnummer UNION ALL --PLOSE - SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'PLOSE' as Lieferant,-1 as invoice_id, [plInv_SupplierRechnungsDatum] as Rechnungsdatum, cast([plInv_SupplierRechnungsNr] as nvarchar) as Rechnungsnummer,[plInv_PLOSEKundennummer] as Kundennummer,[plInv_Bruttobetrag] as Bruttobetrag,[plInv_Nettobetrag] as Nettobetrag,[plInv_MWSTBetrag] as MWST, [plInv_SupplierCountry] as Land, 'RE' as Art,[plInv_daId] as daId, cast(case when [plInv_daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM tblPLOSE_Inv_Data inner join Adressen on Adressen.PLOSEKundenNr = plInv_PLOSEKundennummer where 1 = 1 " & sqlfehlendePDF_PLOSE & IIf(kdNr > 0, " AND Adressen.AdressenNr=" & kdNr, "") & " and [plInv_SupplierRechnungsDatum] " & setSQLWhere("PLOSE", "plInv_SupplierCountry") & "-- Order by plInv_SupplierRechnungsDatum desc, [plInv_SupplierRechnungsNr] + SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'PLOSE' as Lieferant,-1 as invoice_id,Adressen.AdressenNr, [plInv_SupplierRechnungsDatum] as Rechnungsdatum, cast([plInv_SupplierRechnungsNr] as nvarchar) as Rechnungsnummer,[plInv_PLOSEKundennummer] as Kundennummer,[plInv_Bruttobetrag] as Bruttobetrag,[plInv_Nettobetrag] as Nettobetrag,[plInv_MWSTBetrag] as MWST, [plInv_SupplierCountry] as Land, 'RE' as Art,[plInv_daId] as daId, cast(case when [plInv_daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM tblPLOSE_Inv_Data inner join Adressen on Adressen.PLOSEKundenNr = plInv_PLOSEKundennummer where 1 = 1 " & sqlfehlendePDF_PLOSE & IIf(kdNr > 0, " AND Adressen.AdressenNr=" & kdNr, "") & " and [plInv_SupplierRechnungsDatum] " & setSQLWhere("PLOSE", "plInv_SupplierCountry") & "-- Order by plInv_SupplierRechnungsDatum desc, [plInv_SupplierRechnungsNr] UNION ALL --RMC - SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'RMC' as Lieferant,-1 as invoice_id, [rmc_reDatum] as Rechnungsdatum,cast([rmc_reNr] as nvarchar) as Rechnungsnummer,rmc_kdNr as Kundennummer ,[rmc_betragBrutto] as Bruttobetrag,[rmc_betragNetto] as Nettobetrag,[rmc_betragMWST] as MWST, rmc_landKZ as Land, 'RE' as Art, [rmc_daId] as daId, cast(case when [rmc_daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM [VERAG].[dbo].[tblRMCImport] inner join Adressen on Adressen.WölflKundenNr = rmc_kdNr where 1 = 1 " & sqlfehlendePDF_RMC & IIf(kdNr > 0, " AND AdressenNr=" & kdNr, "") & " and [rmc_reDatum] " & setSQLWhere("RMC", "rmc_landKZ") & "-- order by rmc_reDatum, rmc_reNr + SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'RMC' as Lieferant,-1 as invoice_id,Adressen.AdressenNr, [rmc_reDatum] as Rechnungsdatum,cast([rmc_reNr] as nvarchar) as Rechnungsnummer,rmc_kdNr as Kundennummer ,[rmc_betragBrutto] as Bruttobetrag,[rmc_betragNetto] as Nettobetrag,[rmc_betragMWST] as MWST, rmc_landKZ as Land, 'RE' as Art, [rmc_daId] as daId, cast(case when [rmc_daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM [VERAG].[dbo].[tblRMCImport] inner join Adressen on Adressen.WölflKundenNr = rmc_kdNr where 1 = 1 " & sqlfehlendePDF_RMC & IIf(kdNr > 0, " AND AdressenNr=" & kdNr, "") & " and [rmc_reDatum] " & setSQLWhere("RMC", "rmc_landKZ") & "-- order by rmc_reDatum, rmc_reNr ) as temp where 1=1 and temp.Rechnungsdatum" & setSQLWhere(SDLNrTmp, "temp.Land") & " order by Rechnungsdatum desc" @@ -647,163 +647,217 @@ Public Class usrcntlFremdrechnungen Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click - If dgvLFRechnung.SelectedRows.Count > 0 Then + Dim groups As New Dictionary(Of Object, List(Of DataGridViewRow)) - Dim TextHTMLtable = "" + For Each r As DataGridViewRow In dgvLFRechnung.SelectedRows + Dim key = r.Cells("AdressenNr").Value + If Not groups.ContainsKey(key) Then + groups(key) = New List(Of DataGridViewRow) + End If + groups(key).Add(r) + Next - TextHTMLtable &= "" - TextHTMLtable &= "" - - Dim pdflist As New List(Of String) - For Each row In dgvLFRechnung.SelectedRows + If aktLieferant = "ALLE" And cbxMax1000Eintrage.Checked Then + MsgBox("Entferne die MAX 1000 Einträge Beschänkung, da ansonsten können nicht alle Daten ermittelt werden!") + Exit Sub + End If - Dim Lieferant = "" + If groups.Count > 0 Then - If dgvLFRechnung.Columns.Contains("Lieferant") Then - Lieferant = row.Cells("Lieferant").Value - Else - Lieferant = aktLieferant - End If - - If Lieferant = "VERAG" Then - 'VERAG IGNORIEREN - 'Dim ReDat = row.Cells("Rechnungsdatum").Value - 'Dim ReNr = row.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 + If Not vbYes = MsgBox("Möchten Sie die Rechnungen von " & groups.Count & " Kunden per Mail verschicken? " & IIf(Not cbxMailoeffnen.Checked, vbNewLine & "Die Mails werden sofort verschickt!", ""), vbYesNoCancel) Then + Exit Sub + End If - Else + For Each kvp In groups + + Dim TextHTMLtable = "" + + TextHTMLtable &= "
SupplierCountryDate
" + TextHTMLtable &= "" + + Dim pdflist As New List(Of String) + + For Each row In kvp.Value + + + Dim Lieferant = "" + + If dgvLFRechnung.Columns.Contains("Lieferant") Then + Lieferant = row.Cells("Lieferant").Value + Else + Lieferant = aktLieferant + End If + + If Lieferant = "VERAG" Then + 'VERAG IGNORIEREN + 'Dim ReDat = row.Cells("Rechnungsdatum").Value + 'Dim ReNr = row.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 + + Else + + If Lieferant = "IDS" Then + + Dim dt As New DataTable + dt = initDGVRechnungsdetails(row.Cells("invoice_id").Value, True) + + For Each r As DataRow In dt.Rows + + TextHTMLtable &= "" + TextHTMLtable &= "" + TextHTMLtable &= "" + TextHTMLtable &= "" + TextHTMLtable &= "" + + Dim daId As Integer = IIf(IsDBNull(r.Item("daId")), -1, r.Item("daId")) + If daId > 0 Then + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(daId) + pdflist.Add(DS.GET_TOP1_PATH()) + End If + + Next - ' + Else + TextHTMLtable &= "" + TextHTMLtable &= "" + TextHTMLtable &= "" + TextHTMLtable &= "" + TextHTMLtable &= "" - If Lieferant = "IDS" Then + Dim daId As Integer = IIf(IsDBNull(row.Cells("daId").Value), -1, row.Cells("daId").Value) + If daId > 0 Then + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(daId) + pdflist.Add(DS.GET_TOP1_PATH()) + End If - Dim dt As New DataTable - dt = initDGVRechnungsdetails(row.Cells("invoice_id").value, True) - - For Each r As DataRow In dt.Rows - - TextHTMLtable &= "" - TextHTMLtable &= "" - TextHTMLtable &= "" - TextHTMLtable &= "" - TextHTMLtable &= "" - - Dim daId As Integer = IIf(IsDBNull(r.Item("daId")), -1, r.Item("daId")) - If daId > 0 Then - Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(daId) - pdflist.Add(DS.GET_TOP1_PATH()) End If + + + End If + + Next + + + TextHTMLtable &= "
SupplierCountryDate
" & Lieferant & "" & r.Item("Land") & "" & r.Item("Rechnungsdatum") & "
" & Lieferant & "" & row.Cells("Land").Value & "" & row.Cells("Rechnungsdatum").Value & "
" & Lieferant & "" & r.Item("Land") & "" & r.Item("Rechnungsdatum") & "
" + + Dim outl As New Outlook.Application + Dim Mail As Microsoft.Office.Interop.Outlook.MailItem + Mail = outl.CreateItem(0) + + Dim kundeMail As New cKunden() + kundeMail = kundenSQL.getKundeByKdNr(kvp.Key) + + Select Case kundeMail.LandKz + Case "TR" + Mail.Subject = kundeMail.Kurzname & " - ORIJINAL FATURA " + + + Mail.HTMLBody = "Bayanlar ve Baylar!,

Ekte izlere orijinal faturalarinizi gönderiyoruz.

" + + Mail.HTMLBody &= TextHTMLtable + + Mail.HTMLBody &= "


Iyi calismalar dileriz.

" + + Case "A", "AT", "D", "DE", "CH" + + Mail.Subject = kundeMail.Kurzname & " - ORIGINAL RECHNUNG " + + Mail.HTMLBody = "Sehr geehrte Damen und Herren,

im Anhang senden wir Ihnen die Originalrechnungen.

" + + Mail.HTMLBody &= TextHTMLtable + + Mail.HTMLBody &= "


Mit freundlichen Grüßen

" + Case "RO" + + Mail.Subject = kundeMail.Kurzname & " - FACTURI RETURNATE " + + Mail.HTMLBody = "Stimati domni, stimate doamne,

Va returnam facturile originale care nu au fost utilizate spre recuperare TVA.

Va multumim pentru colaborarea.

" + + Mail.HTMLBody &= TextHTMLtable + + Mail.HTMLBody &= "


Cu stima

" + + Case "HR", "BIH", "SLO", "SRB", "BIH" + Mail.Subject = kundeMail.Kurzname & " - ORGINALNI RACUNI " + + + Mail.HTMLBody = "Postovanje,

prilozeno Vam dostavljamo orginalne racune za Vasu daljnu upotrebu.

Za pitanja stojimo na raspolaganju.

" + + Mail.HTMLBody &= TextHTMLtable + + Mail.HTMLBody &= "


Srdacan pozdrav

" + + Case Else + Mail.Subject = kundeMail.Kurzname & " - Invoice No." + + Mail.HTMLBody = TextHTMLtable + + Mail.HTMLBody = "Dear Sir or Madam,

attached we send you the original invoice mentioned above.

" + + Mail.HTMLBody &= TextHTMLtable + + Mail.HTMLBody &= "


Best regards

" + + + End Select + If pdflist.Count > 0 Then + For Each pdf In pdflist + Mail.Attachments.Add(pdf, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , ) Next + End If + + Mail.To &= kundeMail.EMail + Mail.CC &= kundeMail.EMail2 + + If cbxMailoeffnen.Checked Then + + Mail.Display() + + Else + + If Mail IsNot Nothing Then + Dim API = VERAG_PROG_ALLGEMEIN.cAPI.INSERT_API(VERAG_PROG_ALLGEMEIN.cAPI_INOUT.OUT, VERAG_PROG_ALLGEMEIN.cAPI_Type.MAIL, VERAG_PROG_ALLGEMEIN.cAPI_ART.SDL_OUT_SAMMELRECHNUNG, "MAIL-ORIG-RG",,, kvp.Key) - Else - TextHTMLtable &= "" - TextHTMLtable &= "" & Lieferant & "" - TextHTMLtable &= "" & row.Cells("Land").Value & "" - TextHTMLtable &= "" & row.Cells("Rechnungsdatum").Value & "" - TextHTMLtable &= "" + API.api_EMail = Mail.To + API.api_EMailCC = Mail.CC + API.api_EMailBCC = Mail.BCC + API.api_EMailSubject = Mail.Subject + API.api_EMailText = Mail.HTMLBody + API.api_EMailAttCnt = Mail.Attachments.Count + + If Mail IsNot Nothing Then + + If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(API.api_EMail, API.api_EMailSubject, API.api_EMailText, "mmdabrechnung@verag.ag", False, False, API.api_EMailCC, API.api_EMailBCC, pdflist) Then + API.UPDTAE_OK() + + Else + API.UPDTAE_ERR() + + End If - Dim daId As Integer = IIf(IsDBNull(row.Cells("daId").Value), -1, row.Cells("daId").Value) - If daId > 0 Then - Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(daId) - pdflist.Add(DS.GET_TOP1_PATH()) End If End If - - End If - Next - - TextHTMLtable &= "" - - Dim outl As New Outlook.Application - Dim Mail As Microsoft.Office.Interop.Outlook.MailItem - Mail = outl.CreateItem(0) - - - - Select Case KUNDE.LandKz - Case "TR" - Mail.Subject = KUNDE.Kurzname & " - ORIJINAL FATURA " - - - Mail.HTMLBody = "Bayanlar ve Baylar!,

Ekte izlere orijinal faturalarinizi gönderiyoruz.

" - - Mail.HTMLBody &= TextHTMLtable - - Mail.HTMLBody &= "


Iyi calismalar dileriz.

" - - Case "A", "AT", "D", "DE", "CH" - - Mail.Subject = KUNDE.Kurzname & " - ORIGINAL RECHNUNG " - - Mail.HTMLBody = "Sehr geehrte Damen und Herren,

im Anhang senden wir Ihnen die Originalrechnungen.

" - - Mail.HTMLBody &= TextHTMLtable - - Mail.HTMLBody &= "


Mit freundlichen Grüßen

" - Case "RO" - - Mail.Subject = KUNDE.Kurzname & " - FACTURI RETURNATE " - - Mail.HTMLBody = "Stimati domni, stimate doamne,

Va returnam facturile originale care nu au fost utilizate spre recuperare TVA.

Va multumim pentru colaborarea.

" - - Mail.HTMLBody &= TextHTMLtable - - Mail.HTMLBody &= "


Cu stima

" - - Case "HR", "BIH", "SLO", "SRB", "BIH" - Mail.Subject = KUNDE.Kurzname & " - ORGINALNI RACUNI " - - - Mail.HTMLBody = "Postovanje,

prilozeno Vam dostavljamo orginalne racune za Vasu daljnu upotrebu.

Za pitanja stojimo na raspolaganju.

" - - Mail.HTMLBody &= TextHTMLtable - - Mail.HTMLBody &= "


Srdacan pozdrav

" - - Case Else - Mail.Subject = KUNDE.Kurzname & " - Invoice No." - - Mail.HTMLBody = TextHTMLtable - - Mail.HTMLBody = "Dear Sir or Madam,

attached we send you the original invoice mentioned above.

" - - Mail.HTMLBody &= TextHTMLtable - - Mail.HTMLBody &= "


Best regards

" - - - End Select - If pdflist.Count > 0 Then - For Each pdf In pdflist - Mail.Attachments.Add(pdf, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , ) Next + End If - Mail.To &= KUNDE.EMail - Mail.CC &= KUNDE.EMail2 - - - Mail.Display() - - End If - End Sub From 1a7d4f44eb1ed82b9835e1e447eba9ea47eff469 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 22 Sep 2025 17:12:33 +0200 Subject: [PATCH 06/27] Automailversand, Fremdrechnungen, etc. --- SDL/Fakturierung/cAutomailversand.vb | 2 +- SDL/mdm/usrcntlFremdrechnungen.vb | 2 +- VERAG_PROG_ALLGEMEIN/cErrorHandler.vb | 8 +++++--- VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb | 8 ++++---- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/SDL/Fakturierung/cAutomailversand.vb b/SDL/Fakturierung/cAutomailversand.vb index 41c1c409..e777b66e 100644 --- a/SDL/Fakturierung/cAutomailversand.vb +++ b/SDL/Fakturierung/cAutomailversand.vb @@ -381,7 +381,7 @@ Public Class cAutomailversand Next - If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, EMail_subject, EMail_HTML, "mmdabrechnung@verag.ag", False, False, EMails_CC, EMails_BCC, attachList) Then + If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, EMail_subject, EMail_HTML, "mmdabrechnung@verag.ag", False, False, EMails_CC, EMails_BCC, attachList,, "mmdabrechnung@verag.ag") Then API.UPDTAE_OK() mailcreated = True Else diff --git a/SDL/mdm/usrcntlFremdrechnungen.vb b/SDL/mdm/usrcntlFremdrechnungen.vb index 2dabce6d..73c43b5b 100644 --- a/SDL/mdm/usrcntlFremdrechnungen.vb +++ b/SDL/mdm/usrcntlFremdrechnungen.vb @@ -839,7 +839,7 @@ Public Class usrcntlFremdrechnungen If Mail IsNot Nothing Then - If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(API.api_EMail, API.api_EMailSubject, API.api_EMailText, "mmdabrechnung@verag.ag", False, False, API.api_EMailCC, API.api_EMailBCC, pdflist) Then + If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(API.api_EMail, API.api_EMailSubject, API.api_EMailText, "mmdabrechnung@verag.ag", False, False, API.api_EMailCC, API.api_EMailBCC, pdflist,, "mmdabrechnung@verag.ag") Then API.UPDTAE_OK() Else diff --git a/VERAG_PROG_ALLGEMEIN/cErrorHandler.vb b/VERAG_PROG_ALLGEMEIN/cErrorHandler.vb index 8369706b..82208d66 100644 --- a/VERAG_PROG_ALLGEMEIN/cErrorHandler.vb +++ b/VERAG_PROG_ALLGEMEIN/cErrorHandler.vb @@ -5,7 +5,7 @@ Imports System.Windows.Forms Public Class cErrorHandler - Public Shared Sub ERR(message As String, stack As String, functionName As String, Optional OP As String = "", Optional title As String = "", Optional mailadess As String = "error@verag.ag", Optional recieverMailAdress As String = "", Optional zusatz As String = "", Optional errCode As String = Nothing) + Public Shared Sub ERR(message As String, stack As String, functionName As String, Optional OP As String = "", Optional title As String = "", Optional mailadess As String = "error@verag.ag", Optional recieverMailAdress As String = "", Optional zusatz As String = "", Optional errCode As String = Nothing, Optional furtherMailAdress As String = "") If OP = "" Then OP = VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL ' GLobal gesetzes Errorhandling! (Standart=SHOW) 'If Form.ActiveForm IsNot Nothing Then @@ -19,7 +19,7 @@ Public Class cErrorHandler Select Case OP Case ERROR_OP.MAIL - sendERRORperMail(title & " | " & My.Application.Info.AssemblyName, message, stack, mailadess, zusatz, functionName) + sendERRORperMail(title & " | " & My.Application.Info.AssemblyName, message, stack, mailadess, zusatz, functionName, furtherMailAdress) Case ERROR_OP.SHOW Dim c As New cProgramFunctions Dim url = c.MakeScreenshot() @@ -44,7 +44,7 @@ Public Class cErrorHandler End Sub - Public Shared Sub sendERRORperMail(title, errmsg, errstack, recieverMailAdress, zusatz, functionName) + Public Shared Sub sendERRORperMail(title, errmsg, errstack, recieverMailAdress, zusatz, functionName, furtherMailAdress) Dim Msg As New MailMessage Dim myCredentials As New System.Net.NetworkCredential 'myCredentials.UserName = "support@verag.ag" @@ -66,6 +66,8 @@ Public Class cErrorHandler Msg.From = New MailAddress("edv@verag.ag") Msg.To.Add(recieverMailAdress) + If furtherMailAdress <> "" Then Msg.To.Add(furtherMailAdress) + Msg.Subject = title '"ERROR - DAKOSY Einarbeitung" Msg.Body = "Uhrzeit: " & Now.ToShortDateString & " " & Now.ToShortTimeString Msg.Body = "Function: " & functionName diff --git a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb index fb1906dc..534816d6 100644 --- a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb +++ b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb @@ -441,7 +441,7 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object( End Try End Function - Public Shared Function sendMail(eMailTo, betreff, text, Optional eMailfrom = "support@verag.ag", Optional prio = False, Optional uhrzeitAngeben = True, Optional cc = "", Optional bcc = "", Optional anhaenge = Nothing, Optional art = 0) + Public Shared Function sendMail(eMailTo, betreff, text, Optional eMailfrom = "support@verag.ag", Optional prio = False, Optional uhrzeitAngeben = True, Optional cc = "", Optional bcc = "", Optional anhaenge = Nothing, Optional art = 0, Optional furtherMailAdress = "") Dim Msg As New MailMessage Dim myCredentials As New System.Net.NetworkCredential Msg.IsBodyHtml = True @@ -549,7 +549,7 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object( Catch ex As Exception Try - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("MAIL ERROR - VOR SENDEN" & ex.Message, "TO: " & eMailTo & vbNewLine & "SUBJ: " & betreff & vbNewLine & "TXT: " & text, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("MAIL ERROR - VOR SENDEN" & ex.Message, "TO: " & eMailTo & vbNewLine & "SUBJ: " & betreff & vbNewLine & "TXT: " & text, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL,,,,, furtherMailAdress) Catch ex2 As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("MAIL ERROR - VOR SENDEN LOG! " & ex2.Message, "TO: " & eMailTo & vbNewLine & "SUBJ: " & betreff & vbNewLine & "TXT: " & text, ex2.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.LOG) End Try @@ -559,7 +559,7 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object( 'Prüfen, ob Empfänger angegeben: If Msg.To.Count = 0 And Msg.CC.Count = 0 And Msg.Bcc.Count = 0 Then - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Kein Empfänger!", "TO: " & eMailTo & vbNewLine & "SUBJ: " & betreff & vbNewLine & "TXT: " & text, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Kein Empfänger!", "TO: " & eMailTo & vbNewLine & "SUBJ: " & betreff & vbNewLine & "TXT: " & text, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL,,,,,, furtherMailAdress) Return False End If @@ -579,7 +579,7 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object( Catch ex As Exception Try 'Falls Fehler nicht beim Senden, sonder was anderes. - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "TO: " & eMailTo & vbNewLine & "SUBJ: " & betreff & vbNewLine & "TXT: " & text, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "TO: " & eMailTo & vbNewLine & "SUBJ: " & betreff & vbNewLine & "TXT: " & text, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL,,,,, furtherMailAdress) Catch ex3 As Exception End Try From b2b127c99ff78a9a0fb23a6045b59da5e8b4222d Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 22 Sep 2025 17:59:44 +0200 Subject: [PATCH 07/27] Formulare, cAutomailversand, etc. --- SDL/Fakturierung/cAutomailversand.vb | 21 ++++++++++++--------- SDL/Formulare/KDFormulare/frmFormulare.vb | 2 +- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/SDL/Fakturierung/cAutomailversand.vb b/SDL/Fakturierung/cAutomailversand.vb index e777b66e..62c18d18 100644 --- a/SDL/Fakturierung/cAutomailversand.vb +++ b/SDL/Fakturierung/cAutomailversand.vb @@ -1,4 +1,5 @@ -Imports com.sun.tools.doclets.internal.toolkit.util +Imports System.IO +Imports com.sun.tools.doclets.internal.toolkit.util Imports Microsoft.Office.Interop Imports VERAG_PROG_ALLGEMEIN @@ -149,7 +150,7 @@ Public Class cAutomailversand Next Catch ex As System.Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL,,,,,, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "d.breimaier@verag.ag", "mmdabrechnung@verag.ag")) End Try End Sub @@ -257,7 +258,7 @@ Public Class cAutomailversand ATTACHMENTS.Clear() 'Rechnungsanhänge anfügen - Dim zielPfadZusammenfassung = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("Belegsanhänge", ".pdf",, False, "Zusammenfassung") + Dim zielPfadZusammenfassung = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("Attachment", ".pdf",, False, "Zusammenfassung") For Each l In listPDFs @@ -267,6 +268,9 @@ Public Class cAutomailversand Next '----------------------------------------------------------------- If SR_DT IsNot Nothing AndAlso SR_DT.Rows.Count > 0 Then + + Dim myList As New List(Of String) + For Each r As DataRow In SR_DT.Rows Dim RG_ANH = VERAG_PROG_ALLGEMEIN.cRechnungsausgang.LOAD_ANHAENGE_LIST(r("RK_ID")) If RG_ANH IsNot Nothing Then @@ -275,13 +279,11 @@ Public Class cAutomailversand If FilialenNr = 4817 Then 'diese immer zusammenfassen! - Dim myList As List(Of String) - For Each ANH In RG_ANH Dim path = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(ANH.dsId) - If Not path.ToString.Contains("Sammelrechnung") Then - myList.Add(ANH.Bezeichnung) + If Not (path.ToString.Contains("Sammelrechnung") OrElse path.ToString.Contains("Maut") OrElse path.ToString.Contains("POS")) Then + myList.Add(path) Else ATTACHMENTS.Add(New cFakt_MailATTach(path, ANH.Bezeichnung)) End If @@ -289,7 +291,8 @@ Public Class cAutomailversand Next If FormularManagerNEU.MergePdfFiles(myList, zielPfadZusammenfassung) Then - ATTACHMENTS.Add(New cFakt_MailATTach(zielPfadZusammenfassung, "")) + Dim fileInfo As New FileInfo(zielPfadZusammenfassung) + ATTACHMENTS.Add(New cFakt_MailATTach(zielPfadZusammenfassung, fileInfo.Name)) End If Else @@ -381,7 +384,7 @@ Public Class cAutomailversand Next - If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, EMail_subject, EMail_HTML, "mmdabrechnung@verag.ag", False, False, EMails_CC, EMails_BCC, attachList,, "mmdabrechnung@verag.ag") Then + If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, EMail_subject, EMail_HTML, "mmdabrechnung@verag.ag", False, False, EMails_CC, EMails_BCC, attachList,, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "d.breimaier@verag.ag", "mmdabrechnung@verag.ag")) Then API.UPDTAE_OK() mailcreated = True Else diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index 5b4d3c70..9029adce 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -6701,7 +6701,7 @@ Public Class FormularManagerNEU End If Finally - If document IsNot Nothing AndAlso document.PageNumber > 0 Then + If document IsNot Nothing Then document.Close() End If End Try From 1df3503f8f98e95b51a9e3f6b9bb38d9c3992f2f Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 23 Sep 2025 12:58:52 +0200 Subject: [PATCH 08/27] IDS-Preise --- SDL/kunden/usrCntlIDSPreise.Designer.vb | 105 ++++- SDL/kunden/usrCntlIDSPreise.vb | 532 +++++++++++++++++++++--- 2 files changed, 547 insertions(+), 90 deletions(-) diff --git a/SDL/kunden/usrCntlIDSPreise.Designer.vb b/SDL/kunden/usrCntlIDSPreise.Designer.vb index a12e1856..067113d4 100644 --- a/SDL/kunden/usrCntlIDSPreise.Designer.vb +++ b/SDL/kunden/usrCntlIDSPreise.Designer.vb @@ -23,9 +23,8 @@ Partial Class usrCntlIDSPreise Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.lblIDS = New System.Windows.Forms.TextBox() - Me.Label11 = New System.Windows.Forms.Label() Me.dgvOfferteDetails = New System.Windows.Forms.DataGridView() Me.cntxtAddSdl = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -35,9 +34,14 @@ Partial Class usrCntlIDSPreise Me.cbxTypes = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.btnCloseEditMode = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.lblEditMode = New System.Windows.Forms.Label() + Me.btnKunde = New System.Windows.Forms.Button() + Me.dgvFILTER = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.Label1 = New System.Windows.Forms.Label() + Me.btnRW = New System.Windows.Forms.Button() CType(Me.dgvOfferteDetails, System.ComponentModel.ISupportInitialize).BeginInit() Me.cntxtAddSdl.SuspendLayout() CType(Me.dgvIDS, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.dgvFILTER, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'lblIDS @@ -53,35 +57,25 @@ Partial Class usrCntlIDSPreise Me.lblIDS.TabIndex = 0 Me.lblIDS.Text = "IDS" ' - 'Label11 - ' - Me.Label11.AutoSize = True - Me.Label11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label11.Location = New System.Drawing.Point(233, 16) - Me.Label11.Name = "Label11" - Me.Label11.Size = New System.Drawing.Size(50, 13) - Me.Label11.TabIndex = 2 - Me.Label11.Text = "Details:" - ' 'dgvOfferteDetails ' Me.dgvOfferteDetails.AllowUserToAddRows = False Me.dgvOfferteDetails.AllowUserToDeleteRows = False Me.dgvOfferteDetails.AllowUserToOrderColumns = True Me.dgvOfferteDetails.AllowUserToResizeRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOfferteDetails.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOfferteDetails.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 Me.dgvOfferteDetails.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.dgvOfferteDetails.BackgroundColor = System.Drawing.Color.White Me.dgvOfferteDetails.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - Me.dgvOfferteDetails.Location = New System.Drawing.Point(235, 32) + Me.dgvOfferteDetails.Location = New System.Drawing.Point(235, 63) Me.dgvOfferteDetails.MultiSelect = False Me.dgvOfferteDetails.Name = "dgvOfferteDetails" Me.dgvOfferteDetails.RowHeadersVisible = False Me.dgvOfferteDetails.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvOfferteDetails.Size = New System.Drawing.Size(796, 475) + Me.dgvOfferteDetails.Size = New System.Drawing.Size(928, 444) Me.dgvOfferteDetails.TabIndex = 5 ' 'cntxtAddSdl @@ -103,7 +97,7 @@ Partial Class usrCntlIDSPreise Me.btnOfferteSpeichern.ForeColor = System.Drawing.Color.Black Me.btnOfferteSpeichern.Image = Global.SDL.My.Resources.Resources.save Me.btnOfferteSpeichern.ImageAlign = System.Drawing.ContentAlignment.TopLeft - Me.btnOfferteSpeichern.Location = New System.Drawing.Point(899, 514) + Me.btnOfferteSpeichern.Location = New System.Drawing.Point(1031, 514) Me.btnOfferteSpeichern.Name = "btnOfferteSpeichern" Me.btnOfferteSpeichern.Size = New System.Drawing.Size(132, 36) Me.btnOfferteSpeichern.TabIndex = 15 @@ -121,7 +115,7 @@ Partial Class usrCntlIDSPreise Me.btnEditIDS.FlatAppearance.BorderSize = 0 Me.btnEditIDS.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnEditIDS.ForeColor = System.Drawing.Color.Black - Me.btnEditIDS.Location = New System.Drawing.Point(965, 6) + Me.btnEditIDS.Location = New System.Drawing.Point(1097, 4) Me.btnEditIDS.Name = "btnEditIDS" Me.btnEditIDS.Size = New System.Drawing.Size(20, 20) Me.btnEditIDS.TabIndex = 1 @@ -168,7 +162,7 @@ Partial Class usrCntlIDSPreise Me.btnCloseEditMode.FlatAppearance.BorderSize = 0 Me.btnCloseEditMode.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCloseEditMode.ForeColor = System.Drawing.Color.Black - Me.btnCloseEditMode.Location = New System.Drawing.Point(1000, 8) + Me.btnCloseEditMode.Location = New System.Drawing.Point(1132, 6) Me.btnCloseEditMode.Name = "btnCloseEditMode" Me.btnCloseEditMode.Size = New System.Drawing.Size(20, 20) Me.btnCloseEditMode.TabIndex = 31 @@ -180,39 +174,100 @@ Partial Class usrCntlIDSPreise Me.lblEditMode.AutoSize = True Me.lblEditMode.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblEditMode.ForeColor = System.Drawing.Color.Red - Me.lblEditMode.Location = New System.Drawing.Point(551, 13) + Me.lblEditMode.Location = New System.Drawing.Point(551, 11) Me.lblEditMode.Name = "lblEditMode" Me.lblEditMode.Size = New System.Drawing.Size(64, 13) Me.lblEditMode.TabIndex = 32 Me.lblEditMode.Text = "Edit Mode" Me.lblEditMode.Visible = False ' + 'btnKunde + ' + Me.btnKunde.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnKunde.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnKunde.ForeColor = System.Drawing.Color.Black + Me.btnKunde.ImageAlign = System.Drawing.ContentAlignment.TopLeft + Me.btnKunde.Location = New System.Drawing.Point(993, 4) + Me.btnKunde.Name = "btnKunde" + Me.btnKunde.Size = New System.Drawing.Size(76, 28) + Me.btnKunde.TabIndex = 33 + Me.btnKunde.Tag = "" + Me.btnKunde.Text = "Kunde" + Me.btnKunde.UseVisualStyleBackColor = True + Me.btnKunde.Visible = False + ' + '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(235, 35) + Me.dgvFILTER.Name = "dgvFILTER" + Me.dgvFILTER.ScrollBars = System.Windows.Forms.ScrollBars.None + Me.dgvFILTER.Size = New System.Drawing.Size(796, 22) + Me.dgvFILTER.TabIndex = 34 + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label1.ForeColor = System.Drawing.Color.Red + Me.Label1.Location = New System.Drawing.Point(64, 15) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(11, 13) + Me.Label1.TabIndex = 35 + Me.Label1.Text = "." + ' + 'btnRW + ' + Me.btnRW.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnRW.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnRW.ForeColor = System.Drawing.Color.Black + Me.btnRW.ImageAlign = System.Drawing.ContentAlignment.TopLeft + Me.btnRW.Location = New System.Drawing.Point(911, 4) + Me.btnRW.Name = "btnRW" + Me.btnRW.Size = New System.Drawing.Size(76, 28) + Me.btnRW.TabIndex = 36 + Me.btnRW.Tag = "" + Me.btnRW.Text = "RW" + Me.btnRW.UseVisualStyleBackColor = True + Me.btnRW.Visible = False + ' 'usrCntlIDSPreise ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White + Me.Controls.Add(Me.btnRW) + Me.Controls.Add(Me.Label1) + Me.Controls.Add(Me.dgvFILTER) + Me.Controls.Add(Me.btnKunde) Me.Controls.Add(Me.lblEditMode) Me.Controls.Add(Me.btnCloseEditMode) Me.Controls.Add(Me.cbxTypes) Me.Controls.Add(Me.dgvIDS) Me.Controls.Add(Me.btnOfferteSpeichern) Me.Controls.Add(Me.btnEditIDS) - Me.Controls.Add(Me.Label11) Me.Controls.Add(Me.lblIDS) Me.Controls.Add(Me.dgvOfferteDetails) Me.Margin = New System.Windows.Forms.Padding(2) Me.Name = "usrCntlIDSPreise" - Me.Size = New System.Drawing.Size(1041, 576) + Me.Size = New System.Drawing.Size(1173, 576) CType(Me.dgvOfferteDetails, System.ComponentModel.ISupportInitialize).EndInit() Me.cntxtAddSdl.ResumeLayout(False) CType(Me.dgvIDS, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.dgvFILTER, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() End Sub Friend WithEvents lblIDS As System.Windows.Forms.TextBox - Friend WithEvents Label11 As System.Windows.Forms.Label Friend WithEvents dgvOfferteDetails As System.Windows.Forms.DataGridView Friend WithEvents btnEditIDS As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents cntxtAddSdl As ContextMenuStrip @@ -222,4 +277,8 @@ Partial Class usrCntlIDSPreise Friend WithEvents cbxTypes As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents btnCloseEditMode As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents lblEditMode As Label + Friend WithEvents btnKunde As Button + Friend WithEvents dgvFILTER As VERAG_PROG_ALLGEMEIN.MyDatagridview + Friend WithEvents Label1 As Label + Friend WithEvents btnRW As Button End Class diff --git a/SDL/kunden/usrCntlIDSPreise.vb b/SDL/kunden/usrCntlIDSPreise.vb index e62c1d5e..78d99bbf 100644 --- a/SDL/kunden/usrCntlIDSPreise.vb +++ b/SDL/kunden/usrCntlIDSPreise.vb @@ -1,4 +1,8 @@ -Imports VERAG_PROG_ALLGEMEIN +Imports System.Reflection +Imports System.Threading +Imports System.Web.UI.WebControls.Expressions +Imports com.sun.xml.internal.rngom +Imports VERAG_PROG_ALLGEMEIN Public Class usrCntlIDSPreise @@ -6,7 +10,7 @@ Public Class usrCntlIDSPreise Dim SQL As New SQL Public Event IDSChanged() - + Public kdNr_filter As Boolean = False Dim IDSDIESEL_Bind As cEasyBinding Dim table Public BIND_DB = "FMZOLL" @@ -18,6 +22,9 @@ Public Class usrCntlIDSPreise Dim loaded = False Dim ofID As Integer Dim isVerag360 As Boolean = False + Dim dgvInitWait As Boolean = False + Dim RW As Double = -1 + Dim Kunde As Integer = -1 Sub New() InitializeComponent() @@ -33,58 +40,160 @@ Public Class usrCntlIDSPreise End Sub + Sub initfilterColumnsWidth() + + If dgvFILTER.ColumnCount > 0 AndAlso dgvFILTER.ColumnCount = dgvOfferteDetails.ColumnCount Then + + dgvFILTER.Width = dgvOfferteDetails.Width + For Each c As DataGridViewColumn In dgvOfferteDetails.Columns + dgvFILTER.Columns(c.Index).Width = c.Width + Next + + If kdNr_filter Then + Select Case cbxTypes._value + Case "LSK", "LK" : initKDFilter() + End Select - Sub initDGVDieselpreiseDetails(Optional OutletCountryCode As Integer = -1) + End If + End If + 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 + + Dim sortedCols = dgvOfferteDetails.Columns.Cast(Of DataGridViewColumn)() _ + .OrderBy(Function(c) c.DisplayIndex) + + For Each c As DataGridViewColumn In sortedCols + + If c.Visible Then + Dim cNew As DataGridViewColumn = c.Clone + + + If c.ReadOnly And c.Name = "CustomerCode" 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) + 'cNew.DisplayIndex = counter + If cNew.GetType Is GetType(DataGridViewCheckBoxColumn) Then + DirectCast(cNew, DataGridViewCheckBoxColumn).ThreeState = True + DirectCast(cNew, DataGridViewCheckBoxColumn).DefaultCellStyle.NullValue = CheckState.Indeterminate + End If + 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 = dgvOfferteDetails.Width + If kdNr_filter Then + initKDFilter() + End If + End If + + dgvInitWait = False + + End Sub + + + Sub initDGVDieselpreiseDetails(Optional OutletCountryCode As Integer = -1, Optional doFilter As Boolean = False) loaded = False Try + If cbxTypes._value = "" Then Exit Sub + With dgvOfferteDetails Dim SQL_ = "" + Dim SQL_WHERE = "" + + If doFilter Then + Dim filter As String = getFilter() + + If filter <> "" Then + SQL_WHERE &= " AND " & filter + End If + ' sql &= " ORDER BY sdl.[Erfassungsdatum] ASC" + Else + ' clearFilter() + End If + + Select Case cbxTypes._value Case "L" - SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter, tbl_IDS_Rechenwerte.SSMA_TimeStamp, tbl_IDS_Rechenwerte.KategorieNr + SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter, tbl_IDS_Rechenwerte.KategorieNr FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN tbl_IDS_Rechenwerte ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode - WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode, "") & " ) + WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode, "") & " ) " & SQL_WHERE & " ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" Case "LS" - SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter, tbl_IDS_Rechenwerte.SSMA_TimeStamp, tbl_IDS_Rechenwerte.KategorieNr + SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter, tbl_IDS_Rechenwerte.KategorieNr FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN (tbl_IDS_Stationen INNER JOIN tbl_IDS_Rechenwerte ON (tbl_IDS_Stationen.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) AND (tbl_IDS_Stationen.OutletCode = tbl_IDS_Rechenwerte.OutletCode)) ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode - WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode, "") & " ) + WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode, "") & " ) " & SQL_WHERE & " ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" Case "KRW" - SQL_ = "SELECT tbl_IDS_Kategorien_Rechenwerte.ID as ID, tbl_IDS_Kategorien_Rechenwerte.KategorieNr, tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Kategorien_Rechenwerte.Rechenwert, tbl_IDS_Kategorien_Rechenwerte.Zeitstempel, tbl_IDS_Kategorien_Rechenwerte.Sachbearbeiter, tbl_IDS_Kategorien_Rechenwerte.SSMA_TimeStamp + SQL_ = "SELECT tbl_IDS_Kategorien_Rechenwerte.ID as ID, tbl_IDS_Kategorien_Rechenwerte.KategorieNr, tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Kategorien_Rechenwerte.Rechenwert, tbl_IDS_Kategorien_Rechenwerte.Zeitstempel, tbl_IDS_Kategorien_Rechenwerte.Sachbearbeiter FROM tbl_IDS_Produkte INNER JOIN tbl_IDS_Kategorien_Rechenwerte ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode + WHERE 1 = 1 " & SQL_WHERE & " ORDER BY tbl_IDS_Kategorien_Rechenwerte.KategorieNr, tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode;" Case "LK" - SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, Adressen.Ordnungsbegriff AS CustomerName, tbl_IDS_Rechenwerte.CustomerCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter, tbl_IDS_Rechenwerte.SSMA_TimeStamp, tbl_IDS_Rechenwerte.KategorieNr + SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, Adressen.Ordnungsbegriff AS CustomerName, tbl_IDS_Rechenwerte.CustomerCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter, tbl_IDS_Rechenwerte.KategorieNr FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN (Adressen INNER JOIN tbl_IDS_Rechenwerte ON Adressen.AdressenNr = tbl_IDS_Rechenwerte.CustomerCode) ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode - WHERE (((tbl_IDS_Rechenwerte.CustomerCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.OutletCode) Is Null) " & IIf(OutletCountryCode > 0, " WHERE tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode, "") & " ) + WHERE (((tbl_IDS_Rechenwerte.CustomerCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.OutletCode) Is Null) " & IIf(OutletCountryCode > 0, " WHERE tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode, "") & " ) " & SQL_WHERE & " ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, Adressen.Ordnungsbegriff, tbl_IDS_Rechenwerte.CustomerCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" Case "LSK" - SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, Adressen.Ordnungsbegriff AS CustomerName, tbl_IDS_Rechenwerte.CustomerCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter, tbl_IDS_Rechenwerte.SSMA_TimeStamp, tbl_IDS_Rechenwerte.KategorieNr + SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, Adressen.Ordnungsbegriff AS CustomerName, tbl_IDS_Rechenwerte.CustomerCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter, tbl_IDS_Rechenwerte.KategorieNr FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN (Adressen INNER JOIN (tbl_IDS_Stationen INNER JOIN tbl_IDS_Rechenwerte ON (tbl_IDS_Stationen.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) AND (tbl_IDS_Stationen.OutletCode = tbl_IDS_Rechenwerte.OutletCode)) ON Adressen.AdressenNr = tbl_IDS_Rechenwerte.CustomerCode) ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode - WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Not Null) " & IIf(OutletCountryCode > 0, " WHERE tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode, "") & " ) + WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Not Null) " & IIf(OutletCountryCode > 0, " WHERE tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode, "") & " ) " & SQL_WHERE & " ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, Adressen.Ordnungsbegriff, tbl_IDS_Rechenwerte.CustomerCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" Case "KOR" SQL_ = "SELECT tbl_IDS_Kunden_ohne_Rabatt.CustomerCode, tbl_IDS_Kunden_ohne_Rabatt.Zeitstempel, tbl_IDS_Kunden_ohne_Rabatt.Sachbearbeiter FROM tbl_IDS_Kunden_ohne_Rabatt + WHERE 1 = 1 " & SQL_WHERE & " ORDER BY tbl_IDS_Kunden_ohne_Rabatt.CustomerCode;" End Select + Label1.Text = cbxTypes._value + + + + Select Case cbxTypes._value + Case "LK", "LKS" 'If kdNr_filter Then SQL_ &= " AND KundenNr=" & kdNr + End Select + + If SQL_ = "" Then Exit Sub Try @@ -112,55 +221,14 @@ Public Class usrCntlIDSPreise 'FUNC.dgvCellToCbo(dgvOfferteDetails, 2, "Kz", "Kz", " SELECT [BerechnungsartNr], CAST(BerechnungsartNr as varchar(3)) + ' - ' + [BerechnungsartBez] as [BerechnungsartBez] FROM [Berechnungsart] ORDER BY BerechnungsartNr ", "FMZOLL", 150) 'FUNC.dgvCellToCbo(dgvOfferteDetails, 5, "BGebLeist.", "BGebLeistungsNr", " SELECT [LeistungsNr], CAST(LeistungsNr as varchar(3)) + ' - ' + [LeistungsBez] as LeistungsBez FROM [Leistungen] ORDER BY [LeistungsNr] ", "FMZOLL", 250) - 'checkPerimissionsDGVDetails() If .Columns.Contains("ID") Then .Columns("ID").Visible = False - '.Columns("KundenNr").Visible = False - '.Columns("LeistungsNr").Width = 30 - '.Columns("LeistungsNr").HeaderText = "Nr" - '.Columns("LeistungsBez").MinimumWidth = 200 - '.Columns("LeistungsBez").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill - '.Columns("LeistungsBez").HeaderText = "Leistung" - '.Columns("BerechnungsartNr").MinimumWidth = 150 - '.Columns("Preis").Width = 60 - '.Columns("Preis").DefaultCellStyle.Format = "N2" - '.Columns("Preis").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight - '.Columns("Anzahl").Width = 50 - '.Columns("Anzahl").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter - - '.Columns("BerechnungsartPosInkludiert").HeaderText = "Pos.inkl." - '.Columns("BerechnungsartPosInkludiert").Width = 45 - - '.Columns("BGebLeistungsNr").Width = 60 - '.Columns("BGebProzent").Width = 55 - '.Columns("BGebProzent").HeaderText = "BGeb %" - '.Columns("BGebProzent").DefaultCellStyle.Format = "P" - '.Columns("BGebProzent").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight - '.Columns("BGebMinBetrag").Width = 60 - '.Columns("BGebMinBetrag").HeaderText = "BGebMinBetr." - '.Columns("BGebMinBetrag").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight - '.Columns("Eingegeben am").Visible = False - '' .Columns("Sachbearbeiter").Visible = False - '' .Columns("Geändert am").Visible = False - '.Columns("PreisänderungProzent").Width = 70 - '.Columns("PreisänderungProzent").HeaderText = "Preisänd. %" - '.Columns("PreisänderungProzent").DefaultCellStyle.Format = "p" - '.Columns("PreisänderungProzent").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight - '.Columns("PreisAlt").Width = 60 - '.Columns("PreisAlt").DefaultCellStyle.Format = "N2" - '.Columns("PreisAlt").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight - '.Columns("Preisänderung").Width = 60 - '.Columns("Preisänderung").HeaderText = "PreisNeu" - '.Columns("Preisänderung").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight - '' .Columns("OffertenBez").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill - '' .Columns("OffertenBez").HeaderText = "Bezeichnung" - - '.Columns("PreisänderungProzent").Visible = False - '.Columns("PreisAlt").Visible = False - '.Columns("Preisänderung").Visible = False - loaded = True End With + If Not doFilter Then + initFilter() + End If + DGVHasChaged = False Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) @@ -168,6 +236,88 @@ Public Class usrCntlIDSPreise 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 = "" + + 'fehler bei: + 'OutletCountryCode + + + + + 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) + 'MsgBox(c.OwningColumn.DataPropertyName) + If c.OwningColumn.Name.Contains("ProductTypeCode") Then + filter &= andstr & " tbl_IDS_Rechenwerte.[" & c.OwningColumn.Name & "] = '" & srchstr & "' " + ElseIf c.OwningColumn.Name.Contains("OutletCountryCode") Then + filter &= andstr & " tbl_IDS_Rechenwerte.[" & c.OwningColumn.Name & "] = '" & srchstr & "' " + + ElseIf c.OwningColumn.Name.Contains("OutletCode") Then + filter &= andstr & " tbl_IDS_Rechenwerte.[" & c.OwningColumn.Name & "] = '" & srchstr & "' " + + ElseIf c.OwningColumn.Name.Contains("CustomerCode") Then + filter &= andstr & " tbl_IDS_Rechenwerte.[" & c.OwningColumn.Name & "] = '" & srchstr & "' " + + ElseIf IsNumeric(srchstr) Then + + If srchstr.ToLower = "ist null" Then + filter &= andstr & "( [" & c.OwningColumn.Name & "] LIKE '' OR [" & c.OwningColumn.Name & "] is null ) " + Else + filter &= andstr & " [" & c.OwningColumn.Name & "] = " & srchstr.Replace(",", ".") & "" + End If + + 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 & " [" & c.OwningColumn.Name & "] =1 " + andstr = " AND " + ElseIf c.Value = CheckState.Unchecked Then + filter &= andstr & " [" & c.OwningColumn.Name & "] =0 " + andstr = " AND " + End If + End If + End If + + End If + Next + End If + + Return filter + End Function + Private Sub dgvIDS_SelectionChanged(sender As Object, e As EventArgs) Handles dgvIDS.SelectionChanged @@ -175,18 +325,44 @@ Public Class usrCntlIDSPreise If dgvIDS.SelectedCells.Count > 0 Then - If dgvIDS.SelectedCells(0).RowIndex > -1 Then + If dgvIDS.SelectedCells(0).RowIndex > -1 AndAlso dgvIDS.Rows(dgvIDS.SelectedCells(0).RowIndex).Cells("OutletCountryCode").Value > 0 Then initDGVDieselpreiseDetails(dgvIDS.Rows(dgvIDS.SelectedCells(0).RowIndex).Cells("OutletCountryCode").Value) + Else + initDGVDieselpreiseDetails() End If End If 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 initKDFilter() + + dgvIDS.Columns("CustomerCode").ReadOnly = True + dgvIDS.Columns("CustomerCode").Visible = False + Try + + dgvFILTER.Columns("CustomerCode").ReadOnly = True + dgvFILTER.Columns("CustomerCode").Visible = False + 'DirectCast(pnlFilterInside.Controls("txtSrch_KundenNr"), TextBox).Text = kdNr + 'DirectCast(pnlFilterInside.Controls("txtSrch_KundenNr"), TextBox).Enabled = False + ' DirectCast(pnlFilterInside.Controls("txtSrch_KundenNr"), TextBox).ReadOnly = True + ' initSearch(pnlFilterInside.Controls("txtSrch_KundenNr"), New EventArgs) + Catch ex As Exception + ' MsgBox(ex.Message) + End Try + End Sub + Private Sub usrCntlOfferte_Load(sender As Object, e As EventArgs) Handles MyBase.Load + init(isVerag360) cbxTypes.Items.Clear() @@ -199,19 +375,35 @@ Public Class usrCntlIDSPreise checkPermissions() + Dim SQL_ As String = "" SQL_ = "SELECT OutletCountry, OutletCountryCode FROM [VERAG].[dbo].[tbl_IDS_Länder] ORDER BY OutletCountry" + Dim dt As New DataTable + + dt = SQL.loadDgvBySql(SQL_, "FMZOLL") + If dt.Rows.Count > 0 Then + Dim newRow As DataRow = dt.NewRow() + newRow("OutletCountry") = "Alle" + newRow("OutletCountryCode") = -1 + dt.Rows.InsertAt(newRow, 0) + dt.AcceptChanges() + + End If + With dgvIDS - .DataSource = SQL.loadDgvBySql(SQL_, "FMZOLL") + .DataSource = dt .Columns("OutletCountry").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("OutletCountry").HeaderText = "Bezeichnung" .Columns("OutletCountryCode").Visible = False End With - + 'EnableDoubleBuffered(dgvOfferteDetails) dgvOfferteDetails.Columns.Clear() dgvIDS.ClearSelection() initDGVDieselpreiseDetails() + 'initFilter() + initDGVWidth() + 'AddHandler OFFERTEBind.bindingdataTable.ColumnChanged, Sub(ev As EventArgs, change As DataColumnChangeEventArgs) @@ -224,6 +416,20 @@ Public Class usrCntlIDSPreise End Sub + Sub initDGVWidth() + Dim DGVwidth = 0 + Dim reduceWidth = 0 + For Each c As DataGridViewColumn In dgvOfferteDetails.Columns + DGVwidth += c.Width + Next + Dim DGVheight = 0 + For Each r As DataGridViewRow In dgvOfferteDetails.Rows + DGVheight += r.Height + Next + DGVheight += 50 + ' + End Sub + Private Sub AddOffert_Click(sender As Object, e As EventArgs) Handles DToolStripMenuItem.Click @@ -257,7 +463,7 @@ Public Class usrCntlIDSPreise If dgvIDS.SelectedCells.Count > 0 Then - If dgvIDS.SelectedCells(0).RowIndex > -1 Then + If dgvIDS.SelectedCells(0).RowIndex > -1 AndAlso dgvIDS.Rows(dgvIDS.SelectedCells(0).RowIndex).Cells("OutletCountryCode").Value > 0 Then initDGVDieselpreiseDetails(dgvIDS.Rows(dgvIDS.SelectedCells(0).RowIndex).Cells("OutletCountryCode").Value) End If @@ -267,9 +473,8 @@ Public Class usrCntlIDSPreise End If End If - - End If End If + End If End Select @@ -294,14 +499,14 @@ Public Class usrCntlIDSPreise End Sub - Private Sub cbxArchivierteOffertenAnzeigen_CheckedChanged(sender As Object, e As EventArgs) + 'Private Sub cbxArchivierteOffertenAnzeigen_CheckedChanged(sender As Object, e As EventArgs) - If dgvIDS.SelectedRows.Count = 0 Then Exit Sub + ' If dgvIDS.SelectedRows.Count = 0 Then Exit Sub - initDGVDieselpreiseDetails(dgvIDS.SelectedRows(0).Cells("OffertenNr").Value) + ' initDGVDieselpreiseDetails(dgvIDS.SelectedRows(0).Cells("OffertenNr").Value) - End Sub + 'End Sub Private Sub checkPerimissionsDGVDetails() @@ -448,6 +653,9 @@ Public Class usrCntlIDSPreise initDGVDieselpreiseDetails() End If + 'initFilter() + initDGVWidth() + End Sub @@ -490,5 +698,195 @@ Public Class usrCntlIDSPreise End If + End Sub + + Private Sub btnKunde_Click(sender As Object, e As EventArgs) Handles btnKunde.Click + + '1. Check ob der neue Kunde noch keine Einträge hat! -> ja -> abbrechen + '2. Check ob der Quellkunde Einträge besitzt! -> nein -> abbrechen + '3. alle Einträge durchlaufen und insert_into + + If dgvOfferteDetails.Rows.Count > 0 Then + + Dim newRWKunde As Integer = 0 + + Dim s = InputBox("Bitte die neuen IDS-KundenNr eingeben:", "KundenNr") + If Not IsNumeric(s) Then + Exit Sub + Else + newRWKunde = s + Dim adresse As New cAdressen(s) + If Not adresse.hasEntry Then + MsgBox("Der Kunde ist nicht in der Datenbank angelegt!" & vbNewLine & "Vorgang wird abgebrochen!") + Exit Sub + End If + End If + + Dim count As Integer = 0 + + Dim countString As String = SQL.getValueTxtBySql("select count(*) from tbl_IDS_Rechenwerte where CustomerCode =" & newRWKunde, "FMZOLL") + If countString <> "" Then + count = CInt(countString) + End If + + If newRWKunde > 0 Then + + If count > 0 Then + MsgBox("Es gibt bereits Rechnenwerte für die IDS-KundenNr " & newRWKunde & "!" & vbNewLine & "Vorgang wird abgebrochen!") + Exit Sub + End If + + If vbYes = MsgBox("Möchten Sie die Rechenwerte von Kunden " & Kunde & " übernehmen?" & vbNewLine & "Es werden alle verfügbaren Rechenwerte auf den neuen Kunden kopiert!", vbYesNoCancel) Then + Dim counter As Integer = 0 + 'do-it + + Dim dt As New DataTable + dt = SQL.loadDgvBySql("SELECT [OutletCountryCode],[OutletCode],[CustomerCode],[ProductTypeCode],[Rechenwert],[Kz],[Zeitstempel],[Sachbearbeiter],[KategorieNr] FROM tbl_IDS_Rechenwerte where CustomerCode =" & Kunde, "FMZOLL") + + If dt IsNot Nothing Then + + For Each r In dt.Rows + + If SQL.doSQL("INSERT INTO [tbl_IDS_Rechenwerte] ([OutletCountryCode],[OutletCode],[CustomerCode],[ProductTypeCode],[Rechenwert],[Kz],[Zeitstempel],[Sachbearbeiter],[KategorieNr]) + VALUES ('" & r(0) & "','" & r(1) & "','" & newRWKunde & "','" & r(3) & "','" & r(4) & "','" & r(5) & "','" & Now() & "','" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & "','" & r(8) & "')", "FMZOLL") Then counter += 1 + + Next + + info(counter & " Datensätze wurden angelegt!") + + End If + + End If + + End If + End If + + + + End Sub + + Private Sub dgvOfferteDetails_ColumnWidthChanged(sender As Object, e As DataGridViewColumnEventArgs) Handles dgvOfferteDetails.ColumnWidthChanged + initfilterColumnsWidth() + End Sub + + Private Sub dgvFILTER_CellValueChanged(sender As Object, e As DataGridViewCellEventArgs) Handles dgvFILTER.CellValueChanged + + + If e.RowIndex >= 0 AndAlso e.ColumnIndex >= 0 Then + Dim dgv As DataGridView = CType(sender, DataGridView) + ' Spaltenname + Dim colName As String = dgv.Columns(e.ColumnIndex).Name + + ' Neuer Wert (Nothing prüfen, falls leer) + Dim newValue As Object = dgv.Rows(e.RowIndex).Cells(e.ColumnIndex).Value + + + If colName = "CustomerCode" AndAlso IsNumeric(newValue) Then + Kunde = newValue + btnKunde.Visible = True + Else + btnKunde.Visible = False + End If + + If colName = "Rechenwert" AndAlso IsNumeric(newValue) Then + RW = newValue + btnRW.Visible = True + Else + btnRW.Visible = False + End If + + End If + + + + If dgvIDS.SelectedCells.Count > 0 Then + + If dgvIDS.SelectedCells(0).RowIndex > -1 AndAlso dgvIDS.Rows(dgvIDS.SelectedCells(0).RowIndex).Cells("OutletCountryCode").Value > 0 Then + initDGVDieselpreiseDetails(dgvIDS.Rows(dgvIDS.SelectedCells(0).RowIndex).Cells("OutletCountryCode").Value, True) + Else + initDGVDieselpreiseDetails(, True) + + End If + Else + initDGVDieselpreiseDetails(, True) + + End If + + initfilterColumnsWidth() + 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 + dgvIDS.Focus() + End If + End Sub + + Private Sub dgvFILTER_SelectionChanged(sender As Object, e As EventArgs) Handles dgvFILTER.SelectionChanged + dgvFILTER.ClearSelection() + End Sub + + Private Sub btnRW_Click(sender As Object, e As EventArgs) Handles btnRW.Click + + If dgvOfferteDetails.Rows.Count > 0 Then + + Dim newRW As Double = 0 + + Dim s = InputBox("Bitte den neuen RW eingeben:", "Rechenwert") + If IsNumeric(s) Then + newRW = s + Else + Exit Sub + End If + + If vbYes = MsgBox("Möchten Sie den Rechenwert von " & RW & " auf " & s & " setzen?", vbYesNoCancel) Then + + Dim counter As Integer = 0 + For Each r As DataGridViewRow In dgvOfferteDetails.Rows + + If r.Cells("ID").Value IsNot Nothing AndAlso IsNumeric(r.Cells("ID").Value) Then + + Dim curDP = New VERAG_PROG_ALLGEMEIN.cIDSDieselpreisRW(r.Cells("ID").Value) + curDP.Rechenwert = s.Replace(",", ".") + curDP.Zeitstempel = Now() + curDP.Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME + If curDP.SAVE() Then counter += 1 + End If + + Next + + + If dgvIDS.SelectedCells.Count > 0 Then + + If dgvIDS.SelectedCells(0).RowIndex > -1 AndAlso dgvIDS.Rows(dgvIDS.SelectedCells(0).RowIndex).Cells("OutletCountryCode").Value > 0 Then + initDGVDieselpreiseDetails(dgvIDS.Rows(dgvIDS.SelectedCells(0).RowIndex).Cells("OutletCountryCode").Value, True) + Else + initDGVDieselpreiseDetails(, True) + + End If + Else + initDGVDieselpreiseDetails(, True) + + End If + + info(counter & " Datensätze wurden aktualisiert!") + + End If + + + End If + + + End Sub + + Private Sub info(text As String) + + If text <> "" Then + Label1.Text = text + Thread.Sleep(4000) + Label1.Text = "" + End If + + + End Sub End Class From 8d0b6f95caae59a7428cf3dec93a4a4a7287dfa4 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 23 Sep 2025 13:02:48 +0200 Subject: [PATCH 09/27] ISD --- SDL/kunden/usrCntlIDSPreise.Designer.vb | 9 ++++----- SDL/kunden/usrCntlIDSPreise.vb | 7 +------ 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/SDL/kunden/usrCntlIDSPreise.Designer.vb b/SDL/kunden/usrCntlIDSPreise.Designer.vb index 067113d4..3157a204 100644 --- a/SDL/kunden/usrCntlIDSPreise.Designer.vb +++ b/SDL/kunden/usrCntlIDSPreise.Designer.vb @@ -23,7 +23,7 @@ Partial Class usrCntlIDSPreise Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.lblIDS = New System.Windows.Forms.TextBox() Me.dgvOfferteDetails = New System.Windows.Forms.DataGridView() Me.cntxtAddSdl = New System.Windows.Forms.ContextMenuStrip(Me.components) @@ -63,8 +63,8 @@ Partial Class usrCntlIDSPreise Me.dgvOfferteDetails.AllowUserToDeleteRows = False Me.dgvOfferteDetails.AllowUserToOrderColumns = True Me.dgvOfferteDetails.AllowUserToResizeRows = False - DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOfferteDetails.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOfferteDetails.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3 Me.dgvOfferteDetails.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -220,9 +220,8 @@ Partial Class usrCntlIDSPreise Me.Label1.ForeColor = System.Drawing.Color.Red Me.Label1.Location = New System.Drawing.Point(64, 15) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(11, 13) + Me.Label1.Size = New System.Drawing.Size(0, 13) Me.Label1.TabIndex = 35 - Me.Label1.Text = "." ' 'btnRW ' diff --git a/SDL/kunden/usrCntlIDSPreise.vb b/SDL/kunden/usrCntlIDSPreise.vb index 78d99bbf..7d9f922a 100644 --- a/SDL/kunden/usrCntlIDSPreise.vb +++ b/SDL/kunden/usrCntlIDSPreise.vb @@ -185,9 +185,6 @@ Public Class usrCntlIDSPreise End Select - Label1.Text = cbxTypes._value - - Select Case cbxTypes._value Case "LK", "LKS" 'If kdNr_filter Then SQL_ &= " AND KundenNr=" & kdNr @@ -881,9 +878,7 @@ Public Class usrCntlIDSPreise Private Sub info(text As String) If text <> "" Then - Label1.Text = text - Thread.Sleep(4000) - Label1.Text = "" + MsgBox(text) End If From 6d4769782d93abe676fc08af4a28789f0a71263a Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 23 Sep 2025 14:38:26 +0200 Subject: [PATCH 10/27] IDS, Version --- SDL/My Project/AssemblyInfo.vb | 4 +-- SDL/kunden/usrCntlIDSPreise.vb | 47 +++++++++++++++------------------- 2 files changed, 23 insertions(+), 28 deletions(-) diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 495729e5..43a9de77 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/kunden/usrCntlIDSPreise.vb b/SDL/kunden/usrCntlIDSPreise.vb index 7d9f922a..a7dbd503 100644 --- a/SDL/kunden/usrCntlIDSPreise.vb +++ b/SDL/kunden/usrCntlIDSPreise.vb @@ -139,43 +139,43 @@ Public Class usrCntlIDSPreise ' clearFilter() End If - + dgvOfferteDetails.Columns.Clear() Select Case cbxTypes._value Case "L" - SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter, tbl_IDS_Rechenwerte.KategorieNr + SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID, tbl_IDS_Rechenwerte.OutletCountryCode,tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.ProductTypeCode,tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN tbl_IDS_Rechenwerte ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode - WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode, "") & " ) " & SQL_WHERE & " + WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode & ") ", ") ") & SQL_WHERE & " ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" - Case "LS" - SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter, tbl_IDS_Rechenwerte.KategorieNr + SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID,tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Stationen.OutletName,tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN (tbl_IDS_Stationen INNER JOIN tbl_IDS_Rechenwerte ON (tbl_IDS_Stationen.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) AND (tbl_IDS_Stationen.OutletCode = tbl_IDS_Rechenwerte.OutletCode)) ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode - WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode, "") & " ) " & SQL_WHERE & " + WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode & ") ", ") ") & SQL_WHERE & " ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" + Case "LK" + SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.CustomerCode,Adressen.Ordnungsbegriff AS CustomerName,tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter + FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN (Adressen INNER JOIN tbl_IDS_Rechenwerte ON Adressen.AdressenNr = tbl_IDS_Rechenwerte.CustomerCode) ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode + WHERE (((tbl_IDS_Rechenwerte.CustomerCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.OutletCode) Is Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode & ") ", ") ") & SQL_WHERE & " + ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, Adressen.Ordnungsbegriff, tbl_IDS_Rechenwerte.CustomerCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" + + Case "LSK" + SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID,tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Länder.OutletCountry,tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.CustomerCode,Adressen.Ordnungsbegriff AS CustomerName, tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter + FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN (Adressen INNER JOIN (tbl_IDS_Stationen INNER JOIN tbl_IDS_Rechenwerte ON (tbl_IDS_Stationen.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) AND (tbl_IDS_Stationen.OutletCode = tbl_IDS_Rechenwerte.OutletCode)) ON Adressen.AdressenNr = tbl_IDS_Rechenwerte.CustomerCode) ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode + WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Not Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode & ") ", ") ") & SQL_WHERE & " + ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, Adressen.Ordnungsbegriff, tbl_IDS_Rechenwerte.CustomerCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" + Case "KRW" SQL_ = "SELECT tbl_IDS_Kategorien_Rechenwerte.ID as ID, tbl_IDS_Kategorien_Rechenwerte.KategorieNr, tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Kategorien_Rechenwerte.Rechenwert, tbl_IDS_Kategorien_Rechenwerte.Zeitstempel, tbl_IDS_Kategorien_Rechenwerte.Sachbearbeiter FROM tbl_IDS_Produkte INNER JOIN tbl_IDS_Kategorien_Rechenwerte ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode WHERE 1 = 1 " & SQL_WHERE & " ORDER BY tbl_IDS_Kategorien_Rechenwerte.KategorieNr, tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode;" - Case "LK" - SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, Adressen.Ordnungsbegriff AS CustomerName, tbl_IDS_Rechenwerte.CustomerCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter, tbl_IDS_Rechenwerte.KategorieNr - FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN (Adressen INNER JOIN tbl_IDS_Rechenwerte ON Adressen.AdressenNr = tbl_IDS_Rechenwerte.CustomerCode) ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode - WHERE (((tbl_IDS_Rechenwerte.CustomerCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.OutletCode) Is Null) " & IIf(OutletCountryCode > 0, " WHERE tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode, "") & " ) " & SQL_WHERE & " - ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, Adressen.Ordnungsbegriff, tbl_IDS_Rechenwerte.CustomerCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" - - Case "LSK" - SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, Adressen.Ordnungsbegriff AS CustomerName, tbl_IDS_Rechenwerte.CustomerCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter, tbl_IDS_Rechenwerte.KategorieNr - FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN (Adressen INNER JOIN (tbl_IDS_Stationen INNER JOIN tbl_IDS_Rechenwerte ON (tbl_IDS_Stationen.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) AND (tbl_IDS_Stationen.OutletCode = tbl_IDS_Rechenwerte.OutletCode)) ON Adressen.AdressenNr = tbl_IDS_Rechenwerte.CustomerCode) ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode - WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Not Null) " & IIf(OutletCountryCode > 0, " WHERE tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode, "") & " ) " & SQL_WHERE & " - ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, Adressen.Ordnungsbegriff, tbl_IDS_Rechenwerte.CustomerCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" Case "KOR" SQL_ = "SELECT tbl_IDS_Kunden_ohne_Rabatt.CustomerCode, tbl_IDS_Kunden_ohne_Rabatt.Zeitstempel, tbl_IDS_Kunden_ohne_Rabatt.Sachbearbeiter @@ -185,12 +185,6 @@ Public Class usrCntlIDSPreise End Select - - Select Case cbxTypes._value - Case "LK", "LKS" 'If kdNr_filter Then SQL_ &= " AND KundenNr=" & kdNr - End Select - - If SQL_ = "" Then Exit Sub Try @@ -219,6 +213,7 @@ Public Class usrCntlIDSPreise 'FUNC.dgvCellToCbo(dgvOfferteDetails, 5, "BGebLeist.", "BGebLeistungsNr", " SELECT [LeistungsNr], CAST(LeistungsNr as varchar(3)) + ' - ' + [LeistungsBez] as LeistungsBez FROM [Leistungen] ORDER BY [LeistungsNr] ", "FMZOLL", 250) If .Columns.Contains("ID") Then .Columns("ID").Visible = False + If .Columns.Contains("Kz") Then .Columns("Kz").Width = 25 loaded = True End With @@ -333,9 +328,9 @@ Public Class usrCntlIDSPreise 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) + '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 initKDFilter() From 3ea95157e8cafdd809bca118108fc749378d7aa7 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 23 Sep 2025 14:49:48 +0200 Subject: [PATCH 11/27] IDS verbesserungen --- SDL/kunden/usrCntlIDSPreise.Designer.vb | 14 +++++++------- SDL/kunden/usrCntlIDSPreise.vb | 11 +++++++++++ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/SDL/kunden/usrCntlIDSPreise.Designer.vb b/SDL/kunden/usrCntlIDSPreise.Designer.vb index 3157a204..cdbbc84c 100644 --- a/SDL/kunden/usrCntlIDSPreise.Designer.vb +++ b/SDL/kunden/usrCntlIDSPreise.Designer.vb @@ -23,7 +23,7 @@ Partial Class usrCntlIDSPreise Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.lblIDS = New System.Windows.Forms.TextBox() Me.dgvOfferteDetails = New System.Windows.Forms.DataGridView() Me.cntxtAddSdl = New System.Windows.Forms.ContextMenuStrip(Me.components) @@ -63,19 +63,19 @@ Partial Class usrCntlIDSPreise Me.dgvOfferteDetails.AllowUserToDeleteRows = False Me.dgvOfferteDetails.AllowUserToOrderColumns = True Me.dgvOfferteDetails.AllowUserToResizeRows = False - DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOfferteDetails.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOfferteDetails.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.dgvOfferteDetails.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.dgvOfferteDetails.BackgroundColor = System.Drawing.Color.White Me.dgvOfferteDetails.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - Me.dgvOfferteDetails.Location = New System.Drawing.Point(235, 63) + Me.dgvOfferteDetails.Location = New System.Drawing.Point(182, 63) Me.dgvOfferteDetails.MultiSelect = False Me.dgvOfferteDetails.Name = "dgvOfferteDetails" Me.dgvOfferteDetails.RowHeadersVisible = False Me.dgvOfferteDetails.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvOfferteDetails.Size = New System.Drawing.Size(928, 444) + Me.dgvOfferteDetails.Size = New System.Drawing.Size(981, 444) Me.dgvOfferteDetails.TabIndex = 5 ' 'cntxtAddSdl @@ -137,7 +137,7 @@ Partial Class usrCntlIDSPreise Me.dgvIDS.Name = "dgvIDS" Me.dgvIDS.ReadOnly = True Me.dgvIDS.RowHeadersVisible = False - Me.dgvIDS.Size = New System.Drawing.Size(228, 444) + Me.dgvIDS.Size = New System.Drawing.Size(176, 444) Me.dgvIDS.TabIndex = 30 ' 'cbxTypes @@ -207,7 +207,7 @@ Partial Class usrCntlIDSPreise 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(235, 35) + Me.dgvFILTER.Location = New System.Drawing.Point(182, 35) Me.dgvFILTER.Name = "dgvFILTER" Me.dgvFILTER.ScrollBars = System.Windows.Forms.ScrollBars.None Me.dgvFILTER.Size = New System.Drawing.Size(796, 22) diff --git a/SDL/kunden/usrCntlIDSPreise.vb b/SDL/kunden/usrCntlIDSPreise.vb index a7dbd503..4bfee0c3 100644 --- a/SDL/kunden/usrCntlIDSPreise.vb +++ b/SDL/kunden/usrCntlIDSPreise.vb @@ -214,6 +214,14 @@ Public Class usrCntlIDSPreise If .Columns.Contains("ID") Then .Columns("ID").Visible = False If .Columns.Contains("Kz") Then .Columns("Kz").Width = 25 + + 'If cbxTypes._value = "LS" Then + ' If .Columns.Contains("OutletName") Then .Columns("OutletName").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + 'Else + ' If .Columns.Contains("CustomerName") Then .Columns("CustomerName").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + 'End If + + loaded = True End With @@ -266,6 +274,9 @@ Public Class usrCntlIDSPreise ElseIf c.OwningColumn.Name.Contains("CustomerCode") Then filter &= andstr & " tbl_IDS_Rechenwerte.[" & c.OwningColumn.Name & "] = '" & srchstr & "' " + ElseIf c.OwningColumn.Name.Contains("CustomerName") Then + filter &= andstr & " Adressen.Ordnungsbegriff LIKE '%" & srchstr & "%' " + ElseIf IsNumeric(srchstr) Then If srchstr.ToLower = "ist null" Then From cd3d34182fba18be58e9bfe50f1ed7b6904e07cf Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 23 Sep 2025 16:33:48 +0200 Subject: [PATCH 12/27] Creditsafe, cAPI --- VERAG_PROG_ALLGEMEIN/Classes/cAPI.vb | 1 + .../Schnittstellen/Creditsafe/cCreditSafeAPI.vb | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cAPI.vb b/VERAG_PROG_ALLGEMEIN/Classes/cAPI.vb index c02aa1fb..96dd23be 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cAPI.vb @@ -27,6 +27,7 @@ Public Enum cAPI_ART AVISO_IN_MSE = 80 SDL_OUT_FA = 81 SDL_OUT_SAMMELRECHNUNG = 82 + AVISO_IN_CS = 83 End Enum diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb index 5f5d58d5..405d1131 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb @@ -480,7 +480,6 @@ Public Class cCreditSafeAPI Shared Function getCompanyEvents(company As Company, ByRef dtEvents As DataTable, Optional checklastChecked As Boolean = False, Optional updateKunden As Boolean = False, Optional showError As Boolean = False, Optional getTotalNr As Boolean = False, Optional setzeKundenbesonderheiten As Boolean = False, Optional sendMail As Boolean = False) As String - VERAG_PROG_ALLGEMEIN.cChilkat_Helper.UnlockCilkat() 'rest.AddQueryParam("from", Today().AddDays(-1)) @@ -713,7 +712,8 @@ Public Class cCreditSafeAPI If updateKunden Then KUNDE.SAVE() If triggerMail AndAlso sendMail Then - VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("as@verag.ag", IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & "CREDITSAFE " & KUNDE.KundenNr, "Änderungen der Creditsafe-Daten" & vbNewLine & vbNewLine & vbNewLine & Mailtext.ToString & vbNewLine & vbNewLine & vbNewLine & "*Automatic generated e-mail*",,,,, "d.breimaier@verag.ag") + Dim ADR As New cAdressen(KUNDE.KundenNr) + VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "d.breimaier@verag.ag", "as@verag.ag"), IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & "CREDITSAFE " & KUNDE.KundenNr, "Änderungen der Creditsafe-Daten von Kunden " & KUNDE.KundenNr & " " & ADR.Ordnungsbegriff & Mailtext.ToString & "

" & "*Automatic generated e-mail*",,,,, "d.breimaier@verag.ag") End If End If @@ -1264,7 +1264,7 @@ Public Class cCreditSafeAPI Risk = " Risikoklasse: " & oldRiksClass & " -> " & risikoklasse End If - Dim textVermerk As String = "ACHTUNG, Änderung des " & typ & " von " & oldValue.ToString & " um " & changedInProzent.ToString("F2") & "% " & " auf " & newValue.ToString & Risk + Dim textVermerk As String = "ACHTUNG, Veränderung des " & typ & " von " & oldValue.ToString & " auf " & newValue.ToString & " ( um " & changedInProzent.ToString("F2") & "% ) " & Risk mailText &= "

" & textVermerk From 3556d96d7ac281167af299050963e9fbbead31bc Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 24 Sep 2025 12:12:03 +0200 Subject: [PATCH 13/27] =?UTF-8?q?div.=20=C3=84nderungen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SDL/Formulare/KDFormulare/frmFormulare.vb | 26 +++++- SDL/My Project/AssemblyInfo.vb | 4 +- SDL/kunden/frmBonitätsverlauf.Designer.vb | 16 ++++ SDL/kunden/frmBonitätsverlauf.vb | 50 +++++++++- SDL/kunden/usrCntlIDSPreise.vb | 91 ++++++++++++++++--- .../Classes/cRechnungsausgang.vb | 4 +- .../frmUeberstundenauszahlen.vb | 8 +- .../Creditsafe/cCreditSafeAPI.vb | 55 ++++++++--- 8 files changed, 216 insertions(+), 38 deletions(-) diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index 9029adce..526e93ed 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -6678,21 +6678,32 @@ Public Class FormularManagerNEU Dim reader As PdfReader = Nothing + reader.unethicalreading = True ' Damit geschützte PDFs gelesen werden können... ' PdfReader not opened with owner password + + Dim hasPages As Boolean = False + Try - document.Open() + For Each file As String In fileNames + hasPages = False If file.ToUpper.EndsWith(".PDF") Then reader = New PdfReader(file) - addAttachmentToCurrentPDF(reader, pdf) + If reader.NumberOfPages > 0 Then + document.Open() + addAttachmentToCurrentPDF(reader, pdf) - pdf.AddDocument(reader) - reader.Close() + pdf.AddDocument(reader) + reader.Close() + hasPages = True + End If End If Next + + Catch __unusedException1__ As Exception MsgBox(__unusedException1__.Message & __unusedException1__.StackTrace) merged = False @@ -6702,8 +6713,13 @@ Public Class FormularManagerNEU Finally If document IsNot Nothing Then - document.Close() + If hasPages Then + document.Close() + Else + document.Dispose() + End If End If + End Try End Using diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 43a9de77..f61d46c6 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/kunden/frmBonitätsverlauf.Designer.vb b/SDL/kunden/frmBonitätsverlauf.Designer.vb index febf424e..4d658066 100644 --- a/SDL/kunden/frmBonitätsverlauf.Designer.vb +++ b/SDL/kunden/frmBonitätsverlauf.Designer.vb @@ -32,6 +32,7 @@ Partial Class frmBonitätsverlauf Me.Label1 = New System.Windows.Forms.Label() Me.lblBonitatsverlauf = New System.Windows.Forms.Label() Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.btnCreditsafeDetails = New System.Windows.Forms.Button() Me.pnl.SuspendLayout() CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() @@ -39,6 +40,7 @@ Partial Class frmBonitätsverlauf 'pnl ' Me.pnl.BackColor = System.Drawing.Color.White + Me.pnl.Controls.Add(Me.btnCreditsafeDetails) Me.pnl.Controls.Add(Me.btnExcel) Me.pnl.Controls.Add(Me.FlatButton7) Me.pnl.Controls.Add(Me.KdSearchBox1) @@ -89,6 +91,7 @@ Partial Class frmBonitätsverlauf Me.KdSearchBox1._displayWoelflKd = False Me.KdSearchBox1._hideIfListEmpty = True Me.KdSearchBox1._loadKdData = False + Me.KdSearchBox1._searchName1 = True Me.KdSearchBox1._UseFIRMA = "" Me.KdSearchBox1._ValueKdAndName = True Me.KdSearchBox1.dgvpos = "LEFT" @@ -154,6 +157,18 @@ Partial Class frmBonitätsverlauf Me.MyDatagridview1.Size = New System.Drawing.Size(829, 403) Me.MyDatagridview1.TabIndex = 1 ' + 'btnCreditsafeDetails + ' + Me.btnCreditsafeDetails.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnCreditsafeDetails.BackgroundImage = Global.SDL.My.Resources.Resources.creditsafe + Me.btnCreditsafeDetails.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch + Me.btnCreditsafeDetails.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnCreditsafeDetails.Location = New System.Drawing.Point(632, 5) + Me.btnCreditsafeDetails.Name = "btnCreditsafeDetails" + Me.btnCreditsafeDetails.Size = New System.Drawing.Size(91, 34) + Me.btnCreditsafeDetails.TabIndex = 7 + Me.btnCreditsafeDetails.UseVisualStyleBackColor = True + ' 'frmBonitätsverlauf ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -180,4 +195,5 @@ Partial Class frmBonitätsverlauf Friend WithEvents lblBonitatsverlauf As System.Windows.Forms.Label Friend WithEvents btnExcel As System.Windows.Forms.Button Friend WithEvents FlatButton7 As System.Windows.Forms.Button + Friend WithEvents btnCreditsafeDetails As Button End Class diff --git a/SDL/kunden/frmBonitätsverlauf.vb b/SDL/kunden/frmBonitätsverlauf.vb index 55115008..e505e8ac 100644 --- a/SDL/kunden/frmBonitätsverlauf.vb +++ b/SDL/kunden/frmBonitätsverlauf.vb @@ -1,5 +1,4 @@ -Imports GrapeCity.DataVisualization.Chart -Imports VERAG_PROG_ALLGEMEIN +Imports VERAG_PROG_ALLGEMEIN Public Class frmBonitätsverlauf @@ -186,4 +185,51 @@ Public Class frmBonitätsverlauf End Sub + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnCreditsafeDetails.Click + + Try + + Dim SQL_String = "SELECT + [createdDate] as Datum + ,[ruleName] as Bezeichnung + ,[globalEventCode] as Code + ,[oldValue] as alterWert + ,[newValue] as neuerWert + ,[sachbearbeiter] as Sachbearbeiter + ,[oldValueCL] as KreditlimitAlt + ,[newValueCL] as KreditlimitNeu + ,[oldValueCR] as BonRateAlt + ,[newValueCR] as BonRateNeu + ,[newValueCRIndex] as BonIndexNeu + ,[oldValueCRIndex] as BonIndexAlt + ,[oldRiskClass] as RiskoklasseAlt + ,[newRiskClass] as RiskoklasseNeu + FROM [VERAG].[dbo].[tblCreditsafeEvents] where [kundenNr] = " & KdSearchBox1.KdNr & " order by eventDate desc" + + + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + Dim frm As New Form + frm.Text = "Creditsafe-Details" + Dim dgv As New DataGridView() + Dim dt As DataTable = SQL.loadDgvBySql(SQL_String, "FMZOLL") + dgv.DataSource = dt + If dgv IsNot Nothing Then + frm.Size = New Size(1500, 500) + dgv.Size = New Size(frm.Size.Width - 10, frm.Size.Height - 10) + dgv.Dock = DockStyle.Fill + dgv.Anchor = AnchorStyles.Left + dgv.Anchor = AnchorStyles.Top + dgv.ReadOnly = True + frm.Controls.Add(dgv) + frm.StartPosition = FormStartPosition.CenterScreen + frm.ShowDialog() + End If + + + Catch ex As System.Exception + + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + + End Sub End Class \ No newline at end of file diff --git a/SDL/kunden/usrCntlIDSPreise.vb b/SDL/kunden/usrCntlIDSPreise.vb index 4bfee0c3..d49b97c9 100644 --- a/SDL/kunden/usrCntlIDSPreise.vb +++ b/SDL/kunden/usrCntlIDSPreise.vb @@ -1,8 +1,4 @@ -Imports System.Reflection -Imports System.Threading -Imports System.Web.UI.WebControls.Expressions -Imports com.sun.xml.internal.rngom -Imports VERAG_PROG_ALLGEMEIN +Imports VERAG_PROG_ALLGEMEIN Public Class usrCntlIDSPreise @@ -159,11 +155,12 @@ Public Class usrCntlIDSPreise ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" Case "LK" - SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.CustomerCode,Adressen.Ordnungsbegriff AS CustomerName,tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter + SQL_ = "SELECT tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.CustomerCode,Adressen.Ordnungsbegriff AS CustomerName,tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN (Adressen INNER JOIN tbl_IDS_Rechenwerte ON Adressen.AdressenNr = tbl_IDS_Rechenwerte.CustomerCode) ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode WHERE (((tbl_IDS_Rechenwerte.CustomerCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.OutletCode) Is Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode & ") ", ") ") & SQL_WHERE & " ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, Adressen.Ordnungsbegriff, tbl_IDS_Rechenwerte.CustomerCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" + Case "LSK" SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID,tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Länder.OutletCountry,tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.CustomerCode,Adressen.Ordnungsbegriff AS CustomerName, tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN (Adressen INNER JOIN (tbl_IDS_Stationen INNER JOIN tbl_IDS_Rechenwerte ON (tbl_IDS_Stationen.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) AND (tbl_IDS_Stationen.OutletCode = tbl_IDS_Rechenwerte.OutletCode)) ON Adressen.AdressenNr = tbl_IDS_Rechenwerte.CustomerCode) ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode @@ -204,13 +201,57 @@ Public Class usrCntlIDSPreise VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try + If edit Then + + 'Select Case cbxTypes._value + ' Case "L" + ' SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID, tbl_IDS_Rechenwerte.OutletCountryCode,tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.ProductTypeCode,tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter + ' FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN tbl_IDS_Rechenwerte ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode + ' WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode & ") ", ") ") & SQL_WHERE & " + ' ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" + + ' Case "LS" + ' SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID,tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Stationen.OutletName,tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter + ' FROM tbl_IDS_Produkte + ' INNER JOIN (tbl_IDS_Länder + ' INNER JOIN (tbl_IDS_Stationen + ' INNER JOIN tbl_IDS_Rechenwerte ON (tbl_IDS_Stationen.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) AND (tbl_IDS_Stationen.OutletCode = tbl_IDS_Rechenwerte.OutletCode)) ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) + ' ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode + ' WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode & ") ", ") ") & SQL_WHERE & " + ' ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" + + ' Case "LK" + ' FUNC.dgvCellToCbo(dgvOfferteDetails, 1, "OutletCountryCode", "OutletCountryCode", " SELECT [OutletCountryCode], OutletCountry FROM [tbl_IDS_Länder] ORDER BY OutletCountry ", "FMZOLL", 150) + ' 'FUNC.dgvCellToCbo(dgvOfferteDetails, 5, "BGebLeist.", "BGebLeistungsNr", " SELECT [LeistungsNr], CAST(LeistungsNr as varchar(3)) + ' - ' + [LeistungsBez] as LeistungsBez FROM [Leistungen] ORDER BY [LeistungsNr] ", "FMZOLL", 250) + + ' Case "LSK" + ' SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID,tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Länder.OutletCountry,tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.CustomerCode,Adressen.Ordnungsbegriff AS CustomerName, tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter + ' FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN (Adressen INNER JOIN (tbl_IDS_Stationen INNER JOIN tbl_IDS_Rechenwerte ON (tbl_IDS_Stationen.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) AND (tbl_IDS_Stationen.OutletCode = tbl_IDS_Rechenwerte.OutletCode)) ON Adressen.AdressenNr = tbl_IDS_Rechenwerte.CustomerCode) ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode + ' WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Not Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode & ") ", ") ") & SQL_WHERE & " + ' ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, Adressen.Ordnungsbegriff, tbl_IDS_Rechenwerte.CustomerCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" + + ' Case "KRW" + ' SQL_ = "SELECT tbl_IDS_Kategorien_Rechenwerte.ID as ID, tbl_IDS_Kategorien_Rechenwerte.KategorieNr, tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Kategorien_Rechenwerte.Rechenwert, tbl_IDS_Kategorien_Rechenwerte.Zeitstempel, tbl_IDS_Kategorien_Rechenwerte.Sachbearbeiter + ' FROM tbl_IDS_Produkte INNER JOIN tbl_IDS_Kategorien_Rechenwerte ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode + ' WHERE 1 = 1 " & SQL_WHERE & " + ' ORDER BY tbl_IDS_Kategorien_Rechenwerte.KategorieNr, tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode;" + + + ' Case "KOR" + ' SQL_ = "SELECT tbl_IDS_Kunden_ohne_Rabatt.CustomerCode, tbl_IDS_Kunden_ohne_Rabatt.Zeitstempel, tbl_IDS_Kunden_ohne_Rabatt.Sachbearbeiter + ' FROM tbl_IDS_Kunden_ohne_Rabatt + ' WHERE 1 = 1 " & SQL_WHERE & " + ' ORDER BY tbl_IDS_Kunden_ohne_Rabatt.CustomerCode;" + + 'End Select + End If + '.DataSource = SQL.loadDgvBySql(" SELECT [LeistungsNr],[LeistungsBez],[BerechnungsartNr],[Preis],[Anzahl],[BGebLeistungsNr],[BGebProzent],[BGebMinBetrag],[Eingegeben am],[Geändert am],[Sachbearbeiter],[PreisänderungProzent],[PreisAlt],[Preisänderung] " & ' " FROM [Offertenpositionen] " & ' " WHERE KundenNr='" & kdNr & "' and OffertenNr='" & OffertenNr & "' ORDER BY LeistungsNr ", "FMZOLL") - 'FUNC.dgvCellToCbo(dgvOfferteDetails, 2, "Kz", "Kz", " SELECT [BerechnungsartNr], CAST(BerechnungsartNr as varchar(3)) + ' - ' + [BerechnungsartBez] as [BerechnungsartBez] FROM [Berechnungsart] ORDER BY BerechnungsartNr ", "FMZOLL", 150) - 'FUNC.dgvCellToCbo(dgvOfferteDetails, 5, "BGebLeist.", "BGebLeistungsNr", " SELECT [LeistungsNr], CAST(LeistungsNr as varchar(3)) + ' - ' + [LeistungsBez] as LeistungsBez FROM [Leistungen] ORDER BY [LeistungsNr] ", "FMZOLL", 250) + If .Columns.Contains("ID") Then .Columns("ID").Visible = False If .Columns.Contains("Kz") Then .Columns("Kz").Width = 25 @@ -449,15 +490,36 @@ Public Class usrCntlIDSPreise Private Sub dgvOfferteDetails_CellValueChanged(sender As Object, e As DataGridViewCellEventArgs) Handles dgvOfferteDetails.CellValueChanged Try Select Case cbxTypes._value - Case "L", "LS", "LSK", "KRW", "LSK" + Case "L", "LS", "LSK", "KRW", "LSK", "LK" If loaded = True Then If currentIDS IsNot Nothing Then currentIDS.Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME currentIDS.Zeitstempel = Now - Select Case dgvOfferteDetails.CurrentCell.ColumnIndex - Case 5 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso IsNumeric(dgvOfferteDetails.CurrentCell.Value) Then currentIDS.Rechenwert = CDbl(dgvOfferteDetails.CurrentCell.Value) - Case 6 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso dgvOfferteDetails.CurrentCell.Value <> "" AndAlso (dgvOfferteDetails.CurrentCell.Value = "R" Or dgvOfferteDetails.CurrentCell.Value = "P") Then currentIDS.Kz = dgvOfferteDetails.CurrentCell.Value.ToString + Select Case cbxTypes._value + Case "L" + Select Case dgvOfferteDetails.CurrentCell.ColumnIndex + ' Case 0 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso IsNumeric(dgvOfferteDetails.CurrentCell.Value) Then currentIDS.OutletCode = CInt(dgvOfferteDetails.CurrentCell.Value) + Case 5 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso IsNumeric(dgvOfferteDetails.CurrentCell.Value) Then currentIDS.Rechenwert = CDbl(dgvOfferteDetails.CurrentCell.Value) + Case 6 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso dgvOfferteDetails.CurrentCell.Value <> "" AndAlso (dgvOfferteDetails.CurrentCell.Value = "R" Or dgvOfferteDetails.CurrentCell.Value = "P") Then currentIDS.Kz = dgvOfferteDetails.CurrentCell.Value.ToString + End Select + + Case "LS" + + Select Case dgvOfferteDetails.CurrentCell.ColumnIndex + Case 5 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso IsNumeric(dgvOfferteDetails.CurrentCell.Value) Then currentIDS.Rechenwert = CDbl(dgvOfferteDetails.CurrentCell.Value) + Case 6 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso dgvOfferteDetails.CurrentCell.Value <> "" AndAlso (dgvOfferteDetails.CurrentCell.Value = "R" Or dgvOfferteDetails.CurrentCell.Value = "P") Then currentIDS.Kz = dgvOfferteDetails.CurrentCell.Value.ToString + End Select + + Case "LK" + + Select Case dgvOfferteDetails.CurrentCell.ColumnIndex + ' Case 1 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso IsNumeric(dgvOfferteDetails.CurrentCell.Value) Then currentIDS.OutletCode = CInt(dgvOfferteDetails.CurrentCell.Value) + ' Case 2 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso dgvOfferteDetails.CurrentCell.Value <> "" Then dgvOfferteDetails.CurrentRow.Cells("").Value = + Case 5 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso IsNumeric(dgvOfferteDetails.CurrentCell.Value) Then currentIDS.Rechenwert = CDbl(dgvOfferteDetails.CurrentCell.Value) + Case 6 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso dgvOfferteDetails.CurrentCell.Value <> "" AndAlso (dgvOfferteDetails.CurrentCell.Value = "R" Or dgvOfferteDetails.CurrentCell.Value = "P") Then currentIDS.Kz = dgvOfferteDetails.CurrentCell.Value.ToString + End Select + End Select @@ -528,7 +590,7 @@ Public Class usrCntlIDSPreise For Each c As DataGridViewColumn In .Columns If isVerag360 Then - If (c.Name = "Rechenwert" Or c.Name = "Kz") Then + If (c.Name = "Rechenwert" Or c.Name = "Kz" Or c.Name = "OutletCountryCode" Or c.Name = "OutletCountry" Or c.Name = "ProductTypeCode" Or c.Name = "ProductDescription" Or c.Name = "KategorieNr" Or c.Name = "CustomerCode" Or c.Name = "CustomerName") Then If edit Then c.ReadOnly = False handleEditMode(edit) @@ -698,6 +760,9 @@ Public Class usrCntlIDSPreise End If + Else + + 'currentIDS = New cIDSDieselpreisRW() End If diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb b/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb index dd9a7d3c..da6ad4d4 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb @@ -557,8 +557,8 @@ Public Class cRechnungsausgang If FIRMA.Firma_ID = 19 Then Select Case Me.BelegartenKz - Case "AR" : If (Me.SteuerfreierGesamtbetrag + Me.SteuerpflichtigerGesamtbetrag) < 0 Then errMsg = "ERROR: Vorzeichenfehler!" : Return False - Case "AG" : If (Me.SteuerfreierGesamtbetrag + Me.SteuerpflichtigerGesamtbetrag) > 0 Then errMsg = "ERROR: Vorzeichenfehler!" : Return False + Case "AR" : If (Me.SteuerfreierGesamtbetrag + Me.SteuerpflichtigerGesamtbetrag) > 0 Then errMsg = "ERROR: Vorzeichenfehler!" : Return False + Case "AG" : If (Me.SteuerfreierGesamtbetrag + Me.SteuerpflichtigerGesamtbetrag) < 0 Then errMsg = "ERROR: Vorzeichenfehler!" : Return False End Select End If diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb index c30b42e1..a3c09400 100644 --- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb +++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb @@ -408,12 +408,14 @@ Public Class frmUeberstundenauszahlen Next If (stunden100bereitsausbezahl + stunden50bereitsausbezahlt + stunden25bereitsausbezahlt) > 0 Then + If MA.mit_firma = "ATILLA" Then GoTo sonderRegelungAtilla : picDel.Visible = True Button1.Enabled = False txtAusz.Enabled = False picShow.Visible = True Else - Button1.Enabled = True +sonderRegelungAtilla: + Button1.Enabled = True txtAusz.Enabled = True picShow.Visible = False @@ -816,6 +818,10 @@ Public Class frmUeberstundenauszahlen If istTeilzeit Then txtAusgabe.Append("25% ÜS: " & CDbl(txtberAusz25.Text) & vbNewLine) 'txtAusgabe.Append("ÜS gesamt: " & CDbl(txtberAusz100.Text) + CDbl(txtberAusz50.Text) + CDbl(txtberAusz25.Text)) + If cbxabwDatum.Checked Then + MsgBox("Das Zurücksetzen von bereits ausgezahlten Stunden bei abweichenden Datum wird aktuell (noch) nicht unterstützt!") + Exit Sub + End If Dim aksAuszahlung As MsgBoxResult = MsgBox(txtAusgabe.ToString, vbYesNo) If aksAuszahlung = vbYes Then diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb index 405d1131..35a6f83a 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb @@ -2,16 +2,9 @@ Imports System.Data.SqlClient Imports System.IO Imports System.Net -Imports System.Numerics Imports System.Reflection -Imports System.Runtime.InteropServices.ComTypes Imports System.Text.RegularExpressions Imports System.Threading -Imports System.Web.UI -Imports com.sun.org.apache.xalan.internal.xsltc -Imports com.sun.source.tree -Imports Microsoft.VisualBasic.ApplicationServices -Imports Org.BouncyCastle.Ocsp Public Class cCreditSafeAPI @@ -497,14 +490,14 @@ Public Class cCreditSafeAPI If failureDesc <> "" Then If showError Then MsgBox(failureDesc) - Return "Error" + Return "Error" & vbNewLine & failureDesc & vbNewLine & myUrl End If Dim json As New Chilkat.JsonObject Dim success As Boolean = json.Load(jsonRespString) If (success <> True) Then Debug.WriteLine(json.LastErrorText) - Return "Verbindungsfehler" + Return "Verbindungsfehler" & vbNewLine & json.LastErrorText End If If dtEvents.Columns.Count = 0 Then @@ -575,7 +568,7 @@ Public Class cCreditSafeAPI dtEvents.Rows.Add(R) - Dim cEvent As New cCreditsafeEvent(CLng(R("eventId"))) + Dim cEvent As New cCreditsafeEvent(CLng(R("eventId")), company.kdNr) cEvent.eventId = R("eventId") cEvent.companyId = R("companyId") @@ -1409,9 +1402,16 @@ Public Class cCreditSafeAPI Me.eventId = eventId LOAD() End Sub + + Sub New(eventId, kundenNr) 'zwei unterschiedliche KundenNr können dieselbe eventID besitzen (weil bei uns alles tlw. doppelt angelegt ist!!!!!) + Me.eventId = eventId + kundenNr = kundenNr + LOADKDNR() + 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("eventId", eventId,, True)) + 'list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eventId", eventId,, True)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eventId", eventId)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("companyId", companyId)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("portfolioId", portfolioId)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ruleName", ruleName)) @@ -1443,7 +1443,7 @@ Public Class cCreditSafeAPI Public Function SAVE() As Boolean Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() - Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblCreditsafeEvents WHERE eventId=@eventId) " & + Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblCreditsafeEvents WHERE eventId=@eventId AND kundenNr=@kundenNr) " & " BEGIN " & getUpdateCmd() & " END " & " Else " & " BEGIN " & getInsertCmd() & " END " & @@ -1480,6 +1480,35 @@ Public Class cCreditSafeAPI End Try End Sub + Public Sub LOADKDNR() + Try + hasEntry = False + Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() + Using cmd As New SqlCommand("SELECT * FROM tblCreditsafeEvents WHERE eventId=@eventId AND kundenNr=@kundenNr ", conn) + cmd.Parameters.AddWithValue("@eventId", eventId) + cmd.Parameters.AddWithValue("@kundenNr", kundenNr) + Dim dr = cmd.ExecuteReader() + If dr.Read Then + For Each li In getParameterList() + Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable) + + If dr.Item(li.Text) Is DBNull.Value Then + propInfo.SetValue(Me, Nothing) + Else + propInfo.SetValue(Me, dr.Item(li.Text)) + End If + + Next + hasEntry = True + End If + dr.Close() + End Using + End Using + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + End Sub + Public Function getUpdateCmd() As String @@ -1493,7 +1522,7 @@ Public Class cCreditSafeAPI End If Next str = str.Substring(0, str.Length - 1) 'wg. ',' - Return (" UPDATE tblCreditsafeEvents SET " & str & " WHERE eventId=@eventId ") + Return (" UPDATE tblCreditsafeEvents SET " & str & " WHERE eventId=@eventId AND kundenNr=@kundenNr") Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) From 28ce22c2bd21ce93c798f839cdbcfc3139505dab Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 24 Sep 2025 15:36:51 +0200 Subject: [PATCH 14/27] Mitarbeiter, Creditsafe-Infos, etc. --- SDL/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index f61d46c6..e0eb921b 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + From 0871e82f58d585423a7ef7ee4eacee1a5c210b28 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 25 Sep 2025 13:04:53 +0200 Subject: [PATCH 15/27] faktAbr, CreditsafeAPI, etc. --- .../usrCntlFaktAbrechnung.Designer.vb | 68 ++-- SDL/Fakturierung/usrCntlFaktAbrechnung.vb | 6 +- SDL/kunden/usrCntlIDSPreise.vb | 75 ++-- .../Creditsafe/cCreditSafeAPI.vb | 358 +++++++++++++----- 4 files changed, 333 insertions(+), 174 deletions(-) diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb index 7c5f2213..588afe0e 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb @@ -158,6 +158,8 @@ Partial Class usrCntlFaktAbrechnung Me.txtZollbelegNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label10 = New System.Windows.Forms.Label() Me.pnlRechnungAn = New System.Windows.Forms.Panel() + Me.cboRgArt = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.Label57 = New System.Windows.Forms.Label() Me.cboVorauskasse = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label56 = New System.Windows.Forms.Label() Me.txtRechnungAnZusatz = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -204,7 +206,7 @@ Partial Class usrCntlFaktAbrechnung Me.Button7 = New System.Windows.Forms.Button() Me.btnVorauskasseAnzeigen = New System.Windows.Forms.Button() Me.Button5 = New System.Windows.Forms.Button() - Me.btn = New System.Windows.Forms.Button() + Me.btnZoll_EUST = New System.Windows.Forms.Button() Me.txtUnterNrRef = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.cboFilialeRef = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.txtAbfertigungsnummerRef = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -286,8 +288,6 @@ Partial Class usrCntlFaktAbrechnung Me.GutschriftAnVeragToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.VeragAGToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.VeragCSToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.cboRgArt = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.Label57 = New System.Windows.Forms.Label() Me.pnlTop.SuspendLayout() Me.Panel3.SuspendLayout() Me.Panel1.SuspendLayout() @@ -2058,6 +2058,27 @@ Partial Class usrCntlFaktAbrechnung Me.pnlRechnungAn.Size = New System.Drawing.Size(582, 153) Me.pnlRechnungAn.TabIndex = 0 ' + 'cboRgArt + ' + Me.cboRgArt._allowedValuesFreiText = Nothing + Me.cboRgArt._allowFreiText = False + Me.cboRgArt._value = "" + Me.cboRgArt.FormattingEnabled = True + Me.cboRgArt.Location = New System.Drawing.Point(478, 127) + Me.cboRgArt.Name = "cboRgArt" + Me.cboRgArt.Size = New System.Drawing.Size(97, 21) + Me.cboRgArt.TabIndex = 246 + ' + 'Label57 + ' + Me.Label57.AutoSize = True + Me.Label57.Location = New System.Drawing.Point(431, 130) + Me.Label57.Name = "Label57" + Me.Label57.Size = New System.Drawing.Size(42, 13) + Me.Label57.TabIndex = 245 + Me.Label57.Text = "RG-Art:" + Me.Label57.TextAlign = System.Drawing.ContentAlignment.TopRight + ' 'cboVorauskasse ' Me.cboVorauskasse._allowedValuesFreiText = Nothing @@ -2715,7 +2736,7 @@ Partial Class usrCntlFaktAbrechnung Me.Panel7.Controls.Add(Me.Button7) Me.Panel7.Controls.Add(Me.btnVorauskasseAnzeigen) Me.Panel7.Controls.Add(Me.Button5) - Me.Panel7.Controls.Add(Me.btn) + Me.Panel7.Controls.Add(Me.btnZoll_EUST) Me.Panel7.Controls.Add(Me.txtUnterNrRef) Me.Panel7.Controls.Add(Me.cboFilialeRef) Me.Panel7.Controls.Add(Me.txtAbfertigungsnummerRef) @@ -2851,15 +2872,15 @@ Partial Class usrCntlFaktAbrechnung Me.Button5.Text = "Offerten bearbeiten" Me.Button5.UseVisualStyleBackColor = True ' - 'btn + 'btnZoll_EUST ' - Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btn.Location = New System.Drawing.Point(656, 3) - Me.btn.Name = "btn" - Me.btn.Size = New System.Drawing.Size(165, 23) - Me.btn.TabIndex = 10 - Me.btn.Text = "ZOLL / EUST Daten (F3)" - Me.btn.UseVisualStyleBackColor = True + Me.btnZoll_EUST.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnZoll_EUST.Location = New System.Drawing.Point(656, 3) + Me.btnZoll_EUST.Name = "btnZoll_EUST" + Me.btnZoll_EUST.Size = New System.Drawing.Size(165, 23) + Me.btnZoll_EUST.TabIndex = 10 + Me.btnZoll_EUST.Text = "ZOLL / EUST Daten (F3)" + Me.btnZoll_EUST.UseVisualStyleBackColor = True ' 'txtUnterNrRef ' @@ -4035,27 +4056,6 @@ Partial Class usrCntlFaktAbrechnung Me.VeragCSToolStripMenuItem.Size = New System.Drawing.Size(122, 22) Me.VeragCSToolStripMenuItem.Text = "Verag CS" ' - 'cboRgArt - ' - Me.cboRgArt._allowedValuesFreiText = Nothing - Me.cboRgArt._allowFreiText = False - Me.cboRgArt._value = "" - Me.cboRgArt.FormattingEnabled = True - Me.cboRgArt.Location = New System.Drawing.Point(478, 127) - Me.cboRgArt.Name = "cboRgArt" - Me.cboRgArt.Size = New System.Drawing.Size(97, 21) - Me.cboRgArt.TabIndex = 246 - ' - 'Label57 - ' - Me.Label57.AutoSize = True - Me.Label57.Location = New System.Drawing.Point(431, 130) - Me.Label57.Name = "Label57" - Me.Label57.Size = New System.Drawing.Size(42, 13) - Me.Label57.TabIndex = 245 - Me.Label57.Text = "RG-Art:" - Me.Label57.TextAlign = System.Drawing.ContentAlignment.TopRight - ' 'usrCntlFaktAbrechnung ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -4264,7 +4264,7 @@ Partial Class usrCntlFaktAbrechnung Friend WithEvents btnNeueUnterNR As Button Friend WithEvents cboRgGS As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents cboSammelrechnung As VERAG_PROG_ALLGEMEIN.MyComboBox - Friend WithEvents btn As Button + Friend WithEvents btnZoll_EUST As Button Friend WithEvents Button5 As Button Friend WithEvents btnVorauskasseAnzeigen As Button Friend WithEvents Button6 As Button diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb index 94df661d..c466fb2f 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb @@ -3686,7 +3686,7 @@ Nächste_Textzeile_lesen: End If If keyData = Keys.F3 AndAlso cboSammelrechnung._value = 0 Then - btn.PerformClick() + btnZoll_EUST.PerformClick() Return True End If @@ -3740,7 +3740,7 @@ Nächste_Textzeile_lesen: f.Show(Me) End Sub - Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click + Private Sub btn_Click(sender As Object, e As EventArgs) Handles btnZoll_EUST.Click Dim bezugsNr = "" If RECHNUNG IsNot Nothing Then bezugsNr = RECHNUNG.FilialenNr & "/" & RECHNUNG.AbfertigungsNr & "" @@ -4707,7 +4707,7 @@ Nächste_Textzeile_lesen: Private Sub cboSammelrechnung_SelectedValueChanged(sender As Object, e As EventArgs) Handles cboSammelrechnung.SelectedValueChanged - btn.Enabled = IIf(cboSammelrechnung._value = 0, True, False) + btnZoll_EUST.Enabled = IIf(cboSammelrechnung._value = 0, True, False) End Sub diff --git a/SDL/kunden/usrCntlIDSPreise.vb b/SDL/kunden/usrCntlIDSPreise.vb index d49b97c9..e883df91 100644 --- a/SDL/kunden/usrCntlIDSPreise.vb +++ b/SDL/kunden/usrCntlIDSPreise.vb @@ -203,47 +203,48 @@ Public Class usrCntlIDSPreise If edit Then - 'Select Case cbxTypes._value - ' Case "L" - ' SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID, tbl_IDS_Rechenwerte.OutletCountryCode,tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.ProductTypeCode,tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter - ' FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN tbl_IDS_Rechenwerte ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode - ' WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode & ") ", ") ") & SQL_WHERE & " - ' ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" + Select Case cbxTypes._value + Case "L" + SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID, tbl_IDS_Rechenwerte.OutletCountryCode,tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.ProductTypeCode,tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter + FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN tbl_IDS_Rechenwerte ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode + WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode & ") ", ") ") & SQL_WHERE & " + ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" - ' Case "LS" - ' SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID,tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Stationen.OutletName,tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter - ' FROM tbl_IDS_Produkte - ' INNER JOIN (tbl_IDS_Länder - ' INNER JOIN (tbl_IDS_Stationen - ' INNER JOIN tbl_IDS_Rechenwerte ON (tbl_IDS_Stationen.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) AND (tbl_IDS_Stationen.OutletCode = tbl_IDS_Rechenwerte.OutletCode)) ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) - ' ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode - ' WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode & ") ", ") ") & SQL_WHERE & " - ' ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" + Case "LS" + SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID,tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Stationen.OutletName,tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter + FROM tbl_IDS_Produkte + INNER JOIN (tbl_IDS_Länder + INNER JOIN (tbl_IDS_Stationen + INNER JOIN tbl_IDS_Rechenwerte ON (tbl_IDS_Stationen.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) AND (tbl_IDS_Stationen.OutletCode = tbl_IDS_Rechenwerte.OutletCode)) ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) + ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode + WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode & ") ", ") ") & SQL_WHERE & " + ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" - ' Case "LK" - ' FUNC.dgvCellToCbo(dgvOfferteDetails, 1, "OutletCountryCode", "OutletCountryCode", " SELECT [OutletCountryCode], OutletCountry FROM [tbl_IDS_Länder] ORDER BY OutletCountry ", "FMZOLL", 150) - ' 'FUNC.dgvCellToCbo(dgvOfferteDetails, 5, "BGebLeist.", "BGebLeistungsNr", " SELECT [LeistungsNr], CAST(LeistungsNr as varchar(3)) + ' - ' + [LeistungsBez] as LeistungsBez FROM [Leistungen] ORDER BY [LeistungsNr] ", "FMZOLL", 250) + Case "LK" - ' Case "LSK" - ' SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID,tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Länder.OutletCountry,tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.CustomerCode,Adressen.Ordnungsbegriff AS CustomerName, tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter - ' FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN (Adressen INNER JOIN (tbl_IDS_Stationen INNER JOIN tbl_IDS_Rechenwerte ON (tbl_IDS_Stationen.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) AND (tbl_IDS_Stationen.OutletCode = tbl_IDS_Rechenwerte.OutletCode)) ON Adressen.AdressenNr = tbl_IDS_Rechenwerte.CustomerCode) ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode - ' WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Not Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode & ") ", ") ") & SQL_WHERE & " - ' ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, Adressen.Ordnungsbegriff, tbl_IDS_Rechenwerte.CustomerCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" + FUNC.dgvCellToCbo(dgvOfferteDetails, 1, "OutletCountryCode", "OutletCountryCode", " SELECT [OutletCountryCode], OutletCountry FROM [tbl_IDS_Länder] ORDER BY OutletCountry ", "FMZOLL", 150) + 'FUNC.dgvCellToCbo(dgvOfferteDetails, 5, "BGebLeist.", "BGebLeistungsNr", " SELECT [LeistungsNr], CAST(LeistungsNr as varchar(3)) + ' - ' + [LeistungsBez] as LeistungsBez FROM [Leistungen] ORDER BY [LeistungsNr] ", "FMZOLL", 250) - ' Case "KRW" - ' SQL_ = "SELECT tbl_IDS_Kategorien_Rechenwerte.ID as ID, tbl_IDS_Kategorien_Rechenwerte.KategorieNr, tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Kategorien_Rechenwerte.Rechenwert, tbl_IDS_Kategorien_Rechenwerte.Zeitstempel, tbl_IDS_Kategorien_Rechenwerte.Sachbearbeiter - ' FROM tbl_IDS_Produkte INNER JOIN tbl_IDS_Kategorien_Rechenwerte ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode - ' WHERE 1 = 1 " & SQL_WHERE & " - ' ORDER BY tbl_IDS_Kategorien_Rechenwerte.KategorieNr, tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode;" + Case "LSK" + SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID,tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Länder.OutletCountry,tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.CustomerCode,Adressen.Ordnungsbegriff AS CustomerName, tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter + FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN (Adressen INNER JOIN (tbl_IDS_Stationen INNER JOIN tbl_IDS_Rechenwerte ON (tbl_IDS_Stationen.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) AND (tbl_IDS_Stationen.OutletCode = tbl_IDS_Rechenwerte.OutletCode)) ON Adressen.AdressenNr = tbl_IDS_Rechenwerte.CustomerCode) ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode + WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Not Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode & ") ", ") ") & SQL_WHERE & " + ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, Adressen.Ordnungsbegriff, tbl_IDS_Rechenwerte.CustomerCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" + + Case "KRW" + SQL_ = "SELECT tbl_IDS_Kategorien_Rechenwerte.ID as ID, tbl_IDS_Kategorien_Rechenwerte.KategorieNr, tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Kategorien_Rechenwerte.Rechenwert, tbl_IDS_Kategorien_Rechenwerte.Zeitstempel, tbl_IDS_Kategorien_Rechenwerte.Sachbearbeiter + FROM tbl_IDS_Produkte INNER JOIN tbl_IDS_Kategorien_Rechenwerte ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode + WHERE 1 = 1 " & SQL_WHERE & " + ORDER BY tbl_IDS_Kategorien_Rechenwerte.KategorieNr, tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode;" - ' Case "KOR" - ' SQL_ = "SELECT tbl_IDS_Kunden_ohne_Rabatt.CustomerCode, tbl_IDS_Kunden_ohne_Rabatt.Zeitstempel, tbl_IDS_Kunden_ohne_Rabatt.Sachbearbeiter - ' FROM tbl_IDS_Kunden_ohne_Rabatt - ' WHERE 1 = 1 " & SQL_WHERE & " - ' ORDER BY tbl_IDS_Kunden_ohne_Rabatt.CustomerCode;" + Case "KOR" + SQL_ = "SELECT tbl_IDS_Kunden_ohne_Rabatt.CustomerCode, tbl_IDS_Kunden_ohne_Rabatt.Zeitstempel, tbl_IDS_Kunden_ohne_Rabatt.Sachbearbeiter + FROM tbl_IDS_Kunden_ohne_Rabatt + WHERE 1 = 1 " & SQL_WHERE & " + ORDER BY tbl_IDS_Kunden_ohne_Rabatt.CustomerCode;" - 'End Select + End Select End If @@ -514,8 +515,8 @@ Public Class usrCntlIDSPreise Case "LK" Select Case dgvOfferteDetails.CurrentCell.ColumnIndex - ' Case 1 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso IsNumeric(dgvOfferteDetails.CurrentCell.Value) Then currentIDS.OutletCode = CInt(dgvOfferteDetails.CurrentCell.Value) - ' Case 2 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso dgvOfferteDetails.CurrentCell.Value <> "" Then dgvOfferteDetails.CurrentRow.Cells("").Value = + Case 1 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso IsNumeric(dgvOfferteDetails.CurrentCell.Value) Then currentIDS.OutletCode = CInt(dgvOfferteDetails.CurrentCell.Value) + 'Case 2 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso dgvOfferteDetails.CurrentCell.Value <> "" Then dgvOfferteDetails.CurrentRow.Cells("").Value = Case 5 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso IsNumeric(dgvOfferteDetails.CurrentCell.Value) Then currentIDS.Rechenwert = CDbl(dgvOfferteDetails.CurrentCell.Value) Case 6 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso dgvOfferteDetails.CurrentCell.Value <> "" AndAlso (dgvOfferteDetails.CurrentCell.Value = "R" Or dgvOfferteDetails.CurrentCell.Value = "P") Then currentIDS.Kz = dgvOfferteDetails.CurrentCell.Value.ToString End Select @@ -762,7 +763,7 @@ Public Class usrCntlIDSPreise Else - 'currentIDS = New cIDSDieselpreisRW() + currentIDS = New cIDSDieselpreisRW() End If diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb index 35a6f83a..ff895f01 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb @@ -5,6 +5,7 @@ Imports System.Net Imports System.Reflection Imports System.Text.RegularExpressions Imports System.Threading +Imports VERAG_PROG_ALLGEMEIN.TESTJSON Public Class cCreditSafeAPI @@ -97,7 +98,7 @@ Public Class cCreditSafeAPI - Shared Function SendGetRequestWithAuthHeader(url As String, company As Company, acceptContentType As String, method As String, authenticationToken As String, ByRef failureDesc As String, Optional isMonitoring As Boolean = False, Optional csvImport As Boolean = False, Optional csvFile As String = "") As String + Shared Function SendGetRequestWithAuthHeader(url As String, company As Company, acceptContentType As String, method As String, authenticationToken As String, ByRef failureDesc As String, Optional isMonitoring As Boolean = False, Optional csvImport As Boolean = False, Optional csvFile As String = "", Optional notifEvents As Boolean = False, Optional page As Integer = 0) As String Try VERAG_PROG_ALLGEMEIN.cChilkat_Helper.UnlockCilkat() @@ -118,9 +119,9 @@ Public Class cCreditSafeAPI rest.ClearAllQueryParams() - If company IsNot Nothing AndAlso Not isMonitoring Then + If company IsNot Nothing Then - setSearchParam(rest, company) + setSearchParam(rest, company, isMonitoring, notifEvents, page) End If @@ -175,7 +176,7 @@ Public Class cCreditSafeAPI End If - Else + ElseIf Not notifEvents Then Dim json As New Chilkat.JsonObject success = json.UpdateString("id", company.creditSafeId) @@ -207,6 +208,7 @@ Public Class cCreditSafeAPI End If + End If End If @@ -340,7 +342,6 @@ Public Class cCreditSafeAPI End Function - Shared Function AddCompaniesCSVToPortfolio(csvFilePath As String, sync As Boolean, Optional PortfolioID As String = "1662419") As String Dim myUri As String = API_STRING & "/v1/monitoring/portfolios/" & PortfolioID & IIf(sync, "/sync", "/import") 'Default @@ -471,7 +472,7 @@ Public Class cCreditSafeAPI End Function - Shared Function getCompanyEvents(company As Company, ByRef dtEvents As DataTable, Optional checklastChecked As Boolean = False, Optional updateKunden As Boolean = False, Optional showError As Boolean = False, Optional getTotalNr As Boolean = False, Optional setzeKundenbesonderheiten As Boolean = False, Optional sendMail As Boolean = False) As String + Shared Function getCompanyEvents(company As Company, ByRef dtEvents As DataTable, ByRef companyDetailEvents As Boolean, ByRef maxPages As Integer, Optional checklastChecked As Boolean = False, Optional updateKunden As Boolean = False, Optional showError As Boolean = False, Optional getTotalNr As Boolean = False, Optional setzeKundenbesonderheiten As Boolean = False, Optional sendMail As Boolean = False, Optional firma As String = "VERAG", Optional page As Integer = 0) As String 'rest.AddQueryParam("from", Today().AddDays(-1)) @@ -485,8 +486,17 @@ Public Class cCreditSafeAPI End If Dim failureDesc As String - Dim myUrl As String = API_STRING & "/v1/monitoring/companies/" & company.creditSafeId & "/events" & IIf(checklastChecked, "?startDate=" & checkDate, "") - Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token, failureDesc) + + Dim myUrl As String = "" + + If Not companyDetailEvents Then + myUrl = API_STRING & "/v1/monitoring/portfolios/1662419/notificationEvents" + Else + myUrl = API_STRING & "/v1/monitoring/companies/" & company.creditSafeId & "/events" & IIf(checklastChecked, "?startDate=" & checkDate, "") + End If + + + Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token, failureDesc, Not companyDetailEvents,,, Not companyDetailEvents, page) If failureDesc <> "" Then If showError Then MsgBox(failureDesc) @@ -525,6 +535,15 @@ Public Class cCreditSafeAPI Return "data not found." End If + + Dim pagination As Chilkat.JsonObject = json.ObjectOf("pagination") + If Not (json.LastMethodSuccess = False) Then + Dim Lastpage As String = pagination.StringOf("last") + If IsNumeric(Lastpage) Then maxPages = Lastpage + End If + + + Dim numCompanies As Integer = companieData.Size Dim defaultCL As Double = -10000000 @@ -566,84 +585,51 @@ Public Class cCreditSafeAPI R("eventDate") = dateTime.GetAsTimestamp(getAsLocal) R("createdDate") = dateTime.GetAsTimestamp(getAsLocal) + If IsDBNull(R("companyId")) Then + Dim compObjHead As Chilkat.JsonObject = compObj.ObjectOf("company") + R("companyId") = compObjHead.StringOf("id") + If IsDBNull(R("portfolioId")) Then R("portfolioId") = compObjHead.StringOf("portfolioId") + End If + dtEvents.Rows.Add(R) - Dim cEvent As New cCreditsafeEvent(CLng(R("eventId")), company.kdNr) - - cEvent.eventId = R("eventId") - cEvent.companyId = R("companyId") - cEvent.portfolioId = R("portfolioId") - cEvent.ruleName = R("ruleName") - cEvent.localEventCode = R("localEventCode").trim() - cEvent.globalEventCode = R("globalEventCode").trim() - cEvent.eventDate = R("eventDate") - cEvent.createdDate = R("createdDate") - cEvent.importDate = Now() - cEvent.Sachbearbeiter = IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME Is Nothing, "AUTO", VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME) - cEvent.oldValue = R("oldValue") - cEvent.newValue = R("newValue") + Dim dtKundenNr As New DataTable + If company.kdNr = 0 Then + dtKundenNr = SQL.loadDgvBySql("select distinct(ba_KundenNr),f.Firma from Kunden + inner join tblKundenErweitert on Kunden.KundenNr = kde_KundenNr + inner join Filialen as f on f.FilialenNr = Kunden.FilialenNr + inner join tblBonitaetsauskunft on ba_KundenNr = kde_KundenNr + where isnull(tblKundenErweitert.kde_CreditSaveId,'') ='" & R("companyId") & "'", "FMZOLL") - 'OLD-VALUES - If cEvent.oldValue IsNot Nothing AndAlso IsNumeric(cEvent.oldValue) AndAlso Not cEvent.oldValue.ToString.Contains("€") Then - If cEvent.localEventCode = "CL" Or cEvent.globalEventCode = "CL" Then - cEvent.oldValueCL = cEvent.oldValue - ElseIf cEvent.localEventCode = "CR" Or cEvent.globalEventCode = "CR" Then - cEvent.oldValueCR = cEvent.oldValue - cEvent.oldValueCRIndex = calculatedBonIndexFromBonScore(cEvent.oldValue, cEvent.oldRiskClass) - End If + End If + + If dtKundenNr.Rows.Count > 0 Then + + For Each row As DataRow In dtKundenNr.Rows + company.kdNr = row("ba_KundenNr") + company.creditSafeId = R("companyId") + firma = row("Firma") + Dim currentBonID As String = (New SQL).getValueTxtBySql("Select Top(1) isnull(ba_id, -1) FROM [tblBonitaetsauskunft] where ba_KundenNr = " & company.kdNr & " AND [ba_Pruefungstool] = 'creditsafe API' ORDER BY ba_Datum DESC", "FMZOLL") + If currentBonID <> "" AndAlso IsNumeric(currentBonID) AndAlso currentBonID > 0 Then + company.csBonID = currentBonID + End If + createEvents(R, company.kdNr, company, CL, CR, CL_Datum, CR_Datum) + updateKundenWithEvent(company, CL, CR, CL_Datum, CR_Datum, setzeKundenbesonderheiten, defaultCR, defaultCL, updateKunden, sendMail, firma) + Next + + company.kdNr = 0 'wichtig, wieder zurücksetzen! Else - If cEvent.localEventCode = "CL" Or cEvent.globalEventCode = "CL" Then - cEvent.oldValue = Regex.Replace(cEvent.oldValue, "\s+", "") - cEvent.oldValue = Regex.Replace(cEvent.oldValue, "[^\d]", "") - cEvent.oldValueCL = cEvent.oldValue - ElseIf cEvent.localEventCode = "CR" Or cEvent.globalEventCode = "CR" Then - cEvent.oldValue = Regex.Replace(cEvent.oldValue, "\s+", "") - cEvent.oldValue = Regex.Replace(cEvent.oldValue, "[^\d]", "") - cEvent.oldValueCR = cEvent.oldValue - cEvent.oldValueCRIndex = calculatedBonIndexFromBonScore(cEvent.oldValue, cEvent.oldRiskClass) + + If company.kdNr <> 0 Then + createEvents(R, company.kdNr, company, CL, CR, CL_Datum, CR_Datum) End If End If - - 'NEW-VALUES - If cEvent.newValue IsNot Nothing AndAlso IsNumeric(cEvent.newValue) AndAlso Not cEvent.newValue.ToString.Contains("€") Then - If cEvent.localEventCode = "CL" Or cEvent.globalEventCode = "CL" Then - cEvent.newValueCL = cEvent.newValue - setCL_CR_Entry(CDate(cEvent.eventDate), "CL", cEvent.newValueCL, CL, CR, CL_Datum, CR_Datum) - ElseIf cEvent.localEventCode = "CR" Or cEvent.globalEventCode = "CR" Then - cEvent.newValueCR = cEvent.newValue - cEvent.newValueCRIndex = calculatedBonIndexFromBonScore(cEvent.newValue, cEvent.newRiskClass) - setCL_CR_Entry(CDate(cEvent.eventDate), "CR", cEvent.newValueCR, CL, CR, CL_Datum, CR_Datum) - End If - Else - - If cEvent.localEventCode = "CL" Or cEvent.globalEventCode = "CL" Then - cEvent.newValue = Regex.Replace(cEvent.newValue, "\s+", "") - cEvent.newValue = Regex.Replace(cEvent.newValue, "[^\d]", "") - cEvent.newValueCL = cEvent.newValue - setCL_CR_Entry(CDate(cEvent.eventDate), "CL", cEvent.newValueCL, CL, CR, CL_Datum, CR_Datum) - - ElseIf cEvent.localEventCode = "CR" Or cEvent.globalEventCode = "CR" Then - cEvent.newValue = Regex.Replace(cEvent.newValue, "\s+", "") - cEvent.newValue = Regex.Replace(cEvent.newValue, "[^\d]", "") - cEvent.newValueCR = cEvent.newValue - cEvent.newValueCRIndex = calculatedBonIndexFromBonScore(cEvent.newValue, cEvent.newRiskClass) - setCL_CR_Entry(CDate(cEvent.eventDate), "CR", cEvent.newValueCR, CL, CR, CL_Datum, CR_Datum) - End If - - End If - - If cEvent.bonId Is Nothing AndAlso company.csBonID > 0 Then - cEvent.bonId = company.csBonID - End If - - cEvent.kundenNr = company.kdNr - cEvent.SAVE() - j = j + 1 + End While 'Next @@ -654,6 +640,15 @@ Public Class cCreditSafeAPI 'viewEvents = New DataView(dtEvents, "localEventCode IN ('CL','CR') or e.globalEventCode IN ('CL','CR')", "", DataViewRowState.CurrentRows) End If + If company.kdNr <> 0 AndAlso companyDetailEvents Then updateKundenWithEvent(company, CL, CR, CL_Datum, CR_Datum, setzeKundenbesonderheiten, defaultCR, defaultCL, updateKunden, sendMail, firma) + + + Return "Anzahl gefundener Datensätze: " & numCompanies + + End Function + + Private Shared Sub updateKundenWithEvent(company As Company, CL As Integer, CR As Integer, CL_Datum As Date, CR_Datum As Date, setzeKundenbesonderheiten As Boolean, defaultCR As Integer, defaultCL As Integer, updateKunden As Boolean, sendMail As Boolean, Optional firma As String = "VERAG") + Dim triggerMail As Boolean = False If company.kdNr > 0 AndAlso (CR <> -1000000 Or CL <> -1000000) Then @@ -699,6 +694,10 @@ Public Class cCreditSafeAPI End If End If + If company.BANKRUPT_REGISTERED Then + createInfo("BANKRUPT_REGISTERED", KUNDE_ERW, KUNDE, CL, riskClass, Mailtext, triggerMail, setzeKundenbesonderheiten, company) + End If + If updateKunden Then KUNDE_ERW.SAVE() End If @@ -706,15 +705,119 @@ Public Class cCreditSafeAPI If triggerMail AndAlso sendMail Then Dim ADR As New cAdressen(KUNDE.KundenNr) - VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "d.breimaier@verag.ag", "as@verag.ag"), IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & "CREDITSAFE " & KUNDE.KundenNr, "Änderungen der Creditsafe-Daten von Kunden " & KUNDE.KundenNr & " " & ADR.Ordnungsbegriff & Mailtext.ToString & "

" & "*Automatic generated e-mail*",,,,, "d.breimaier@verag.ag") + Dim empfanegerMail = IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "d.breimaier@verag.ag", "as@verag.ag") + If Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then + Select Case firma + Case "VERAG" : empfanegerMail = "as@verag.ag" + Case "IMEX" : empfanegerMail = "Viktoria.Leirich@imex-group.at" + Case "AMBAR" : empfanegerMail = "Buchhaltung@ambarlog.com" + Case "UNISPED" : empfanegerMail = "sabine.muehlboeck@unisped.at" + End Select + End If + VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfanegerMail, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & "CREDITSAFE " & KUNDE.KundenNr, "Änderungen der Creditsafe-Daten von Kunden " & KUNDE.KundenNr & " " & ADR.Ordnungsbegriff & Mailtext.ToString & "

" & "*Automatic generated e-mail*",,,,, "d.breimaier@verag.ag") + End If + + End If + End Sub + + Private Shared Sub createEvents(R As DataRow, KundeNr As Integer, company As Company, CL As Integer, CR As Integer, ByRef CL_Datum As Date, ByRef CR_Datum As Date) + + + Dim cEvent As New cCreditsafeEvent(CLng(R("eventId")), KundeNr) + Dim globaleventcode As String = "" + + If Not IsDBNull(R("globalEventCode")) Then + globaleventcode = R("globalEventCode").trim() + ElseIf Not IsDBNull(R("localEventCode")) Then + Select Case R("localEventCode").trim() + Case "DECREASE_LIMIT", "INCREASE_LIMIT" : globaleventcode = "CL" + Case "DECREASE_RATING", "INCREASE_RATING" : globaleventcode = "CR" + End Select + End If + + + cEvent.eventId = R("eventId") + cEvent.companyId = R("companyId") + cEvent.portfolioId = R("portfolioId") + cEvent.ruleName = R("ruleName") + cEvent.localEventCode = R("localEventCode").trim() + cEvent.globalEventCode = globaleventcode + cEvent.eventDate = R("eventDate") + cEvent.createdDate = R("createdDate") + cEvent.importDate = Now() + cEvent.Sachbearbeiter = IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME Is Nothing, "AUTO", VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME) + cEvent.oldValue = R("oldValue") + cEvent.newValue = R("newValue") + + + 'OLD-VALUES + If cEvent.oldValue IsNot Nothing AndAlso IsNumeric(cEvent.oldValue) AndAlso Not cEvent.oldValue.ToString.Contains("€") Then + If cEvent.localEventCode = "CL" Or cEvent.globalEventCode = "CL" Then + cEvent.oldValueCL = cEvent.oldValue + ElseIf cEvent.localEventCode = "CR" Or cEvent.globalEventCode = "CR" Then + cEvent.oldValueCR = cEvent.oldValue + cEvent.oldValueCRIndex = calculatedBonIndexFromBonScore(cEvent.oldValue, cEvent.oldRiskClass) + End If + + Else + If cEvent.localEventCode = "CL" Or cEvent.globalEventCode = "CL" Then + cEvent.oldValue = Regex.Replace(cEvent.oldValue, "\s+", "") + cEvent.oldValue = Regex.Replace(cEvent.oldValue, "[^\d]", "") + cEvent.oldValueCL = cEvent.oldValue + ElseIf cEvent.localEventCode = "CR" Or cEvent.globalEventCode = "CR" Then + cEvent.oldValue = Regex.Replace(cEvent.oldValue, "\s+", "") + cEvent.oldValue = Regex.Replace(cEvent.oldValue, "[^\d]", "") + cEvent.oldValueCR = cEvent.oldValue + cEvent.oldValueCRIndex = calculatedBonIndexFromBonScore(cEvent.oldValue, cEvent.oldRiskClass) End If End If - Return "Anzahl gefundener Datensätze: " & numCompanies + 'NEW-VALUES + If cEvent.newValue IsNot Nothing AndAlso IsNumeric(cEvent.newValue) AndAlso Not cEvent.newValue.ToString.Contains("€") Then + If cEvent.localEventCode = "CL" Or cEvent.globalEventCode = "CL" Then + cEvent.newValueCL = cEvent.newValue + setCL_CR_Entry(CDate(cEvent.eventDate), "CL", cEvent.newValueCL, CL, CR, CL_Datum, CR_Datum) + ElseIf cEvent.localEventCode = "CR" Or cEvent.globalEventCode = "CR" Then + cEvent.newValueCR = cEvent.newValue + cEvent.newValueCRIndex = calculatedBonIndexFromBonScore(cEvent.newValue, cEvent.newRiskClass) + setCL_CR_Entry(CDate(cEvent.eventDate), "CR", cEvent.newValueCR, CL, CR, CL_Datum, CR_Datum) + End If + Else + + If cEvent.localEventCode = "CL" Or cEvent.globalEventCode = "CL" Then + cEvent.newValue = Regex.Replace(cEvent.newValue, "\s+", "") + cEvent.newValue = Regex.Replace(cEvent.newValue, "[^\d]", "") + cEvent.newValueCL = cEvent.newValue + setCL_CR_Entry(CDate(cEvent.eventDate), "CL", cEvent.newValueCL, CL, CR, CL_Datum, CR_Datum) + + ElseIf cEvent.localEventCode = "CR" Or cEvent.globalEventCode = "CR" Then + cEvent.newValue = Regex.Replace(cEvent.newValue, "\s+", "") + cEvent.newValue = Regex.Replace(cEvent.newValue, "[^\d]", "") + cEvent.newValueCR = cEvent.newValue + cEvent.newValueCRIndex = calculatedBonIndexFromBonScore(cEvent.newValue, cEvent.newRiskClass) + setCL_CR_Entry(CDate(cEvent.eventDate), "CR", cEvent.newValueCR, CL, CR, CL_Datum, CR_Datum) + End If + + End If + + If cEvent.localEventCode = "BANKRUPT_REGISTERED" Or cEvent.globalEventCode = "PR" Then + setBANCKRUPT_Entry(company, cEvent.eventDate) + End If + + If cEvent.bonId Is Nothing AndAlso company.csBonID > 0 Then + cEvent.bonId = company.csBonID + End If + + cEvent.kundenNr = company.kdNr + cEvent.SAVE() + + + + End Sub + - End Function Private Shared Sub setCL_CR_Entry(ByVal cs_date As Date, ByVal type As String, ByRef value As Object, ByRef CL As Double, ByRef CR As Integer, ByRef CL_Datum As Date, ByRef CR_Datum As Date) @@ -727,7 +830,9 @@ Public Class cCreditSafeAPI saveCR = True End If - If saveCR AndAlso IsNumeric(value) Then CR = value + If saveCR AndAlso IsNumeric(value) Then + CR = value + End If Case "CL" Dim saveCL As Boolean = False @@ -736,12 +841,24 @@ Public Class cCreditSafeAPI saveCL = True End If - If saveCL AndAlso IsNumeric(value) Then CL = value + If saveCL AndAlso IsNumeric(value) Then + CL = value + End If End Select End Sub + Private Shared Sub setBANCKRUPT_Entry(company As Company, ByVal BK_date As Date) + + If company.kdNr > 0 Then + company.BANKRUPT_REGISTERED = True + company.BANKRUPT_REGISTERED_DATE = BK_date + End If + + + End Sub + Shared Function getReport(ByRef company As Company, withPDF As Boolean) As String 'Shared Function getReport(ByRef company As Company, withPDF As Boolean, ByRef bytes As Byte()) As String Dim failureDesc As String = "" Dim myUrl As String = API_STRING & "/v1/companies/" & company.creditSafeId & "/" @@ -1019,30 +1136,58 @@ Public Class cCreditSafeAPI End Function - Shared Sub setSearchParam(ByRef rest As Chilkat.Rest, ByRef company As Company) + Shared Sub setSearchParam(ByRef rest As Chilkat.Rest, ByRef company As Company, ByRef isMonitoring As Boolean, isNotEvent As Boolean, Optional page As Integer = 0) + + If company IsNot Nothing Then + + If isMonitoring Then + + If isNotEvent Then + + rest.AddQueryParam("sortBy", "companyName") + rest.AddQueryParam("sortDir", "asc") + + If company.lastChecked >= Today.AddYears(-50) Then + + rest.AddQueryParam("startDate", company.lastChecked.ToString("yyyy-MM-ddTHH:mm:ss")) + rest.AddQueryParam("endDate", Now().ToString("yyyy-MM-ddTHH:mm:ss")) + rest.AddQueryParam("filterByCreatedDate", "true") + rest.AddQueryParam("pageSize", "1000") 'maximum + rest.AddQueryParam("page", page) + End If + + End If - rest.AddQueryParam("countries", company.country) - - - If company.creditsafeNo <> "" Then 'Eindeutiger Schlüssel - rest.AddQueryParam("safeNo", company.creditsafeNo) - - Else - If company.language <> "" Then rest.AddQueryParam("language", company.language) - - - If company.vatNo <> "" Then - rest.AddQueryParam("vatNo", company.vatNo) Else - If company.name <> "" Then rest.AddQueryParam("name", company.name) - If company.Street <> "" Then rest.AddQueryParam("street", company.Street) - If company.Postalcode <> "" Then rest.AddQueryParam("postCode", company.Postalcode) - If company.City <> "" Then rest.AddQueryParam("city", company.City) - End If + rest.AddQueryParam("countries", company.country) + + + If company.creditsafeNo <> "" Then 'Eindeutiger Schlüssel + rest.AddQueryParam("safeNo", company.creditsafeNo) + + Else + If company.language <> "" Then rest.AddQueryParam("language", company.language) + + + If company.vatNo <> "" Then + rest.AddQueryParam("vatNo", company.vatNo) + Else + If company.name <> "" Then rest.AddQueryParam("name", company.name) + If company.Street <> "" Then rest.AddQueryParam("street", company.Street) + If company.Postalcode <> "" Then rest.AddQueryParam("postCode", company.Postalcode) + If company.City <> "" Then rest.AddQueryParam("city", company.City) + End If + + End If + + + + End If End If + End Sub @@ -1196,7 +1341,7 @@ Public Class cCreditSafeAPI End Select End Function - Shared Sub createInfo(typ As String, kundeErw As cKundenErweitert, kunde As cKunde, newValue As Object, risikoklasse As String, ByRef mailText As String, ByRef triggerMail As Boolean, setzeKundeninfo As Boolean) + Shared Sub createInfo(typ As String, kundeErw As cKundenErweitert, kunde As cKunde, newValue As Object, risikoklasse As String, ByRef mailText As String, ByRef triggerMail As Boolean, setzeKundeninfo As Boolean, Optional company As Company = Nothing) Dim createInfo As Boolean = False @@ -1249,6 +1394,12 @@ Public Class cCreditSafeAPI createInfo = True triggerMail = True End If + + Case "BANKRUPT_REGISTERED" + createInfo = True + triggerMail = True + + End Select If Not createInfo Then Exit Sub @@ -1257,7 +1408,12 @@ Public Class cCreditSafeAPI Risk = " Risikoklasse: " & oldRiksClass & " -> " & risikoklasse End If - Dim textVermerk As String = "ACHTUNG, Veränderung des " & typ & " von " & oldValue.ToString & " auf " & newValue.ToString & " ( um " & changedInProzent.ToString("F2") & "% ) " & Risk + Dim textVermerk As String = "" + + Select Case typ + Case "B-INDEX", "B-SCORE", "KREDITLIMIT" : textVermerk &= "ACHTUNG, Veränderung des " & typ & " von " & oldValue.ToString & " auf " & newValue.ToString & " ( um " & changedInProzent.ToString("F2") & "% ) " & Risk + Case "BANKRUPT_REGISTERED" : textVermerk &= " KUNDE WURDE LAUT CREDITSAFE " & IIf(company IsNot Nothing, " AM " & company.BANKRUPT_REGISTERED_DATE.ToShortDateString, "") & " FÜR INSOLVENT ERKLÄRT " + End Select mailText &= "

" & textVermerk @@ -1343,6 +1499,8 @@ Public Class cCreditSafeAPI Public Property language As String Public Property csBank As String Public Property csBonID As Integer = -1 + Public Property BANKRUPT_REGISTERED As Boolean = False + Public Property BANKRUPT_REGISTERED_DATE As Date From 6b3ea231ed04893e6242b3c7639153d870007e68 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 26 Sep 2025 15:37:22 +0200 Subject: [PATCH 16/27] Auswertung, Kundenuebersicht Credtisafe-API --- SDL/Resources/Auswertung_divers.xlsx | Bin 10116 -> 10208 bytes .../usrCntlSpeditionsBuchSuche.vb | 113 +- .../usrCntlKundenuebersicht.Designer.vb | 2195 +++++++++-------- SDL/kunden/usrCntlKundenuebersicht.vb | 55 +- .../usrcntlKundeBearbeitenFull.Designer.vb | 393 +-- SDL/kunden/usrcntlKundeBearbeitenFull.vb | 18 + .../Classes/cKundenErweitert.vb | 12 +- .../Creditsafe/cCreditSafeAPI.vb | 423 +++- 8 files changed, 1781 insertions(+), 1428 deletions(-) diff --git a/SDL/Resources/Auswertung_divers.xlsx b/SDL/Resources/Auswertung_divers.xlsx index 023087971f6554c2121384ffd3404a37737a7b39..44eae2ef16e46107b60526789220ee0a600f1c87 100644 GIT binary patch delta 3764 zcmZ9PWmMFQ*2agSV_@i%p5f4WP`VqWL=Xf8hwh>CFQrHb%+MtQ5`r{?f*?bVAPCZp z5`x1}5>j%{IrqNrUF+^I`^&Sx?7g06{dTl!csk)mN$9* z`nu~8g~7u6zy+Pvh3I9Z$tx8E~WT zta~LE1G$>4WqT`RN_=gid>9tcx->`_k#QSO@>&43TM9CWLO(ST~d^Ply^NFBo)mV zdlg2b`ea=RrGiBF3W&~~3D%6#*93rjcXP(2^lQEtQeZCxZT;3aUyeTQgMnWRIoSPR4Hai8w22Pxyt^boV+h+8PXeeJl0u zPHASQI7~F&)o&*&;ZE$^g*QR(m^gK%0o%WXQSqLiB&)wV!;PB1tn zEzBrNr?U95p6)}eqU|j(c3SZOv0~G}nXRlk9vV!S<9!}t@+d-@wxB0?aPD?dyko`m z@8a)`vsTLWLhihdfg#!kmt-NLDN$TY3jhndrz;+2z~YM!v>5~XApbocr|=Jh_ng#AGhKLYeO z7$;8NM2(4Grq<1dYceHP2UAdo#rG@{^f&yA`pn_-+l;i zb3{5LECZ45KCS_On<6kn!>Cssny?pp?Kl_F)JmR#@_J?~39)L?+43$hMknleE#@Vj z7{h=^Rv1!SdL?a2AF9a|&jo<|KGdp42vNj4nduAS~g#{DMydpGDj z7_?ayf*~ipryyr%iQZ-60I<&&7e>`2UIfvaqptzJS41RZ|8^-pW>zxwsdJqyF=qQod*$eN(J zyDVwTV(hGL8blsn&;Gzr)l0VDfCEgR>H=#D3^WM-wwnz%y{M;0Y-W+3yXI0e`<&Bj7^ z^5hLCFTD)>@>|)?L!Gmj1`<}bD)LR{SCH;8*@h$07xB~*3^+0?lCzSPL^xl6b^La$ znDq~F;Ebb~S^~C{Ymf_VS*I~~F3BG+q`XJMFff}fI=gRW9QoWhZ?<{NgN3*HaSMm9 z6wlN9;+QN80t+FFHD(Tav}0!YgD>65c)O_d@-$GAhuK|#73*Ghl5J@8nsTAsD<3C) zgW24~TQ|g#03n&&4u8YH#QydnCSlsMJ<8-GfO392)Sf zrXM?$9IHqi(ZBB5qj!F@Ncy`>s^aW&eB5XrAF@k7z-u0>F@V#PXo^V~OFmme;jZMdVp!pM zv#<{rw=npV&$svrXt?e^KhIM3tF}rZv|ru5nhlGxD%0HlDgRVWI@FF+W8maL+eE?F zOZgwcWV?Z52NAcnXyUftGyZDcj^u_c)hS(c_zxnnkmN3gScbWudI|{nq=Naq1s7G3<)$>R_igb+@f^lQ7Iiu~y(Z=02;L&}phxi$9tt)~dE> znrhD{i5bGwmJG2niypX$BQ*X5xHsTtS%^SqHIYMJ+FlJaGY5u2sf-!F#N&KdFNr35 ztRX>PaJc$Obn8Zz$86FLM|uo^)gj%^$mFhMK!r>wm(%6!z(?)pf_}$TJ}jcjhA)aD2NjOW1i3&dunVXA z)cP1pTP71Tfi_q-lO4E)To3xxl`Y$NTgj)-9?{EXC*Sg?-Q)!Tgro9_ya%OHdi;H7 zUy(GjT7XBB)a@*f7}TC!^qL1AH_&*{wxp(D7qrvYNtt{95|5;>Vu~3NAzv-M+T@8^ zOu&z>32gT(*k+jAKGg8Mvxhpq->yw4cp{*h5mP9U(ehgkUn3tC=p*A0A>(1}?vr1C z9u2Ua)V;t~9RN;pTd5B3wj;)g+nRRnN>}EOR#bx5o-V3c za}m*E_YuHF`SO<|5N#x7*Etns6KaanKt$5k4S`KsA^_j|D4k0nT4jSGjXs3d(Rdc6 zJ(#}YL7`ipkdnrC>dJd{bHZF}tVJyD5$-7mSS!eOdF$$m#wFA^&H^zo|EsBN8%ed( z*I~PPX)X1xkyI}%Z#It~iZ%1DuklZI17GKYC$aYLF7-E_CO2~Zfw_~^lt@{{ERDJgK44AV zxFnqm_NjQ(0=33Q>D8au)}LGt_B{;iw?y@=A(Yv^8GdrS6CgFu+6fgzI?>W18<8I| zLZ9bu{)1qokT)-`eVZL`z=;5J(;g|NgcXxZI-?c61xSkABW*!t4b5*U18wsTCH{nL z48>(c2NC1=FU&^a#YQ38Wvx@9%(UUQl}o%^S_wr;Rk;kFK3u}(Kqaa0yY69=jFcw1 zpIhO|GNRO_w5g%R3NkI~XU@w$sI8*Ox##($k&$z3@i?}Z#NX=PNEGm^)$@M90e0pw zqvmb{*=N`(*Uj#?yNO%znWb9Oc6Jz$uvBIVHuR}`+Be^N@|vX=``jBPWW zqQv{ncNQZm71w;)@Pse&x;WDVywmT=yQx|37>37(##C@IzXx-dSls?b=~?jgXxl^C zNIrS3?8P&k*~nMww`twaGC4_|*}mp-m)WUy+#bW=P{J<9M}%^!+(EL>!k zb0i+pNAGi_x4i_qYA>n(;X6DW+RVsHPD=UzPa#?WCdc`|Nc-@ zz|iwB5h5)#DIESEJd}bngUOlEdT<`j|E4(z#P)x~|MUcO3|#cz7e_b3nTcx9gK$-_ ZIWL-?R~RiNBtkTfwi6N{D;NA*{VyIyAyxnY delta 3692 zcmY+HXE+-Q8-`;?Yn9j(6%?gbTcbD>B?P5v&!YB-T_Y%|T@|}FwO7mpwW2ge%~Y%! ztyPB@ZPQx$dcGguxxV+;`{RDE_s?@Z*Ym6y#Thj-(!-<1{bTTy004>>0AL0H0HI#D zLwsSLPQJdL(xKj7^=8(-Z)8AG#cky1bHir(bn5uW6VT)~=%e{D{R$j~m<7eS*K9@Y z>1qf=sr#FpMt;gwrijarO2y3BYKq%kH1ms(DW^!{sqmWY)1syIa`#b#%d~t=S^#gMPHd zNy^?!9*|`ipL9ojdSGG965WP19eoIZd0+~?4>xpBUXs{GfgoOibR~s|?|EcumAIZO z1MBx`i4TtXa0eLNy1XQJM7r5w3VT66@KS+?!X0l#FBB@EbyAGMxG5|jrmWnZX?L@{ ztia$NBkEHmRQ1uWdU4NX*u#UZ08P$jX_7@T`1jZ8)8(IMpO_3%!{B-DqE~Adv_L%Y zir|V%OG`Wf`8YbELGowSM#jJb1$~Ul)Qn<MxhQ%0 zNz>2b=xZBUSk10ucU7Tb9~bIzWnSu8co3u~&+4U$9oWgf`}okQrzwXRT4qYR7x=YhoF;6^2G?tI&?H-v(=7MY*szt?xqYmAx>i8SdOU^?xdDHr-KD8)pb`0{pm=-NW)ryt%; z>VEsZ^YM?vOhdLvuCoh-dl=bG)pG&u#wVeK%XoQv-n$f;8-KK)fxOMY3-?NwHNwiU#D{<{Uu?ef z--$NfL|^gFtK|@~=)&Ocpg_ehh$(BU^T0%*-O$zUaN_sxr%TKmS8rgVvm$On!~t)n zl>e6aeRSCpnh{HI@_ZR>j1v&V+$DwNCusL-*E&z$Z_F&Kr1Px-3OhWJ7J5DwmQq+I z8|z&|=b&EgVq>W$;mZ%1j*BY@2=LM*)U#zf+(@W!%JQqmPO$pwCQQSUtGJ7ki> zGzl;#GE5+twj)b_h*e7o%NCv-a5nLM$#)pDY!cBqXkpbKyU7*~7ukINRWYn*kbAW0 zH;??U4A^TSdQ(*3aeMzw9KJF|*>-+kh5N?%T|OPlWrQAL=;cHg+lf~yI1wlUs|#Cr z!tv^}6gTJ1GC=!b1jssmp3}CDC5r_b2^JGZttlC8-Z=~k&ClRcN2mlMn36mV`+wgz zv|B^3ylds$FfizOgA1WPR~T|bW3C0{66eE+sRJ$|M}y$p6x|+w>BNTVc;NfSV0grs zi_+;1Al|* zNt5iNfWl4%`7UGB!X8Hn-Ws5xoqe&HrNT4Ye4@qi=&|<`jT#!&8ayy2rv5w zpB~11BB7^59%EL8k?kg&JLND`)!dy~aZ+6kG05U48e%^_aznI_Yinf5YyAWZp{I*tGB zHS4{<{Up@&k=qY^x1!0Ezl8-9QLH^y-o@Dhmm?#J%a5+>aaM^YxQbO-o4V=n@)Pa) zy7z3Peh4e0h~Hh3ba`s-F0x3_t4!@v&ciFJ&z@bFi{bYX2lXMawJCbTX~gK+%1EN^ zEBFxof^$h63_tlbMt{P|Y5oi8+sMbgy6fy##U!Qk#DS$npd3nl^`j3Wd8v7c8{Mig zLR>GAXK+n6T$_BBtgRT>eQ^G2n177s-mOyz(8_sIU=wuUs1-(FJ-3BYd4FP~GO!OJ z0J;++3H#l?RFnI0s`GolA{BNRPT!TV(b|Pflb&^Ia49s?J^MU_PTS5?;ipmK(#vp! zSh&=UYCetLhbjo2(p z&3R8lOATF8on>`ld##mPv0tH0K4a3;OJkcH<54Wry3SujgiNfeKY82v%*6ju6_}5D z=xLBB%+A;3_{Z1;J~I?Dt6cTA+7eQfdxOYHjCvyw7h!BY+(w76dh1*lB!3c_vNdk&BrkK6l?p2kQd?^8 z9agT~ArXGnR(liMh#A$wM>|dEHx}O#KdSZWSe(7z~;JsE+4u*NN!#l{@Axz zvylgafSv*DD63j4lFMuE!ES0A9OA zGo0T6L4I83e-Aw#=^JN7BmOkH2LNWY~Mh zQmh%Jj%6*-^sxdWibU?mpHFKVGpT~%O7Y7@F)4Oh74d?4&$ExjsoyO>{}yH=raIL5 zDBxL)eqj+z=dD(OYxZ1%6a7f;Bx+{8nHJ+ zhmi)4TyyC2F)`VYXCNT1`6kB`DJ3^s*2NRc!G^MSBa25??f2BWJ2)OJ$(}5R3d4jpN17 zwoswRtpiHjA8xieZ8J8G1{}*wa#nA>&ZTwEK&t4NW~cX``P+Bir}`msK_1dD(2<40 z@@15rcdH-tP_~GEC*@>CB1@>)TkQooY3Tpg(2#Hu1>XNsHoU~GafYn(9Q+`F#Zev*_QsC{%Lvvfni=Q0myYQi0@z11^~GJk2U2+ zmU8nTe~Gg2{#OWp9#{S;jMx4TGDHfCsZstAKza*`BU8jAD1wlkV#2h#;D4z90Hqn> Am;e9( diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb index 98e39c77..e482573b 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb @@ -2833,7 +2833,7 @@ Public Class usrCntlSpeditionsBuchSuche ,Absender ,Rechnungsbetrag Betrag ,BelegNr - ,[FilialenNr],[AbfertigungsNr],Speditionsbuch.Abfertigungsart,Abfertigungsbezeichnung,Speditionsbuch.Zollsystem_Land + ,[FilialenNr],[AbfertigungsNr],Speditionsbuch.Abfertigungsart,Abfertigungsbezeichnung,Speditionsbuch.Zollsystem_Land, Speditionsbuch.[LKW Kennzeichen] FROM Speditionsbuch INNER JOIN [Abfertigungsarten] ON Speditionsbuch.Abfertigungsart=Abfertigungsarten.Abfertigungsart where EmpfängerKundenNr IN (" & kdnrsrch & ") and VermittlerKundenNr IN (" & kdnrsrch & ") and Abfertigungsdatum BETWEEN '" & txtAbfertDat.Text & "' AND '" & txtAbfertDatBis.Text & "' And Speditionsbuch.Abfertigungsart IN (1,29,38)", "FMZOLL") @@ -3012,40 +3012,93 @@ Public Class usrCntlSpeditionsBuchSuche Datei = .Workbooks.Open(Path) 'Anpassen Blatt = Datei.Worksheets(1) 'Anpassen - Blatt.Range("I1").Value = txtAbfertDat.Text & "-" & txtAbfertDatBis.Text - Dim cnt = 3 - For Each r In dt.Rows - Blatt.Range("A" & cnt).Value = cnt - 2 - Blatt.Range("B" & cnt).Value = r("Abfertigungsnummer") - ' Blatt.Range("C" & cnt).Value = r("RechnungsNr") - Blatt.Range("C" & cnt).Value = r("Abfertigungsdatum") - Blatt.Range("D" & cnt).Value = r("Abfertigungsbezeichnung") - Blatt.Range("E" & cnt).Value = r("Absender") - Blatt.Range("F" & cnt).Value = "" 'r("Betrag") - Blatt.Range("H" & cnt).Value = r("BelegNr") + If KUNDE.KundenNr = 902452 Then 'KUNDE WILL WIEDER EXZTAWURST!!!!!!! - Dim ZOLLANMELDUNG As New DAKOSY_Worker.cZollsysteme_Aktenbeschriftung - Try - Dim zS = If(r("Zollsystem_Land") IsNot DBNull.Value, r("Zollsystem_Land").ToString(), "") - If ZOLLANMELDUNG.getDataByBezugsnummer(r("FilialenNr") & "/" & r("AbfertigungsNr"), r("Abfertigungsart"), "", False, zS) Then - Blatt.Range("F" & cnt).Value = ZOLLANMELDUNG.RechnungspreisohneWahrung - Blatt.Range("G" & cnt).Value = ZOLLANMELDUNG.Handelsrechnung.Replace(", ", "," & vbNewLine) - Blatt.Range("I" & cnt).Value = ZOLLANMELDUNG.ABGABEN_ZOLL - Blatt.Range("J" & cnt).Value = ZOLLANMELDUNG.ANZ_POS + Blatt.Range("H1").Value = txtAbfertDat.Text & "-" & txtAbfertDatBis.Text - If If(ZOLLANMELDUNG.ATCMRN, "") <> "" Then - Blatt.Range("H" & cnt).Value = ZOLLANMELDUNG.ATCMRN + Blatt.Range("A" & 2).Value = "Nr" + Blatt.Range("B" & 2).Value = "Datum" + Blatt.Range("C" & 2).Value = "MRN-Nr." + Blatt.Range("D" & 2).Value = "LKW/Cont." + Blatt.Range("E" & 2).Value = "Rg.-Nr." + Blatt.Range("F" & 2).Value = "EUST" + Blatt.Range("G" & 2).Value = "Anzahl Pos." + Blatt.Range("H" & 2).Value = "" + Blatt.Range("I" & 2).Value = "" + Blatt.Range("J" & 2).Value = "" + Blatt.Range("K" & 2).Value = "" + Blatt.Range("L" & 2).Value = "" + + Dim cnt = 3 + For Each r In dt.Rows + Blatt.Range("A" & cnt).Value = cnt - 2 + Blatt.Range("B" & cnt).Value = r("Abfertigungsdatum") + Blatt.Range("C" & cnt).Value = r("BelegNr") + Blatt.Range("D" & cnt).Value = r("LKW Kennzeichen") + + Dim ZOLLANMELDUNG As New DAKOSY_Worker.cZollsysteme_Aktenbeschriftung + Try + Dim zS = If(r("Zollsystem_Land") IsNot DBNull.Value, r("Zollsystem_Land").ToString(), "") + If ZOLLANMELDUNG.getDataByBezugsnummer(r("FilialenNr") & "/" & r("AbfertigungsNr"), r("Abfertigungsart"), "", False, zS) Then + Blatt.Range("E" & cnt).Value = ZOLLANMELDUNG.Handelsrechnung.Replace(", ", "," & vbNewLine) + Blatt.Range("F" & cnt).Value = ZOLLANMELDUNG.ABGABEN_EUST + Blatt.Range("G" & cnt).Value = ZOLLANMELDUNG.ANZ_POS + If If(ZOLLANMELDUNG.ATCMRN, "") <> "" Then + Blatt.Range("E" & cnt).Value = ZOLLANMELDUNG.ATCMRN + End If End If - End If - Catch ex As Exception - MsgBox(ex.Message & ex.StackTrace) - End Try - lblKdAusFortschritt.Text = (cnt - 2) & "/" & dt.Rows.Count - Me.Refresh() - cnt += 1 - Next + Catch ex As Exception + MsgBox(ex.Message & ex.StackTrace) + End Try + lblKdAusFortschritt.Text = (cnt - 2) & "/" & dt.Rows.Count + Me.Refresh() + cnt += 1 + Next + + + Else + + Blatt.Range("I1").Value = txtAbfertDat.Text & "-" & txtAbfertDatBis.Text + + Dim cnt = 3 + For Each r In dt.Rows + Blatt.Range("A" & cnt).Value = cnt - 2 + Blatt.Range("B" & cnt).Value = r("Abfertigungsnummer") + ' Blatt.Range("C" & cnt).Value = r("RechnungsNr") + Blatt.Range("C" & cnt).Value = r("Abfertigungsdatum") + Blatt.Range("D" & cnt).Value = r("Abfertigungsbezeichnung") + Blatt.Range("E" & cnt).Value = r("Absender") + Blatt.Range("F" & cnt).Value = "" 'r("Betrag") + Blatt.Range("H" & cnt).Value = r("BelegNr") + Blatt.Range("L" & cnt).Value = r("LKW Kennzeichen") + + Dim ZOLLANMELDUNG As New DAKOSY_Worker.cZollsysteme_Aktenbeschriftung + Try + Dim zS = If(r("Zollsystem_Land") IsNot DBNull.Value, r("Zollsystem_Land").ToString(), "") + If ZOLLANMELDUNG.getDataByBezugsnummer(r("FilialenNr") & "/" & r("AbfertigungsNr"), r("Abfertigungsart"), "", False, zS) Then + Blatt.Range("F" & cnt).Value = ZOLLANMELDUNG.RechnungspreisohneWahrung + Blatt.Range("G" & cnt).Value = ZOLLANMELDUNG.Handelsrechnung.Replace(", ", "," & vbNewLine) + Blatt.Range("I" & cnt).Value = ZOLLANMELDUNG.ABGABEN_ZOLL + Blatt.Range("J" & cnt).Value = ZOLLANMELDUNG.ABGABEN_EUST + Blatt.Range("K" & cnt).Value = ZOLLANMELDUNG.ANZ_POS + + If If(ZOLLANMELDUNG.ATCMRN, "") <> "" Then + Blatt.Range("H" & cnt).Value = ZOLLANMELDUNG.ATCMRN + End If + End If + + Catch ex As Exception + MsgBox(ex.Message & ex.StackTrace) + End Try + lblKdAusFortschritt.Text = (cnt - 2) & "/" & dt.Rows.Count + Me.Refresh() + cnt += 1 + Next + + End If + Datei.Save If False Then diff --git a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb index 62a68fc3..a439c6e0 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb @@ -23,19 +23,19 @@ Partial Class usrCntlKundenuebersicht Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlKundenuebersicht)) - Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle31 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle32 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle33 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle34 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle36 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle35 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.cntxtAddVM = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.btnExcel = New System.Windows.Forms.Button() @@ -50,23 +50,30 @@ Partial Class usrCntlKundenuebersicht Me.lblKeineSperren = New System.Windows.Forms.Label() Me.pnlSperre = New System.Windows.Forms.Panel() Me.btnSaveOfferte = New System.Windows.Forms.Button() + Me.txtSperreGrund = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtSperreDat = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.cbxSperreSetzen = New System.Windows.Forms.CheckBox() Me.Label36 = New System.Windows.Forms.Label() Me.Label67 = New System.Windows.Forms.Label() Me.tbOffenePosten = New System.Windows.Forms.TabPage() Me.dgvOffenePosten = New System.Windows.Forms.DataGridView() Me.pnl = New System.Windows.Forms.Panel() + Me.txtOpLeihgeld = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label44 = New System.Windows.Forms.Label() Me.tbUmsatz = New System.Windows.Forms.TabPage() Me.dgvUmsatzbericht = New System.Windows.Forms.DataGridView() Me.tbAnhaenge = New System.Windows.Forms.TabPage() Me.pnlAnh = New System.Windows.Forms.Panel() + Me.usrCntlAnhaenge = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() Me.dgvAnhaenge = New System.Windows.Forms.DataGridView() Me.btnAddAttach = New System.Windows.Forms.Button() Me.Panel3 = New System.Windows.Forms.Panel() + Me.btnThereforeTarifNr = New VERAG_PROG_ALLGEMEIN.FlatButton() + Me.btnThereforeKundeninfo = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.lblKdNr = New System.Windows.Forms.TextBox() Me.Label13 = New System.Windows.Forms.Label() Me.grpAbfertigung = New System.Windows.Forms.GroupBox() + Me.lblInsolvent = New System.Windows.Forms.Label() Me.Panel9 = New System.Windows.Forms.Panel() Me.txtVerzolltBei = New System.Windows.Forms.TextBox() Me.Label3 = New System.Windows.Forms.Label() @@ -80,42 +87,67 @@ Partial Class usrCntlKundenuebersicht Me.txtVorauskasse = New System.Windows.Forms.TextBox() Me.lblAviso = New System.Windows.Forms.TextBox() Me.Label2 = New System.Windows.Forms.Label() + Me.UsrCntlKundenBesonderheiten1 = New SDL.usrCntlKundenBesonderheiten() Me.lblAbfertigungsverbot = New System.Windows.Forms.Label() Me.Label45 = New System.Windows.Forms.Label() Me.pnlVERAGSnspr = New System.Windows.Forms.Panel() + Me.txtKundenbetreuerTeam = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.btnVeragAnspr = New VERAG_PROG_ALLGEMEIN.FlatButton() + Me.txtKundenbetreuerVertretung = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label34 = New System.Windows.Forms.Label() + Me.txtKundenbetreuer = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.btnPunkt2Save = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.Button7 = New System.Windows.Forms.Button() Me.Button6 = New System.Windows.Forms.Button() Me.LinkLabel1 = New System.Windows.Forms.LinkLabel() Me.Label33 = New System.Windows.Forms.Label() + Me.txtUmsatzJahr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label29 = New System.Windows.Forms.Label() + Me.cbxFiskalabfertigung = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components) Me.lblFisk = New System.Windows.Forms.Label() + Me.txtAbf_ErsteAbfertigung = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label41 = New System.Windows.Forms.Label() Me.rtbAbf_Besonderheiten = New System.Windows.Forms.RichTextBox() Me.lblBesonderheiten = New System.Windows.Forms.Label() Me.Panel4 = New System.Windows.Forms.Panel() Me.pbCreditsafeChanges = New System.Windows.Forms.PictureBox() Me.PictureBox6 = New System.Windows.Forms.PictureBox() + Me.FlatButton2 = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.btnCreditsafe = New System.Windows.Forms.Button() + Me.FlatButton6 = New VERAG_PROG_ALLGEMEIN.FlatButton() + Me.btnBonitaetBearbeiten = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.Label68 = New System.Windows.Forms.Label() + Me.lblHoechstkredit = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label69 = New System.Windows.Forms.Label() + Me.lblBonitaet = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.lblBonitaetRisikostufe = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.lblBonitaetsdatum = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label39 = New System.Windows.Forms.Label() Me.Label46 = New System.Windows.Forms.Label() Me.Panel5 = New System.Windows.Forms.Panel() Me.Panel6 = New System.Windows.Forms.Panel() + Me.txtOPFaellig = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.lblOffenePosten = New System.Windows.Forms.Label() + Me.txtOffenePosten = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label32 = New System.Windows.Forms.Label() + Me.txtOPCredit = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label17 = New System.Windows.Forms.Label() Me.Label18 = New System.Windows.Forms.Label() + Me.txtOPNichtFaellig = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Panel7 = New System.Windows.Forms.Panel() + Me.txtOVK = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label19 = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() + Me.lblKreditlimit = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.lblVorkasse = New System.Windows.Forms.Label() + Me.txtZahlungsziel = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtVeranlKd = New System.Windows.Forms.TextBox() Me.lblVeranlKd = New System.Windows.Forms.Label() Me.grpAdresse = New System.Windows.Forms.GroupBox() Me.tbKontakt = New System.Windows.Forms.TabControl() Me.tbKontaktKontakt = New System.Windows.Forms.TabPage() + Me.btncheckliste = New VERAG_PROG_ALLGEMEIN.FlatButton() + Me.FlatButton1 = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.PictureBox1 = New System.Windows.Forms.PictureBox() Me.lblAnsprechpartner = New System.Windows.Forms.TextBox() Me.lblMobil = New System.Windows.Forms.TextBox() @@ -128,6 +160,7 @@ Partial Class usrCntlKundenuebersicht Me.PictureBox3 = New System.Windows.Forms.PictureBox() Me.PictureBox5 = New System.Windows.Forms.PictureBox() Me.tbKontaktSpez = New System.Windows.Forms.TabPage() + Me.ucKundenKontakte = New SDL.usrCntlKundenKontakte() Me.Label38 = New System.Windows.Forms.Label() Me.txtDebitorennr = New System.Windows.Forms.TextBox() Me.lblFwlFiskal = New System.Windows.Forms.LinkLabel() @@ -157,18 +190,24 @@ Partial Class usrCntlKundenuebersicht Me.Panel1 = New System.Windows.Forms.Panel() Me.Button11 = New System.Windows.Forms.Button() Me.Button12 = New System.Windows.Forms.Button() + Me.txtVertragVermerk = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label16 = New System.Windows.Forms.Label() Me.Label5 = New System.Windows.Forms.Label() + Me.cboVertrag = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.datVertrag = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label4 = New System.Windows.Forms.Label() Me.picVertrag = New System.Windows.Forms.PictureBox() Me.tbGestellGarant = New System.Windows.Forms.TabPage() Me.dgvGestGarantie = New System.Windows.Forms.DataGridView() Me.Panel2 = New System.Windows.Forms.Panel() Me.cbxGG = New System.Windows.Forms.CheckBox() + Me.txtGGDatum = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtT1VerzollungsadresseBestimmungszollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox() Me.Label11 = New System.Windows.Forms.Label() Me.Button8 = New System.Windows.Forms.Button() Me.Button9 = New System.Windows.Forms.Button() Me.tbAvisoMail = New System.Windows.Forms.TabPage() + Me.UsrCntlKundenAvisoMailBenachrichtigung1 = New SDL.usrCntlKundenAvisoMailBenachrichtigung() Me.tbKdSpez = New System.Windows.Forms.TabPage() Me.Label14 = New System.Windows.Forms.Label() Me.Label43 = New System.Windows.Forms.Label() @@ -177,6 +216,9 @@ Partial Class usrCntlKundenuebersicht Me.Label31 = New System.Windows.Forms.Label() Me.rtbLKWFreigabeSenden = New System.Windows.Forms.RichTextBox() Me.Label10 = New System.Windows.Forms.Label() + Me.txtInfoKdAtrNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtFixeKdAtrNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.FlatButton4 = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.tbSonstiges = New System.Windows.Forms.TabPage() Me.Label6 = New System.Windows.Forms.Label() Me.lblSteuernummer = New System.Windows.Forms.TextBox() @@ -190,6 +232,14 @@ Partial Class usrCntlKundenuebersicht Me.lblUid = New System.Windows.Forms.TextBox() Me.lblEORI = New System.Windows.Forms.TextBox() Me.lblEORINr = New System.Windows.Forms.Label() + Me.dgvAufschub = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.KtoId = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.Art = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.HZA = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.KontoNr = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.EORI = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.NL = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.BIN = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.KopierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip(Me.components) @@ -213,55 +263,6 @@ Partial Class usrCntlKundenuebersicht Me.ContextMenuStrip5 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem12 = New System.Windows.Forms.ToolStripMenuItem() Me.cboFirmaFMZOLL = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.txtSperreGrund = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtSperreDat = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtOpLeihgeld = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.usrCntlAnhaenge = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() - Me.btnThereforeTarifNr = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.btnThereforeKundeninfo = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.UsrCntlKundenBesonderheiten1 = New SDL.usrCntlKundenBesonderheiten() - Me.txtKundenbetreuerTeam = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.btnVeragAnspr = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.txtKundenbetreuerVertretung = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtKundenbetreuer = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.btnPunkt2Save = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.txtUmsatzJahr = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.cbxFiskalabfertigung = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components) - Me.txtAbf_ErsteAbfertigung = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.FlatButton2 = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.FlatButton6 = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.btnBonitaetBearbeiten = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.lblHoechstkredit = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.lblBonitaet = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.lblBonitaetRisikostufe = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.lblBonitaetsdatum = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtOPFaellig = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtOffenePosten = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtOPCredit = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtOPNichtFaellig = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtOVK = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.lblKreditlimit = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtZahlungsziel = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.btncheckliste = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.FlatButton1 = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.ucKundenKontakte = New SDL.usrCntlKundenKontakte() - Me.txtVertragVermerk = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.cboVertrag = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.datVertrag = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtGGDatum = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtT1VerzollungsadresseBestimmungszollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox() - Me.UsrCntlKundenAvisoMailBenachrichtigung1 = New SDL.usrCntlKundenAvisoMailBenachrichtigung() - Me.txtInfoKdAtrNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtFixeKdAtrNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.FlatButton4 = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.dgvAufschub = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.KtoId = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.Art = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.HZA = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.KontoNr = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.EORI = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.NL = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.BIN = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.SessionService1 = New VERAG_PROG_ALLGEMEIN.at.gv.bmf.finanzonline.session.sessionService() Me.cntxtAddVM.SuspendLayout() Me.tbWeitereKundenDetails.SuspendLayout() @@ -310,12 +311,12 @@ Partial Class usrCntlKundenuebersicht Me.tbAvisoMail.SuspendLayout() Me.tbKdSpez.SuspendLayout() Me.tbSonstiges.SuspendLayout() + CType(Me.dgvAufschub, System.ComponentModel.ISupportInitialize).BeginInit() Me.ContextMenuStrip1.SuspendLayout() Me.ContextMenuStrip3.SuspendLayout() Me.ContextMenuStrip2.SuspendLayout() Me.ContextMenuStrip4.SuspendLayout() Me.ContextMenuStrip5.SuspendLayout() - CType(Me.dgvAufschub, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'cntxtAddVM @@ -426,8 +427,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvOfferteDetailsUebersicht.AllowUserToDeleteRows = False Me.dgvOfferteDetailsUebersicht.AllowUserToOrderColumns = True Me.dgvOfferteDetailsUebersicht.AllowUserToResizeRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOfferteDetailsUebersicht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle25.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOfferteDetailsUebersicht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle25 Me.dgvOfferteDetailsUebersicht.BackgroundColor = System.Drawing.Color.White Me.dgvOfferteDetailsUebersicht.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D Me.dgvOfferteDetailsUebersicht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize @@ -447,8 +448,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvOffertenSperrliste.AllowUserToDeleteRows = False Me.dgvOffertenSperrliste.AllowUserToOrderColumns = True Me.dgvOffertenSperrliste.AllowUserToResizeRows = False - DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOffertenSperrliste.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle26.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOffertenSperrliste.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle26 Me.dgvOffertenSperrliste.BackgroundColor = System.Drawing.Color.White Me.dgvOffertenSperrliste.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D Me.dgvOffertenSperrliste.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize @@ -458,10 +459,10 @@ Partial Class usrCntlKundenuebersicht Me.dgvOffertenSperrliste.Name = "dgvOffertenSperrliste" Me.dgvOffertenSperrliste.ReadOnly = True Me.dgvOffertenSperrliste.RowHeadersVisible = False - DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer)) - DataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.Black - Me.dgvOffertenSperrliste.RowsDefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle27.SelectionBackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer)) + DataGridViewCellStyle27.SelectionForeColor = System.Drawing.Color.Black + Me.dgvOffertenSperrliste.RowsDefaultCellStyle = DataGridViewCellStyle27 Me.dgvOffertenSperrliste.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvOffertenSperrliste.Size = New System.Drawing.Size(173, 257) Me.dgvOffertenSperrliste.TabIndex = 0 @@ -503,6 +504,54 @@ Partial Class usrCntlKundenuebersicht Me.btnSaveOfferte.Text = "Speichern" Me.btnSaveOfferte.UseVisualStyleBackColor = True ' + 'txtSperreGrund + ' + Me.txtSperreGrund._DateTimeOnly = False + Me.txtSperreGrund._numbersOnly = False + Me.txtSperreGrund._numbersOnlyKommastellen = "" + Me.txtSperreGrund._numbersOnlyTrennzeichen = True + Me.txtSperreGrund._Prozent = False + Me.txtSperreGrund._ShortDateNew = False + Me.txtSperreGrund._ShortDateOnly = False + Me.txtSperreGrund._TimeOnly = False + Me.txtSperreGrund._TimeOnly_Seconds = False + Me.txtSperreGrund._value = Nothing + Me.txtSperreGrund._Waehrung = False + Me.txtSperreGrund._WaehrungZeichen = True + Me.txtSperreGrund.ForeColor = System.Drawing.Color.Black + Me.txtSperreGrund.Location = New System.Drawing.Point(309, 7) + Me.txtSperreGrund.MaxLineLength = -1 + Me.txtSperreGrund.MaxLines_Warning = "" + Me.txtSperreGrund.MaxLines_Warning_Label = Nothing + Me.txtSperreGrund.Name = "txtSperreGrund" + Me.txtSperreGrund.Size = New System.Drawing.Size(268, 20) + Me.txtSperreGrund.TabIndex = 4 + ' + 'txtSperreDat + ' + Me.txtSperreDat._DateTimeOnly = False + Me.txtSperreDat._numbersOnly = False + Me.txtSperreDat._numbersOnlyKommastellen = "" + Me.txtSperreDat._numbersOnlyTrennzeichen = True + Me.txtSperreDat._Prozent = False + Me.txtSperreDat._ShortDateNew = False + Me.txtSperreDat._ShortDateOnly = False + Me.txtSperreDat._TimeOnly = False + Me.txtSperreDat._TimeOnly_Seconds = False + Me.txtSperreDat._value = Nothing + Me.txtSperreDat._Waehrung = False + Me.txtSperreDat._WaehrungZeichen = True + Me.txtSperreDat.BackColor = System.Drawing.Color.White + Me.txtSperreDat.ForeColor = System.Drawing.Color.Black + Me.txtSperreDat.Location = New System.Drawing.Point(129, 7) + Me.txtSperreDat.MaxLineLength = -1 + Me.txtSperreDat.MaxLines_Warning = "" + Me.txtSperreDat.MaxLines_Warning_Label = Nothing + Me.txtSperreDat.Name = "txtSperreDat" + Me.txtSperreDat.ReadOnly = True + Me.txtSperreDat.Size = New System.Drawing.Size(100, 20) + Me.txtSperreDat.TabIndex = 2 + ' 'cbxSperreSetzen ' Me.cbxSperreSetzen.AutoSize = True @@ -551,8 +600,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvOffenePosten.AllowUserToAddRows = False Me.dgvOffenePosten.AllowUserToDeleteRows = False Me.dgvOffenePosten.AllowUserToResizeRows = False - DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle28.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle28 Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvOffenePosten.Dock = System.Windows.Forms.DockStyle.Fill @@ -577,6 +626,34 @@ Partial Class usrCntlKundenuebersicht Me.pnl.TabIndex = 0 Me.pnl.Visible = False ' + 'txtOpLeihgeld + ' + Me.txtOpLeihgeld._DateTimeOnly = False + Me.txtOpLeihgeld._numbersOnly = False + Me.txtOpLeihgeld._numbersOnlyKommastellen = "" + Me.txtOpLeihgeld._numbersOnlyTrennzeichen = True + Me.txtOpLeihgeld._Prozent = False + Me.txtOpLeihgeld._ShortDateNew = False + Me.txtOpLeihgeld._ShortDateOnly = False + Me.txtOpLeihgeld._TimeOnly = False + Me.txtOpLeihgeld._TimeOnly_Seconds = False + Me.txtOpLeihgeld._value = Nothing + Me.txtOpLeihgeld._Waehrung = False + Me.txtOpLeihgeld._WaehrungZeichen = True + Me.txtOpLeihgeld.BackColor = System.Drawing.Color.White + Me.txtOpLeihgeld.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.txtOpLeihgeld.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtOpLeihgeld.ForeColor = System.Drawing.Color.Black + Me.txtOpLeihgeld.Location = New System.Drawing.Point(141, 9) + Me.txtOpLeihgeld.MaxLineLength = -1 + Me.txtOpLeihgeld.MaxLines_Warning = "" + Me.txtOpLeihgeld.MaxLines_Warning_Label = Nothing + Me.txtOpLeihgeld.Name = "txtOpLeihgeld" + Me.txtOpLeihgeld.ReadOnly = True + Me.txtOpLeihgeld.Size = New System.Drawing.Size(115, 13) + Me.txtOpLeihgeld.TabIndex = 1 + Me.txtOpLeihgeld.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' 'Label44 ' Me.Label44.AutoSize = True @@ -604,8 +681,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvUmsatzbericht.AllowUserToDeleteRows = False Me.dgvUmsatzbericht.AllowUserToOrderColumns = True Me.dgvUmsatzbericht.AllowUserToResizeRows = False - DataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5 + DataGridViewCellStyle29.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle29 Me.dgvUmsatzbericht.BackgroundColor = System.Drawing.Color.White Me.dgvUmsatzbericht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvUmsatzbericht.Dock = System.Windows.Forms.DockStyle.Fill @@ -641,13 +718,35 @@ Partial Class usrCntlKundenuebersicht Me.pnlAnh.Size = New System.Drawing.Size(655, 294) Me.pnlAnh.TabIndex = 0 ' + 'usrCntlAnhaenge + ' + Me.usrCntlAnhaenge._DATENSERVER_KATEGORIE = "DOKUMENTE" + Me.usrCntlAnhaenge._DATENSERVER_ORDNER = "KD_ANHÄNGE" + Me.usrCntlAnhaenge._DATENSERVER_UOrdner1 = "ZOLL" + Me.usrCntlAnhaenge._DATENSERVER_UOrdner2 = "" + Me.usrCntlAnhaenge._DATENSERVER_UOrdner3 = "" + Me.usrCntlAnhaenge._OPEN_ORIGINAL = False + Me.usrCntlAnhaenge._TYPE = "" + Me.usrCntlAnhaenge.AllowDrop = True + Me.usrCntlAnhaenge.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.usrCntlAnhaenge.BackColor = System.Drawing.Color.White + Me.usrCntlAnhaenge.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.usrCntlAnhaenge.Cursor = System.Windows.Forms.Cursors.Default + Me.usrCntlAnhaenge.Dock = System.Windows.Forms.DockStyle.Fill + Me.usrCntlAnhaenge.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.usrCntlAnhaenge.Location = New System.Drawing.Point(0, 0) + Me.usrCntlAnhaenge.Margin = New System.Windows.Forms.Padding(0) + Me.usrCntlAnhaenge.Name = "usrCntlAnhaenge" + Me.usrCntlAnhaenge.Size = New System.Drawing.Size(655, 255) + Me.usrCntlAnhaenge.TabIndex = 0 + ' 'dgvAnhaenge ' Me.dgvAnhaenge.AllowUserToAddRows = False Me.dgvAnhaenge.AllowUserToDeleteRows = False Me.dgvAnhaenge.AllowUserToResizeRows = False - DataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvAnhaenge.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6 + DataGridViewCellStyle30.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvAnhaenge.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle30 Me.dgvAnhaenge.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.dgvAnhaenge.BackgroundColor = System.Drawing.Color.White Me.dgvAnhaenge.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize @@ -686,6 +785,42 @@ Partial Class usrCntlKundenuebersicht Me.Panel3.Size = New System.Drawing.Size(655, 39) Me.Panel3.TabIndex = 3 ' + 'btnThereforeTarifNr + ' + Me.btnThereforeTarifNr.allowBorder = False + Me.btnThereforeTarifNr.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnThereforeTarifNr.FlatAppearance.BorderSize = 0 + Me.btnThereforeTarifNr.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnThereforeTarifNr.ForeColor = System.Drawing.Color.Black + Me.btnThereforeTarifNr.Image = Global.SDL.My.Resources.Resources.therefore1 + Me.btnThereforeTarifNr.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnThereforeTarifNr.Location = New System.Drawing.Point(5, 3) + Me.btnThereforeTarifNr.Name = "btnThereforeTarifNr" + Me.btnThereforeTarifNr.Size = New System.Drawing.Size(118, 33) + Me.btnThereforeTarifNr.TabIndex = 0 + Me.btnThereforeTarifNr.Tag = "" + Me.btnThereforeTarifNr.Text = "Tarifnummern" + Me.btnThereforeTarifNr.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnThereforeTarifNr.UseVisualStyleBackColor = True + ' + 'btnThereforeKundeninfo + ' + Me.btnThereforeKundeninfo.allowBorder = False + Me.btnThereforeKundeninfo.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnThereforeKundeninfo.FlatAppearance.BorderSize = 0 + Me.btnThereforeKundeninfo.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnThereforeKundeninfo.ForeColor = System.Drawing.Color.Black + Me.btnThereforeKundeninfo.Image = Global.SDL.My.Resources.Resources.therefore1 + Me.btnThereforeKundeninfo.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnThereforeKundeninfo.Location = New System.Drawing.Point(144, 3) + Me.btnThereforeKundeninfo.Name = "btnThereforeKundeninfo" + Me.btnThereforeKundeninfo.Size = New System.Drawing.Size(118, 33) + Me.btnThereforeKundeninfo.TabIndex = 1 + Me.btnThereforeKundeninfo.Tag = "" + Me.btnThereforeKundeninfo.Text = "Kundeninfo" + Me.btnThereforeKundeninfo.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnThereforeKundeninfo.UseVisualStyleBackColor = True + ' 'lblKdNr ' Me.lblKdNr.BackColor = System.Drawing.Color.White @@ -754,6 +889,20 @@ Partial Class usrCntlKundenuebersicht Me.grpAbfertigung.TabStop = False Me.grpAbfertigung.Text = "Abfertigung" ' + 'lblInsolvent + ' + Me.lblInsolvent.BackColor = System.Drawing.Color.Red + Me.lblInsolvent.Cursor = System.Windows.Forms.Cursors.Help + Me.lblInsolvent.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold) + Me.lblInsolvent.ForeColor = System.Drawing.Color.White + Me.lblInsolvent.Location = New System.Drawing.Point(70, -2) + Me.lblInsolvent.Name = "lblInsolvent" + Me.lblInsolvent.Size = New System.Drawing.Size(296, 24) + Me.lblInsolvent.TabIndex = 50 + Me.lblInsolvent.Text = "! KUNDE INSOLVENT !" + Me.lblInsolvent.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.lblInsolvent.Visible = False + ' 'Panel9 ' Me.Panel9.BackColor = System.Drawing.Color.WhiteSmoke @@ -905,6 +1054,17 @@ Partial Class usrCntlKundenuebersicht Me.Label2.Text = "Aviso:" Me.Label2.Visible = False ' + 'UsrCntlKundenBesonderheiten1 + ' + Me.UsrCntlKundenBesonderheiten1.AutoScroll = True + Me.UsrCntlKundenBesonderheiten1.BackColor = System.Drawing.Color.White + Me.UsrCntlKundenBesonderheiten1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.UsrCntlKundenBesonderheiten1.Location = New System.Drawing.Point(7, 32) + Me.UsrCntlKundenBesonderheiten1.Name = "UsrCntlKundenBesonderheiten1" + Me.UsrCntlKundenBesonderheiten1.Size = New System.Drawing.Size(107, 52) + Me.UsrCntlKundenBesonderheiten1.TabIndex = 6 + Me.UsrCntlKundenBesonderheiten1.Visible = False + ' 'lblAbfertigungsverbot ' Me.lblAbfertigungsverbot.BackColor = System.Drawing.Color.Red @@ -944,6 +1104,83 @@ Partial Class usrCntlKundenuebersicht Me.pnlVERAGSnspr.Size = New System.Drawing.Size(181, 82) Me.pnlVERAGSnspr.TabIndex = 35 ' + 'txtKundenbetreuerTeam + ' + Me.txtKundenbetreuerTeam._DateTimeOnly = False + Me.txtKundenbetreuerTeam._numbersOnly = False + Me.txtKundenbetreuerTeam._numbersOnlyKommastellen = "" + Me.txtKundenbetreuerTeam._numbersOnlyTrennzeichen = True + Me.txtKundenbetreuerTeam._Prozent = False + Me.txtKundenbetreuerTeam._ShortDateNew = False + Me.txtKundenbetreuerTeam._ShortDateOnly = False + Me.txtKundenbetreuerTeam._TimeOnly = False + Me.txtKundenbetreuerTeam._TimeOnly_Seconds = False + Me.txtKundenbetreuerTeam._value = "-" + Me.txtKundenbetreuerTeam._Waehrung = False + Me.txtKundenbetreuerTeam._WaehrungZeichen = True + Me.txtKundenbetreuerTeam.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtKundenbetreuerTeam.BackColor = System.Drawing.Color.WhiteSmoke + Me.txtKundenbetreuerTeam.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.txtKundenbetreuerTeam.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtKundenbetreuerTeam.ForeColor = System.Drawing.Color.Black + Me.txtKundenbetreuerTeam.Location = New System.Drawing.Point(6, 23) + Me.txtKundenbetreuerTeam.MaxLineLength = -1 + Me.txtKundenbetreuerTeam.MaxLines_Warning = "" + Me.txtKundenbetreuerTeam.MaxLines_Warning_Label = Nothing + Me.txtKundenbetreuerTeam.Name = "txtKundenbetreuerTeam" + Me.txtKundenbetreuerTeam.ReadOnly = True + Me.txtKundenbetreuerTeam.Size = New System.Drawing.Size(168, 13) + Me.txtKundenbetreuerTeam.TabIndex = 2 + Me.txtKundenbetreuerTeam.Text = "-" + ' + 'btnVeragAnspr + ' + Me.btnVeragAnspr.allowBorder = False + Me.btnVeragAnspr.BackgroundImage = Global.SDL.My.Resources.Resources.stift + Me.btnVeragAnspr.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnVeragAnspr.FlatAppearance.BorderSize = 0 + Me.btnVeragAnspr.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnVeragAnspr.ForeColor = System.Drawing.Color.Black + Me.btnVeragAnspr.Location = New System.Drawing.Point(158, 7) + Me.btnVeragAnspr.Name = "btnVeragAnspr" + Me.btnVeragAnspr.Size = New System.Drawing.Size(15, 12) + Me.btnVeragAnspr.TabIndex = 1 + Me.btnVeragAnspr.UseVisualStyleBackColor = True + Me.btnVeragAnspr.Visible = False + ' + 'txtKundenbetreuerVertretung + ' + Me.txtKundenbetreuerVertretung._DateTimeOnly = False + Me.txtKundenbetreuerVertretung._numbersOnly = False + Me.txtKundenbetreuerVertretung._numbersOnlyKommastellen = "" + Me.txtKundenbetreuerVertretung._numbersOnlyTrennzeichen = True + Me.txtKundenbetreuerVertretung._Prozent = False + Me.txtKundenbetreuerVertretung._ShortDateNew = False + Me.txtKundenbetreuerVertretung._ShortDateOnly = False + Me.txtKundenbetreuerVertretung._TimeOnly = False + Me.txtKundenbetreuerVertretung._TimeOnly_Seconds = False + Me.txtKundenbetreuerVertretung._value = "-" + Me.txtKundenbetreuerVertretung._Waehrung = False + Me.txtKundenbetreuerVertretung._WaehrungZeichen = True + Me.txtKundenbetreuerVertretung.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtKundenbetreuerVertretung.BackColor = System.Drawing.Color.WhiteSmoke + Me.txtKundenbetreuerVertretung.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.txtKundenbetreuerVertretung.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtKundenbetreuerVertretung.ForeColor = System.Drawing.Color.Black + Me.txtKundenbetreuerVertretung.Location = New System.Drawing.Point(6, 61) + Me.txtKundenbetreuerVertretung.MaxLineLength = -1 + Me.txtKundenbetreuerVertretung.MaxLines_Warning = "" + Me.txtKundenbetreuerVertretung.MaxLines_Warning_Label = Nothing + Me.txtKundenbetreuerVertretung.Multiline = True + Me.txtKundenbetreuerVertretung.Name = "txtKundenbetreuerVertretung" + Me.txtKundenbetreuerVertretung.ReadOnly = True + Me.txtKundenbetreuerVertretung.Size = New System.Drawing.Size(168, 24) + Me.txtKundenbetreuerVertretung.TabIndex = 4 + Me.txtKundenbetreuerVertretung.Text = "-" + Me.txtKundenbetreuerVertretung.Visible = False + ' 'Label34 ' Me.Label34.AutoSize = True @@ -954,6 +1191,52 @@ Partial Class usrCntlKundenuebersicht Me.Label34.TabIndex = 0 Me.Label34.Text = "VERAG-Ansprechpartner:" ' + 'txtKundenbetreuer + ' + Me.txtKundenbetreuer._DateTimeOnly = False + Me.txtKundenbetreuer._numbersOnly = False + Me.txtKundenbetreuer._numbersOnlyKommastellen = "" + Me.txtKundenbetreuer._numbersOnlyTrennzeichen = True + Me.txtKundenbetreuer._Prozent = False + Me.txtKundenbetreuer._ShortDateNew = False + Me.txtKundenbetreuer._ShortDateOnly = False + Me.txtKundenbetreuer._TimeOnly = False + Me.txtKundenbetreuer._TimeOnly_Seconds = False + Me.txtKundenbetreuer._value = "-" + Me.txtKundenbetreuer._Waehrung = False + Me.txtKundenbetreuer._WaehrungZeichen = True + Me.txtKundenbetreuer.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtKundenbetreuer.BackColor = System.Drawing.Color.WhiteSmoke + Me.txtKundenbetreuer.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.txtKundenbetreuer.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtKundenbetreuer.ForeColor = System.Drawing.Color.Black + Me.txtKundenbetreuer.Location = New System.Drawing.Point(6, 42) + Me.txtKundenbetreuer.MaxLineLength = -1 + Me.txtKundenbetreuer.MaxLines_Warning = "" + Me.txtKundenbetreuer.MaxLines_Warning_Label = Nothing + Me.txtKundenbetreuer.Name = "txtKundenbetreuer" + Me.txtKundenbetreuer.ReadOnly = True + Me.txtKundenbetreuer.Size = New System.Drawing.Size(168, 13) + Me.txtKundenbetreuer.TabIndex = 3 + Me.txtKundenbetreuer.Text = "-" + ' + 'btnPunkt2Save + ' + Me.btnPunkt2Save.allowBorder = False + Me.btnPunkt2Save.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnPunkt2Save.BackgroundImage = Global.SDL.My.Resources.Resources.save + Me.btnPunkt2Save.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnPunkt2Save.FlatAppearance.BorderSize = 0 + Me.btnPunkt2Save.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnPunkt2Save.ForeColor = System.Drawing.Color.Black + Me.btnPunkt2Save.Location = New System.Drawing.Point(647, 205) + Me.btnPunkt2Save.Name = "btnPunkt2Save" + Me.btnPunkt2Save.Size = New System.Drawing.Size(20, 20) + Me.btnPunkt2Save.TabIndex = 12 + Me.btnPunkt2Save.UseVisualStyleBackColor = True + Me.btnPunkt2Save.Visible = False + ' 'Button7 ' Me.Button7.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -1002,6 +1285,34 @@ Partial Class usrCntlKundenuebersicht Me.Label33.TabIndex = 33 Me.Label33.Text = "Zahlungsziel:" ' + 'txtUmsatzJahr + ' + Me.txtUmsatzJahr._DateTimeOnly = False + Me.txtUmsatzJahr._numbersOnly = False + Me.txtUmsatzJahr._numbersOnlyKommastellen = "" + Me.txtUmsatzJahr._numbersOnlyTrennzeichen = True + Me.txtUmsatzJahr._Prozent = False + Me.txtUmsatzJahr._ShortDateNew = False + Me.txtUmsatzJahr._ShortDateOnly = False + Me.txtUmsatzJahr._TimeOnly = False + Me.txtUmsatzJahr._TimeOnly_Seconds = False + Me.txtUmsatzJahr._value = Nothing + Me.txtUmsatzJahr._Waehrung = False + Me.txtUmsatzJahr._WaehrungZeichen = True + Me.txtUmsatzJahr.BackColor = System.Drawing.Color.White + Me.txtUmsatzJahr.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.txtUmsatzJahr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtUmsatzJahr.ForeColor = System.Drawing.Color.Black + Me.txtUmsatzJahr.Location = New System.Drawing.Point(383, 274) + Me.txtUmsatzJahr.MaxLineLength = -1 + Me.txtUmsatzJahr.MaxLines_Warning = "" + Me.txtUmsatzJahr.MaxLines_Warning_Label = Nothing + Me.txtUmsatzJahr.Name = "txtUmsatzJahr" + Me.txtUmsatzJahr.ReadOnly = True + Me.txtUmsatzJahr.Size = New System.Drawing.Size(96, 13) + Me.txtUmsatzJahr.TabIndex = 32 + Me.txtUmsatzJahr.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' 'Label29 ' Me.Label29.AutoSize = True @@ -1012,6 +1323,20 @@ Partial Class usrCntlKundenuebersicht Me.Label29.TabIndex = 31 Me.Label29.Text = "Umsatz Jahr:" ' + 'cbxFiskalabfertigung + ' + Me.cbxFiskalabfertigung._value = "" + Me.cbxFiskalabfertigung.AutoSize = True + Me.cbxFiskalabfertigung.Checked_value = False + Me.cbxFiskalabfertigung.CheckedValue = False + Me.cbxFiskalabfertigung.Location = New System.Drawing.Point(39, 134) + Me.cbxFiskalabfertigung.Name = "cbxFiskalabfertigung" + Me.cbxFiskalabfertigung.Size = New System.Drawing.Size(160, 17) + Me.cbxFiskalabfertigung.TabIndex = 8 + Me.cbxFiskalabfertigung.Text = "Fiskalverzollung freigegeben" + Me.cbxFiskalabfertigung.UseVisualStyleBackColor = True + Me.cbxFiskalabfertigung.Visible = False + ' 'lblFisk ' Me.lblFisk.AutoSize = True @@ -1025,6 +1350,36 @@ Partial Class usrCntlKundenuebersicht "en!" Me.lblFisk.Visible = False ' + 'txtAbf_ErsteAbfertigung + ' + Me.txtAbf_ErsteAbfertigung._DateTimeOnly = False + Me.txtAbf_ErsteAbfertigung._numbersOnly = False + Me.txtAbf_ErsteAbfertigung._numbersOnlyKommastellen = "" + Me.txtAbf_ErsteAbfertigung._numbersOnlyTrennzeichen = True + Me.txtAbf_ErsteAbfertigung._Prozent = False + Me.txtAbf_ErsteAbfertigung._ShortDateNew = False + Me.txtAbf_ErsteAbfertigung._ShortDateOnly = True + Me.txtAbf_ErsteAbfertigung._TimeOnly = False + Me.txtAbf_ErsteAbfertigung._TimeOnly_Seconds = False + Me.txtAbf_ErsteAbfertigung._value = "" + Me.txtAbf_ErsteAbfertigung._Waehrung = False + Me.txtAbf_ErsteAbfertigung._WaehrungZeichen = True + Me.txtAbf_ErsteAbfertigung.BackColor = System.Drawing.Color.White + Me.txtAbf_ErsteAbfertigung.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.txtAbf_ErsteAbfertigung.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtAbf_ErsteAbfertigung.ForeColor = System.Drawing.Color.Black + Me.txtAbf_ErsteAbfertigung.Location = New System.Drawing.Point(305, 195) + Me.txtAbf_ErsteAbfertigung.MaxLength = 10 + Me.txtAbf_ErsteAbfertigung.MaxLineLength = -1 + Me.txtAbf_ErsteAbfertigung.MaxLines_Warning = "" + Me.txtAbf_ErsteAbfertigung.MaxLines_Warning_Label = Nothing + Me.txtAbf_ErsteAbfertigung.Name = "txtAbf_ErsteAbfertigung" + Me.txtAbf_ErsteAbfertigung.ReadOnly = True + Me.txtAbf_ErsteAbfertigung.Size = New System.Drawing.Size(115, 13) + Me.txtAbf_ErsteAbfertigung.TabIndex = 14 + Me.txtAbf_ErsteAbfertigung.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + Me.txtAbf_ErsteAbfertigung.Visible = False + ' 'Label41 ' Me.Label41.AutoSize = True @@ -1107,6 +1462,20 @@ Partial Class usrCntlKundenuebersicht Me.PictureBox6.TabStop = False Me.PictureBox6.Visible = False ' + 'FlatButton2 + ' + Me.FlatButton2.allowBorder = False + Me.FlatButton2.BackgroundImage = Global.SDL.My.Resources.Resources.pdf + Me.FlatButton2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.FlatButton2.FlatAppearance.BorderSize = 0 + Me.FlatButton2.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.FlatButton2.ForeColor = System.Drawing.Color.Black + Me.FlatButton2.Location = New System.Drawing.Point(222, 6) + Me.FlatButton2.Name = "FlatButton2" + Me.FlatButton2.Size = New System.Drawing.Size(15, 12) + Me.FlatButton2.TabIndex = 11 + Me.FlatButton2.UseVisualStyleBackColor = True + ' 'btnCreditsafe ' Me.btnCreditsafe.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -1120,6 +1489,35 @@ Partial Class usrCntlKundenuebersicht Me.btnCreditsafe.UseVisualStyleBackColor = True Me.btnCreditsafe.Visible = False ' + 'FlatButton6 + ' + Me.FlatButton6.allowBorder = False + Me.FlatButton6.BackgroundImage = Global.SDL.My.Resources.Resources.list + Me.FlatButton6.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.FlatButton6.FlatAppearance.BorderSize = 0 + Me.FlatButton6.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.FlatButton6.ForeColor = System.Drawing.Color.Black + Me.FlatButton6.Location = New System.Drawing.Point(202, 7) + Me.FlatButton6.Name = "FlatButton6" + Me.FlatButton6.Size = New System.Drawing.Size(15, 12) + Me.FlatButton6.TabIndex = 9 + Me.FlatButton6.UseVisualStyleBackColor = True + ' + 'btnBonitaetBearbeiten + ' + Me.btnBonitaetBearbeiten.allowBorder = False + Me.btnBonitaetBearbeiten.BackgroundImage = Global.SDL.My.Resources.Resources.plus + Me.btnBonitaetBearbeiten.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnBonitaetBearbeiten.FlatAppearance.BorderSize = 0 + Me.btnBonitaetBearbeiten.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnBonitaetBearbeiten.ForeColor = System.Drawing.Color.Black + Me.btnBonitaetBearbeiten.Location = New System.Drawing.Point(183, 6) + Me.btnBonitaetBearbeiten.Name = "btnBonitaetBearbeiten" + Me.btnBonitaetBearbeiten.Size = New System.Drawing.Size(15, 12) + Me.btnBonitaetBearbeiten.TabIndex = 8 + Me.btnBonitaetBearbeiten.UseVisualStyleBackColor = True + Me.btnBonitaetBearbeiten.Visible = False + ' 'Label68 ' Me.Label68.AutoSize = True @@ -1130,6 +1528,35 @@ Partial Class usrCntlKundenuebersicht Me.Label68.TabIndex = 4 Me.Label68.Text = "vom:" ' + 'lblHoechstkredit + ' + Me.lblHoechstkredit._DateTimeOnly = False + Me.lblHoechstkredit._numbersOnly = True + Me.lblHoechstkredit._numbersOnlyKommastellen = "" + Me.lblHoechstkredit._numbersOnlyTrennzeichen = True + Me.lblHoechstkredit._Prozent = False + Me.lblHoechstkredit._ShortDateNew = False + Me.lblHoechstkredit._ShortDateOnly = False + Me.lblHoechstkredit._TimeOnly = False + Me.lblHoechstkredit._TimeOnly_Seconds = False + Me.lblHoechstkredit._value = "" + Me.lblHoechstkredit._Waehrung = True + Me.lblHoechstkredit._WaehrungZeichen = True + Me.lblHoechstkredit.BackColor = System.Drawing.Color.WhiteSmoke + Me.lblHoechstkredit.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.lblHoechstkredit.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblHoechstkredit.ForeColor = System.Drawing.Color.Black + Me.lblHoechstkredit.Location = New System.Drawing.Point(310, 5) + Me.lblHoechstkredit.MaxLineLength = -1 + Me.lblHoechstkredit.MaxLines_Warning = "" + Me.lblHoechstkredit.MaxLines_Warning_Label = Nothing + Me.lblHoechstkredit.Name = "lblHoechstkredit" + Me.lblHoechstkredit.ReadOnly = True + Me.lblHoechstkredit.Size = New System.Drawing.Size(96, 13) + Me.lblHoechstkredit.TabIndex = 7 + Me.lblHoechstkredit.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + Me.lblHoechstkredit.Visible = False + ' 'Label69 ' Me.Label69.AutoSize = True @@ -1141,6 +1568,89 @@ Partial Class usrCntlKundenuebersicht Me.Label69.Text = "Hochstkredit:" Me.Label69.Visible = False ' + 'lblBonitaet + ' + Me.lblBonitaet._DateTimeOnly = False + Me.lblBonitaet._numbersOnly = False + Me.lblBonitaet._numbersOnlyKommastellen = "" + Me.lblBonitaet._numbersOnlyTrennzeichen = True + Me.lblBonitaet._Prozent = False + Me.lblBonitaet._ShortDateNew = False + Me.lblBonitaet._ShortDateOnly = False + Me.lblBonitaet._TimeOnly = False + Me.lblBonitaet._TimeOnly_Seconds = False + Me.lblBonitaet._value = Nothing + Me.lblBonitaet._Waehrung = False + Me.lblBonitaet._WaehrungZeichen = True + Me.lblBonitaet.BackColor = System.Drawing.Color.WhiteSmoke + Me.lblBonitaet.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.lblBonitaet.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblBonitaet.ForeColor = System.Drawing.Color.Black + Me.lblBonitaet.Location = New System.Drawing.Point(106, 6) + Me.lblBonitaet.MaxLineLength = -1 + Me.lblBonitaet.MaxLines_Warning = "" + Me.lblBonitaet.MaxLines_Warning_Label = Nothing + Me.lblBonitaet.Name = "lblBonitaet" + Me.lblBonitaet.ReadOnly = True + Me.lblBonitaet.Size = New System.Drawing.Size(32, 13) + Me.lblBonitaet.TabIndex = 1 + Me.lblBonitaet.TextAlign = System.Windows.Forms.HorizontalAlignment.Center + ' + 'lblBonitaetRisikostufe + ' + Me.lblBonitaetRisikostufe._DateTimeOnly = False + Me.lblBonitaetRisikostufe._numbersOnly = False + Me.lblBonitaetRisikostufe._numbersOnlyKommastellen = "" + Me.lblBonitaetRisikostufe._numbersOnlyTrennzeichen = True + Me.lblBonitaetRisikostufe._Prozent = False + Me.lblBonitaetRisikostufe._ShortDateNew = False + Me.lblBonitaetRisikostufe._ShortDateOnly = False + Me.lblBonitaetRisikostufe._TimeOnly = False + Me.lblBonitaetRisikostufe._TimeOnly_Seconds = False + Me.lblBonitaetRisikostufe._value = Nothing + Me.lblBonitaetRisikostufe._Waehrung = False + Me.lblBonitaetRisikostufe._WaehrungZeichen = True + Me.lblBonitaetRisikostufe.BackColor = System.Drawing.Color.WhiteSmoke + Me.lblBonitaetRisikostufe.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.lblBonitaetRisikostufe.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblBonitaetRisikostufe.ForeColor = System.Drawing.Color.Black + Me.lblBonitaetRisikostufe.Location = New System.Drawing.Point(145, 6) + Me.lblBonitaetRisikostufe.MaxLineLength = -1 + Me.lblBonitaetRisikostufe.MaxLines_Warning = "" + Me.lblBonitaetRisikostufe.MaxLines_Warning_Label = Nothing + Me.lblBonitaetRisikostufe.Name = "lblBonitaetRisikostufe" + Me.lblBonitaetRisikostufe.ReadOnly = True + Me.lblBonitaetRisikostufe.Size = New System.Drawing.Size(20, 13) + Me.lblBonitaetRisikostufe.TabIndex = 3 + Me.lblBonitaetRisikostufe.TextAlign = System.Windows.Forms.HorizontalAlignment.Center + ' + 'lblBonitaetsdatum + ' + Me.lblBonitaetsdatum._DateTimeOnly = False + Me.lblBonitaetsdatum._numbersOnly = False + Me.lblBonitaetsdatum._numbersOnlyKommastellen = "" + Me.lblBonitaetsdatum._numbersOnlyTrennzeichen = True + Me.lblBonitaetsdatum._Prozent = False + Me.lblBonitaetsdatum._ShortDateNew = False + Me.lblBonitaetsdatum._ShortDateOnly = False + Me.lblBonitaetsdatum._TimeOnly = False + Me.lblBonitaetsdatum._TimeOnly_Seconds = False + Me.lblBonitaetsdatum._value = Nothing + Me.lblBonitaetsdatum._Waehrung = False + Me.lblBonitaetsdatum._WaehrungZeichen = True + Me.lblBonitaetsdatum.BackColor = System.Drawing.Color.WhiteSmoke + Me.lblBonitaetsdatum.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.lblBonitaetsdatum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblBonitaetsdatum.ForeColor = System.Drawing.Color.Black + Me.lblBonitaetsdatum.Location = New System.Drawing.Point(447, 6) + Me.lblBonitaetsdatum.MaxLineLength = -1 + Me.lblBonitaetsdatum.MaxLines_Warning = "" + Me.lblBonitaetsdatum.MaxLines_Warning_Label = Nothing + Me.lblBonitaetsdatum.Name = "lblBonitaetsdatum" + Me.lblBonitaetsdatum.ReadOnly = True + Me.lblBonitaetsdatum.Size = New System.Drawing.Size(77, 13) + Me.lblBonitaetsdatum.TabIndex = 5 + ' 'Label39 ' Me.Label39.AutoSize = True @@ -1188,6 +1698,34 @@ Partial Class usrCntlKundenuebersicht Me.Panel6.Size = New System.Drawing.Size(210, 1) Me.Panel6.TabIndex = 42 ' + 'txtOPFaellig + ' + Me.txtOPFaellig._DateTimeOnly = False + Me.txtOPFaellig._numbersOnly = False + Me.txtOPFaellig._numbersOnlyKommastellen = "" + Me.txtOPFaellig._numbersOnlyTrennzeichen = True + Me.txtOPFaellig._Prozent = False + Me.txtOPFaellig._ShortDateNew = False + Me.txtOPFaellig._ShortDateOnly = False + Me.txtOPFaellig._TimeOnly = False + Me.txtOPFaellig._TimeOnly_Seconds = False + Me.txtOPFaellig._value = Nothing + Me.txtOPFaellig._Waehrung = False + Me.txtOPFaellig._WaehrungZeichen = True + Me.txtOPFaellig.BackColor = System.Drawing.Color.AntiqueWhite + Me.txtOPFaellig.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.txtOPFaellig.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtOPFaellig.ForeColor = System.Drawing.Color.Black + Me.txtOPFaellig.Location = New System.Drawing.Point(114, 6) + Me.txtOPFaellig.MaxLineLength = -1 + Me.txtOPFaellig.MaxLines_Warning = "" + Me.txtOPFaellig.MaxLines_Warning_Label = Nothing + Me.txtOPFaellig.Name = "txtOPFaellig" + Me.txtOPFaellig.ReadOnly = True + Me.txtOPFaellig.Size = New System.Drawing.Size(108, 13) + Me.txtOPFaellig.TabIndex = 30 + Me.txtOPFaellig.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' 'lblOffenePosten ' Me.lblOffenePosten.AutoSize = True @@ -1198,6 +1736,34 @@ Partial Class usrCntlKundenuebersicht Me.lblOffenePosten.TabIndex = 27 Me.lblOffenePosten.Text = "OP-Saldo:" ' + 'txtOffenePosten + ' + Me.txtOffenePosten._DateTimeOnly = False + Me.txtOffenePosten._numbersOnly = False + Me.txtOffenePosten._numbersOnlyKommastellen = "" + Me.txtOffenePosten._numbersOnlyTrennzeichen = True + Me.txtOffenePosten._Prozent = False + Me.txtOffenePosten._ShortDateNew = False + Me.txtOffenePosten._ShortDateOnly = False + Me.txtOffenePosten._TimeOnly = False + Me.txtOffenePosten._TimeOnly_Seconds = False + Me.txtOffenePosten._value = Nothing + Me.txtOffenePosten._Waehrung = False + Me.txtOffenePosten._WaehrungZeichen = True + Me.txtOffenePosten.BackColor = System.Drawing.Color.AntiqueWhite + Me.txtOffenePosten.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.txtOffenePosten.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtOffenePosten.ForeColor = System.Drawing.Color.Black + Me.txtOffenePosten.Location = New System.Drawing.Point(114, 66) + Me.txtOffenePosten.MaxLineLength = -1 + Me.txtOffenePosten.MaxLines_Warning = "" + Me.txtOffenePosten.MaxLines_Warning_Label = Nothing + Me.txtOffenePosten.Name = "txtOffenePosten" + Me.txtOffenePosten.ReadOnly = True + Me.txtOffenePosten.Size = New System.Drawing.Size(108, 13) + Me.txtOffenePosten.TabIndex = 28 + Me.txtOffenePosten.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' 'Label32 ' Me.Label32.AutoSize = True @@ -1208,6 +1774,34 @@ Partial Class usrCntlKundenuebersicht Me.Label32.TabIndex = 29 Me.Label32.Text = "Offene Rg. fällig:" ' + 'txtOPCredit + ' + Me.txtOPCredit._DateTimeOnly = False + Me.txtOPCredit._numbersOnly = False + Me.txtOPCredit._numbersOnlyKommastellen = "" + Me.txtOPCredit._numbersOnlyTrennzeichen = True + Me.txtOPCredit._Prozent = False + Me.txtOPCredit._ShortDateNew = False + Me.txtOPCredit._ShortDateOnly = False + Me.txtOPCredit._TimeOnly = False + Me.txtOPCredit._TimeOnly_Seconds = False + Me.txtOPCredit._value = Nothing + Me.txtOPCredit._Waehrung = False + Me.txtOPCredit._WaehrungZeichen = True + Me.txtOPCredit.BackColor = System.Drawing.Color.AntiqueWhite + Me.txtOPCredit.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.txtOPCredit.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtOPCredit.ForeColor = System.Drawing.Color.Green + Me.txtOPCredit.Location = New System.Drawing.Point(114, 46) + Me.txtOPCredit.MaxLineLength = -1 + Me.txtOPCredit.MaxLines_Warning = "" + Me.txtOPCredit.MaxLines_Warning_Label = Nothing + Me.txtOPCredit.Name = "txtOPCredit" + Me.txtOPCredit.ReadOnly = True + Me.txtOPCredit.Size = New System.Drawing.Size(108, 13) + Me.txtOPCredit.TabIndex = 41 + Me.txtOPCredit.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' 'Label17 ' Me.Label17.AutoSize = True @@ -1228,6 +1822,34 @@ Partial Class usrCntlKundenuebersicht Me.Label18.TabIndex = 40 Me.Label18.Text = "- Guthaben" ' + 'txtOPNichtFaellig + ' + Me.txtOPNichtFaellig._DateTimeOnly = False + Me.txtOPNichtFaellig._numbersOnly = False + Me.txtOPNichtFaellig._numbersOnlyKommastellen = "" + Me.txtOPNichtFaellig._numbersOnlyTrennzeichen = True + Me.txtOPNichtFaellig._Prozent = False + Me.txtOPNichtFaellig._ShortDateNew = False + Me.txtOPNichtFaellig._ShortDateOnly = False + Me.txtOPNichtFaellig._TimeOnly = False + Me.txtOPNichtFaellig._TimeOnly_Seconds = False + Me.txtOPNichtFaellig._value = Nothing + Me.txtOPNichtFaellig._Waehrung = False + Me.txtOPNichtFaellig._WaehrungZeichen = True + Me.txtOPNichtFaellig.BackColor = System.Drawing.Color.AntiqueWhite + Me.txtOPNichtFaellig.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.txtOPNichtFaellig.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtOPNichtFaellig.ForeColor = System.Drawing.Color.Black + Me.txtOPNichtFaellig.Location = New System.Drawing.Point(114, 25) + Me.txtOPNichtFaellig.MaxLineLength = -1 + Me.txtOPNichtFaellig.MaxLines_Warning = "" + Me.txtOPNichtFaellig.MaxLines_Warning_Label = Nothing + Me.txtOPNichtFaellig.Name = "txtOPNichtFaellig" + Me.txtOPNichtFaellig.ReadOnly = True + Me.txtOPNichtFaellig.Size = New System.Drawing.Size(108, 13) + Me.txtOPNichtFaellig.TabIndex = 39 + Me.txtOPNichtFaellig.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' 'Panel7 ' Me.Panel7.BackColor = System.Drawing.Color.AntiqueWhite @@ -1241,6 +1863,35 @@ Partial Class usrCntlKundenuebersicht Me.Panel7.Size = New System.Drawing.Size(253, 46) Me.Panel7.TabIndex = 43 ' + 'txtOVK + ' + Me.txtOVK._DateTimeOnly = False + Me.txtOVK._numbersOnly = False + Me.txtOVK._numbersOnlyKommastellen = "" + Me.txtOVK._numbersOnlyTrennzeichen = True + Me.txtOVK._Prozent = False + Me.txtOVK._ShortDateNew = False + Me.txtOVK._ShortDateOnly = False + Me.txtOVK._TimeOnly = False + Me.txtOVK._TimeOnly_Seconds = False + Me.txtOVK._value = Nothing + Me.txtOVK._Waehrung = False + Me.txtOVK._WaehrungZeichen = True + Me.txtOVK.BackColor = System.Drawing.Color.AntiqueWhite + Me.txtOVK.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.txtOVK.Cursor = System.Windows.Forms.Cursors.Hand + Me.txtOVK.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtOVK.ForeColor = System.Drawing.Color.Green + Me.txtOVK.Location = New System.Drawing.Point(134, 4) + Me.txtOVK.MaxLineLength = -1 + Me.txtOVK.MaxLines_Warning = "" + Me.txtOVK.MaxLines_Warning_Label = Nothing + Me.txtOVK.Name = "txtOVK" + Me.txtOVK.ReadOnly = True + Me.txtOVK.Size = New System.Drawing.Size(108, 13) + Me.txtOVK.TabIndex = 44 + Me.txtOVK.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' 'Label19 ' Me.Label19.AutoSize = True @@ -1262,6 +1913,34 @@ Partial Class usrCntlKundenuebersicht Me.Label1.TabIndex = 19 Me.Label1.Text = "Kreditlimit:" ' + 'lblKreditlimit + ' + Me.lblKreditlimit._DateTimeOnly = False + Me.lblKreditlimit._numbersOnly = False + Me.lblKreditlimit._numbersOnlyKommastellen = "" + Me.lblKreditlimit._numbersOnlyTrennzeichen = True + Me.lblKreditlimit._Prozent = False + Me.lblKreditlimit._ShortDateNew = False + Me.lblKreditlimit._ShortDateOnly = False + Me.lblKreditlimit._TimeOnly = False + Me.lblKreditlimit._TimeOnly_Seconds = False + Me.lblKreditlimit._value = Nothing + Me.lblKreditlimit._Waehrung = False + Me.lblKreditlimit._WaehrungZeichen = True + Me.lblKreditlimit.BackColor = System.Drawing.Color.AntiqueWhite + Me.lblKreditlimit.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.lblKreditlimit.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblKreditlimit.ForeColor = System.Drawing.Color.Black + Me.lblKreditlimit.Location = New System.Drawing.Point(134, 24) + Me.lblKreditlimit.MaxLineLength = -1 + Me.lblKreditlimit.MaxLines_Warning = "" + Me.lblKreditlimit.MaxLines_Warning_Label = Nothing + Me.lblKreditlimit.Name = "lblKreditlimit" + Me.lblKreditlimit.ReadOnly = True + Me.lblKreditlimit.Size = New System.Drawing.Size(108, 13) + Me.lblKreditlimit.TabIndex = 20 + Me.lblKreditlimit.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' 'lblVorkasse ' Me.lblVorkasse.Location = New System.Drawing.Point(366, 230) @@ -1271,6 +1950,34 @@ Partial Class usrCntlKundenuebersicht Me.lblVorkasse.Text = "Vorauskasse:" Me.lblVorkasse.Visible = False ' + 'txtZahlungsziel + ' + Me.txtZahlungsziel._DateTimeOnly = False + Me.txtZahlungsziel._numbersOnly = False + Me.txtZahlungsziel._numbersOnlyKommastellen = "" + Me.txtZahlungsziel._numbersOnlyTrennzeichen = True + Me.txtZahlungsziel._Prozent = False + Me.txtZahlungsziel._ShortDateNew = False + Me.txtZahlungsziel._ShortDateOnly = False + Me.txtZahlungsziel._TimeOnly = False + Me.txtZahlungsziel._TimeOnly_Seconds = False + Me.txtZahlungsziel._value = Nothing + Me.txtZahlungsziel._Waehrung = False + Me.txtZahlungsziel._WaehrungZeichen = True + Me.txtZahlungsziel.BackColor = System.Drawing.Color.White + Me.txtZahlungsziel.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.txtZahlungsziel.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtZahlungsziel.ForeColor = System.Drawing.Color.Black + Me.txtZahlungsziel.Location = New System.Drawing.Point(310, 255) + Me.txtZahlungsziel.MaxLineLength = -1 + Me.txtZahlungsziel.MaxLines_Warning = "" + Me.txtZahlungsziel.MaxLines_Warning_Label = Nothing + Me.txtZahlungsziel.Name = "txtZahlungsziel" + Me.txtZahlungsziel.ReadOnly = True + Me.txtZahlungsziel.Size = New System.Drawing.Size(56, 13) + Me.txtZahlungsziel.TabIndex = 34 + Me.txtZahlungsziel.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' 'txtVeranlKd ' Me.txtVeranlKd.BackColor = System.Drawing.Color.White @@ -1345,6 +2052,43 @@ Partial Class usrCntlKundenuebersicht Me.tbKontaktKontakt.Text = "Kontakt" Me.tbKontaktKontakt.UseVisualStyleBackColor = True ' + 'btncheckliste + ' + Me.btncheckliste.allowBorder = False + Me.btncheckliste.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btncheckliste.FlatAppearance.BorderSize = 0 + Me.btncheckliste.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btncheckliste.ForeColor = System.Drawing.Color.Black + Me.btncheckliste.Image = Global.SDL.My.Resources.Resources.checklist + Me.btncheckliste.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.btncheckliste.Location = New System.Drawing.Point(388, 107) + Me.btncheckliste.Name = "btncheckliste" + Me.btncheckliste.Size = New System.Drawing.Size(88, 53) + Me.btncheckliste.TabIndex = 9 + Me.btncheckliste.Tag = "" + Me.btncheckliste.Text = "Checkliste" + Me.btncheckliste.TextAlign = System.Drawing.ContentAlignment.BottomCenter + Me.btncheckliste.UseVisualStyleBackColor = True + ' + 'FlatButton1 + ' + Me.FlatButton1.allowBorder = False + Me.FlatButton1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.FlatButton1.FlatAppearance.BorderSize = 0 + Me.FlatButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.FlatButton1.ForeColor = System.Drawing.Color.Black + Me.FlatButton1.Image = Global.SDL.My.Resources.Resources.compose + Me.FlatButton1.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.FlatButton1.Location = New System.Drawing.Point(392, -3) + Me.FlatButton1.Name = "FlatButton1" + Me.FlatButton1.Size = New System.Drawing.Size(84, 68) + Me.FlatButton1.TabIndex = 4 + Me.FlatButton1.Tag = "" + Me.FlatButton1.Text = "Änderungen" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "bekanntgeben" + Me.FlatButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter + Me.FlatButton1.UseVisualStyleBackColor = True + Me.FlatButton1.Visible = False + ' 'PictureBox1 ' Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None @@ -1485,6 +2229,14 @@ Partial Class usrCntlKundenuebersicht Me.tbKontaktSpez.Text = "Spezifisch" Me.tbKontaktSpez.UseVisualStyleBackColor = True ' + 'ucKundenKontakte + ' + Me.ucKundenKontakte.Dock = System.Windows.Forms.DockStyle.Fill + Me.ucKundenKontakte.Location = New System.Drawing.Point(3, 3) + Me.ucKundenKontakte.Name = "ucKundenKontakte" + Me.ucKundenKontakte.Size = New System.Drawing.Size(473, 158) + Me.ucKundenKontakte.TabIndex = 0 + ' 'Label38 ' Me.Label38.AutoSize = True @@ -1757,8 +2509,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvVollmachten.AllowUserToDeleteRows = False Me.dgvVollmachten.AllowUserToOrderColumns = True Me.dgvVollmachten.AllowUserToResizeRows = False - DataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvVollmachten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7 + DataGridViewCellStyle31.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvVollmachten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle31 Me.dgvVollmachten.BackgroundColor = System.Drawing.Color.White Me.dgvVollmachten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvVollmachten.Dock = System.Windows.Forms.DockStyle.Fill @@ -1811,8 +2563,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvVertraege.AllowUserToDeleteRows = False Me.dgvVertraege.AllowUserToOrderColumns = True Me.dgvVertraege.AllowUserToResizeRows = False - DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvVertraege.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8 + DataGridViewCellStyle32.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvVertraege.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle32 Me.dgvVertraege.BackgroundColor = System.Drawing.Color.White Me.dgvVertraege.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvVertraege.Dock = System.Windows.Forms.DockStyle.Fill @@ -1870,6 +2622,29 @@ Partial Class usrCntlKundenuebersicht Me.Button12.UseVisualStyleBackColor = True Me.Button12.Visible = False ' + 'txtVertragVermerk + ' + Me.txtVertragVermerk._DateTimeOnly = False + Me.txtVertragVermerk._numbersOnly = False + Me.txtVertragVermerk._numbersOnlyKommastellen = "" + Me.txtVertragVermerk._numbersOnlyTrennzeichen = True + Me.txtVertragVermerk._Prozent = False + Me.txtVertragVermerk._ShortDateNew = False + Me.txtVertragVermerk._ShortDateOnly = False + Me.txtVertragVermerk._TimeOnly = False + Me.txtVertragVermerk._TimeOnly_Seconds = False + Me.txtVertragVermerk._value = "" + Me.txtVertragVermerk._Waehrung = False + Me.txtVertragVermerk._WaehrungZeichen = True + Me.txtVertragVermerk.ForeColor = System.Drawing.Color.Black + Me.txtVertragVermerk.Location = New System.Drawing.Point(60, 23) + Me.txtVertragVermerk.MaxLineLength = -1 + Me.txtVertragVermerk.MaxLines_Warning = "" + Me.txtVertragVermerk.MaxLines_Warning_Label = Nothing + Me.txtVertragVermerk.Name = "txtVertragVermerk" + Me.txtVertragVermerk.Size = New System.Drawing.Size(326, 20) + Me.txtVertragVermerk.TabIndex = 6 + ' 'Label16 ' Me.Label16.AutoSize = True @@ -1890,6 +2665,41 @@ Partial Class usrCntlKundenuebersicht Me.Label5.TabIndex = 2 Me.Label5.Text = "Datum:" ' + 'cboVertrag + ' + Me.cboVertrag._allowedValuesFreiText = Nothing + Me.cboVertrag._allowFreiText = False + Me.cboVertrag._value = "" + Me.cboVertrag.FormattingEnabled = True + Me.cboVertrag.Location = New System.Drawing.Point(60, 3) + Me.cboVertrag.Name = "cboVertrag" + Me.cboVertrag.Size = New System.Drawing.Size(178, 21) + Me.cboVertrag.TabIndex = 1 + ' + 'datVertrag + ' + Me.datVertrag._DateTimeOnly = False + Me.datVertrag._numbersOnly = False + Me.datVertrag._numbersOnlyKommastellen = "" + Me.datVertrag._numbersOnlyTrennzeichen = True + Me.datVertrag._Prozent = False + Me.datVertrag._ShortDateNew = True + Me.datVertrag._ShortDateOnly = False + Me.datVertrag._TimeOnly = False + Me.datVertrag._TimeOnly_Seconds = False + Me.datVertrag._value = "" + Me.datVertrag._Waehrung = False + Me.datVertrag._WaehrungZeichen = True + Me.datVertrag.ForeColor = System.Drawing.Color.Black + Me.datVertrag.Location = New System.Drawing.Point(291, 3) + Me.datVertrag.MaxLength = 10 + Me.datVertrag.MaxLineLength = -1 + Me.datVertrag.MaxLines_Warning = "" + Me.datVertrag.MaxLines_Warning_Label = Nothing + Me.datVertrag.Name = "datVertrag" + Me.datVertrag.Size = New System.Drawing.Size(95, 20) + Me.datVertrag.TabIndex = 3 + ' 'Label4 ' Me.Label4.AutoSize = True @@ -1929,8 +2739,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvGestGarantie.AllowUserToDeleteRows = False Me.dgvGestGarantie.AllowUserToOrderColumns = True Me.dgvGestGarantie.AllowUserToResizeRows = False - DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvGestGarantie.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9 + DataGridViewCellStyle33.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvGestGarantie.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle33 Me.dgvGestGarantie.BackgroundColor = System.Drawing.Color.White Me.dgvGestGarantie.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvGestGarantie.Dock = System.Windows.Forms.DockStyle.Fill @@ -1968,6 +2778,56 @@ Partial Class usrCntlKundenuebersicht Me.cbxGG.Text = "generelle Gestellungsgarantie" Me.cbxGG.UseVisualStyleBackColor = True ' + 'txtGGDatum + ' + Me.txtGGDatum._DateTimeOnly = False + Me.txtGGDatum._numbersOnly = False + Me.txtGGDatum._numbersOnlyKommastellen = "" + Me.txtGGDatum._numbersOnlyTrennzeichen = True + Me.txtGGDatum._Prozent = False + Me.txtGGDatum._ShortDateNew = True + Me.txtGGDatum._ShortDateOnly = False + Me.txtGGDatum._TimeOnly = False + Me.txtGGDatum._TimeOnly_Seconds = False + Me.txtGGDatum._value = "" + Me.txtGGDatum._Waehrung = False + Me.txtGGDatum._WaehrungZeichen = True + Me.txtGGDatum.ForeColor = System.Drawing.Color.Black + Me.txtGGDatum.Location = New System.Drawing.Point(256, 7) + Me.txtGGDatum.MaxLength = 10 + Me.txtGGDatum.MaxLineLength = -1 + Me.txtGGDatum.MaxLines_Warning = "" + Me.txtGGDatum.MaxLines_Warning_Label = Nothing + Me.txtGGDatum.Name = "txtGGDatum" + Me.txtGGDatum.Size = New System.Drawing.Size(100, 20) + Me.txtGGDatum.TabIndex = 2 + ' + 'txtT1VerzollungsadresseBestimmungszollstelle + ' + Me.txtT1VerzollungsadresseBestimmungszollstelle._allowFreitext = False + Me.txtT1VerzollungsadresseBestimmungszollstelle._AllowSetValue = False + Me.txtT1VerzollungsadresseBestimmungszollstelle._allowSpaceAsSplitter = False + Me.txtT1VerzollungsadresseBestimmungszollstelle._autoSizeGross = False + Me.txtT1VerzollungsadresseBestimmungszollstelle._hideIfListEmpty = True + Me.txtT1VerzollungsadresseBestimmungszollstelle._value = Nothing + Me.txtT1VerzollungsadresseBestimmungszollstelle.conn_art = "FMZOLL" + Me.txtT1VerzollungsadresseBestimmungszollstelle.dgvpos = "LEFT" + Me.txtT1VerzollungsadresseBestimmungszollstelle.DISPLAY_PARAM = Nothing + Me.txtT1VerzollungsadresseBestimmungszollstelle.INVISIBLE_COLUMNS = Nothing + Me.txtT1VerzollungsadresseBestimmungszollstelle.key_visible = False + Me.txtT1VerzollungsadresseBestimmungszollstelle.KEYPARAM = Nothing + Me.txtT1VerzollungsadresseBestimmungszollstelle.Location = New System.Drawing.Point(87, 7) + Me.txtT1VerzollungsadresseBestimmungszollstelle.MaxLength = 8 + Me.txtT1VerzollungsadresseBestimmungszollstelle.Name = "txtT1VerzollungsadresseBestimmungszollstelle" + Me.txtT1VerzollungsadresseBestimmungszollstelle.searchActive = True + Me.txtT1VerzollungsadresseBestimmungszollstelle.Size = New System.Drawing.Size(163, 20) + Me.txtT1VerzollungsadresseBestimmungszollstelle.SQL_ORDER_BY = Nothing + Me.txtT1VerzollungsadresseBestimmungszollstelle.SQL_SELECT = Nothing + Me.txtT1VerzollungsadresseBestimmungszollstelle.SQL_WHERE = Nothing + Me.txtT1VerzollungsadresseBestimmungszollstelle.SQL_WhereParamList = Nothing + Me.txtT1VerzollungsadresseBestimmungszollstelle.TabIndex = 1 + Me.txtT1VerzollungsadresseBestimmungszollstelle.usrcntl = Nothing + ' 'Label11 ' Me.Label11.AutoSize = True @@ -2016,6 +2876,16 @@ Partial Class usrCntlKundenuebersicht Me.tbAvisoMail.Text = "Aviso E-Mails" Me.tbAvisoMail.UseVisualStyleBackColor = True ' + 'UsrCntlKundenAvisoMailBenachrichtigung1 + ' + Me.UsrCntlKundenAvisoMailBenachrichtigung1.AutoScroll = True + Me.UsrCntlKundenAvisoMailBenachrichtigung1.BackColor = System.Drawing.Color.White + Me.UsrCntlKundenAvisoMailBenachrichtigung1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlKundenAvisoMailBenachrichtigung1.Location = New System.Drawing.Point(3, 3) + Me.UsrCntlKundenAvisoMailBenachrichtigung1.Name = "UsrCntlKundenAvisoMailBenachrichtigung1" + Me.UsrCntlKundenAvisoMailBenachrichtigung1.Size = New System.Drawing.Size(473, 158) + Me.UsrCntlKundenAvisoMailBenachrichtigung1.TabIndex = 0 + ' 'tbKdSpez ' Me.tbKdSpez.Controls.Add(Me.Label14) @@ -2103,6 +2973,69 @@ Partial Class usrCntlKundenuebersicht Me.Label10.TabIndex = 0 Me.Label10.Text = "Dokumente bei LKW-Freigabe senden:" ' + 'txtInfoKdAtrNr + ' + Me.txtInfoKdAtrNr._DateTimeOnly = False + Me.txtInfoKdAtrNr._numbersOnly = False + Me.txtInfoKdAtrNr._numbersOnlyKommastellen = "" + Me.txtInfoKdAtrNr._numbersOnlyTrennzeichen = True + Me.txtInfoKdAtrNr._Prozent = False + Me.txtInfoKdAtrNr._ShortDateNew = False + Me.txtInfoKdAtrNr._ShortDateOnly = False + Me.txtInfoKdAtrNr._TimeOnly = False + Me.txtInfoKdAtrNr._TimeOnly_Seconds = False + Me.txtInfoKdAtrNr._value = "" + Me.txtInfoKdAtrNr._Waehrung = False + Me.txtInfoKdAtrNr._WaehrungZeichen = True + Me.txtInfoKdAtrNr.Enabled = False + Me.txtInfoKdAtrNr.ForeColor = System.Drawing.Color.Black + Me.txtInfoKdAtrNr.Location = New System.Drawing.Point(266, 41) + Me.txtInfoKdAtrNr.MaxLineLength = -1 + Me.txtInfoKdAtrNr.MaxLines_Warning = "" + Me.txtInfoKdAtrNr.MaxLines_Warning_Label = Nothing + Me.txtInfoKdAtrNr.Name = "txtInfoKdAtrNr" + Me.txtInfoKdAtrNr.Size = New System.Drawing.Size(192, 20) + Me.txtInfoKdAtrNr.TabIndex = 6 + ' + 'txtFixeKdAtrNr + ' + Me.txtFixeKdAtrNr._DateTimeOnly = False + Me.txtFixeKdAtrNr._numbersOnly = False + Me.txtFixeKdAtrNr._numbersOnlyKommastellen = "" + Me.txtFixeKdAtrNr._numbersOnlyTrennzeichen = True + Me.txtFixeKdAtrNr._Prozent = False + Me.txtFixeKdAtrNr._ShortDateNew = False + Me.txtFixeKdAtrNr._ShortDateOnly = False + Me.txtFixeKdAtrNr._TimeOnly = False + Me.txtFixeKdAtrNr._TimeOnly_Seconds = False + Me.txtFixeKdAtrNr._value = "" + Me.txtFixeKdAtrNr._Waehrung = False + Me.txtFixeKdAtrNr._WaehrungZeichen = True + Me.txtFixeKdAtrNr.Enabled = False + Me.txtFixeKdAtrNr.ForeColor = System.Drawing.Color.Black + Me.txtFixeKdAtrNr.Location = New System.Drawing.Point(309, 22) + Me.txtFixeKdAtrNr.MaxLineLength = -1 + Me.txtFixeKdAtrNr.MaxLines_Warning = "" + Me.txtFixeKdAtrNr.MaxLines_Warning_Label = Nothing + Me.txtFixeKdAtrNr.Name = "txtFixeKdAtrNr" + Me.txtFixeKdAtrNr.Size = New System.Drawing.Size(149, 20) + Me.txtFixeKdAtrNr.TabIndex = 4 + ' + 'FlatButton4 + ' + Me.FlatButton4.allowBorder = False + Me.FlatButton4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.FlatButton4.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.FlatButton4.ForeColor = System.Drawing.Color.Black + Me.FlatButton4.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.FlatButton4.Location = New System.Drawing.Point(365, 134) + Me.FlatButton4.Name = "FlatButton4" + Me.FlatButton4.Size = New System.Drawing.Size(92, 26) + Me.FlatButton4.TabIndex = 9 + Me.FlatButton4.Tag = "" + Me.FlatButton4.Text = "Speichern" + Me.FlatButton4.UseVisualStyleBackColor = True + ' 'tbSonstiges ' Me.tbSonstiges.Controls.Add(Me.Label6) @@ -2253,6 +3186,94 @@ Partial Class usrCntlKundenuebersicht Me.lblEORINr.TabIndex = 5 Me.lblEORINr.Text = "EORI-Nr.:" ' + 'dgvAufschub + ' + Me.dgvAufschub.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvAufschub.AllowUserToAddRows = False + Me.dgvAufschub.AllowUserToDeleteRows = False + Me.dgvAufschub.AllowUserToResizeColumns = False + Me.dgvAufschub.AllowUserToResizeRows = False + Me.dgvAufschub.BackgroundColor = System.Drawing.Color.White + DataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle34.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle34.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle34.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle34.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle34.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvAufschub.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle34 + Me.dgvAufschub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvAufschub.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.KtoId, Me.Art, Me.HZA, Me.KontoNr, Me.EORI, Me.NL, Me.BIN}) + DataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle36.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle36.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle36.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle36.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvAufschub.DefaultCellStyle = DataGridViewCellStyle36 + Me.dgvAufschub.Location = New System.Drawing.Point(13, 61) + Me.dgvAufschub.MultiSelect = False + Me.dgvAufschub.Name = "dgvAufschub" + Me.dgvAufschub.ReadOnly = True + Me.dgvAufschub.RowHeadersVisible = False + Me.dgvAufschub.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvAufschub.Size = New System.Drawing.Size(473, 75) + Me.dgvAufschub.TabIndex = 11 + Me.dgvAufschub.TabStop = False + ' + 'KtoId + ' + Me.KtoId.HeaderText = "Id" + Me.KtoId.Name = "KtoId" + Me.KtoId.ReadOnly = True + Me.KtoId.Visible = False + ' + 'Art + ' + Me.Art.HeaderText = "Aufschub" + Me.Art.Name = "Art" + Me.Art.ReadOnly = True + Me.Art.Width = 120 + ' + 'HZA + ' + DataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + Me.HZA.DefaultCellStyle = DataGridViewCellStyle35 + Me.HZA.HeaderText = "HZA" + Me.HZA.Name = "HZA" + Me.HZA.ReadOnly = True + Me.HZA.Width = 35 + ' + 'KontoNr + ' + Me.KontoNr.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None + Me.KontoNr.HeaderText = "Konto Nr." + Me.KontoNr.Name = "KontoNr" + Me.KontoNr.ReadOnly = True + Me.KontoNr.Resizable = System.Windows.Forms.DataGridViewTriState.[True] + ' + 'EORI + ' + Me.EORI.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.EORI.HeaderText = "EORI" + Me.EORI.Name = "EORI" + Me.EORI.ReadOnly = True + ' + 'NL + ' + Me.NL.HeaderText = "NL" + Me.NL.Name = "NL" + Me.NL.ReadOnly = True + Me.NL.Width = 60 + ' + 'BIN + ' + Me.BIN.HeaderText = "BIN" + Me.BIN.Name = "BIN" + Me.BIN.ReadOnly = True + Me.BIN.Visible = False + ' 'ContextMenuStrip1 ' Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KopierenToolStripMenuItem}) @@ -2430,1012 +3451,6 @@ Partial Class usrCntlKundenuebersicht Me.cboFirmaFMZOLL.TabIndex = 10 Me.cboFirmaFMZOLL.Visible = False ' - 'txtSperreGrund - ' - Me.txtSperreGrund._DateTimeOnly = False - Me.txtSperreGrund._numbersOnly = False - Me.txtSperreGrund._numbersOnlyKommastellen = "" - Me.txtSperreGrund._numbersOnlyTrennzeichen = True - Me.txtSperreGrund._Prozent = False - Me.txtSperreGrund._ShortDateNew = False - Me.txtSperreGrund._ShortDateOnly = False - Me.txtSperreGrund._TimeOnly = False - Me.txtSperreGrund._TimeOnly_Seconds = False - Me.txtSperreGrund._value = Nothing - Me.txtSperreGrund._Waehrung = False - Me.txtSperreGrund._WaehrungZeichen = True - Me.txtSperreGrund.ForeColor = System.Drawing.Color.Black - Me.txtSperreGrund.Location = New System.Drawing.Point(309, 7) - Me.txtSperreGrund.MaxLineLength = -1 - Me.txtSperreGrund.MaxLines_Warning = "" - Me.txtSperreGrund.MaxLines_Warning_Label = Nothing - Me.txtSperreGrund.Name = "txtSperreGrund" - Me.txtSperreGrund.Size = New System.Drawing.Size(268, 20) - Me.txtSperreGrund.TabIndex = 4 - ' - 'txtSperreDat - ' - Me.txtSperreDat._DateTimeOnly = False - Me.txtSperreDat._numbersOnly = False - Me.txtSperreDat._numbersOnlyKommastellen = "" - Me.txtSperreDat._numbersOnlyTrennzeichen = True - Me.txtSperreDat._Prozent = False - Me.txtSperreDat._ShortDateNew = False - Me.txtSperreDat._ShortDateOnly = False - Me.txtSperreDat._TimeOnly = False - Me.txtSperreDat._TimeOnly_Seconds = False - Me.txtSperreDat._value = Nothing - Me.txtSperreDat._Waehrung = False - Me.txtSperreDat._WaehrungZeichen = True - Me.txtSperreDat.BackColor = System.Drawing.Color.White - Me.txtSperreDat.ForeColor = System.Drawing.Color.Black - Me.txtSperreDat.Location = New System.Drawing.Point(129, 7) - Me.txtSperreDat.MaxLineLength = -1 - Me.txtSperreDat.MaxLines_Warning = "" - Me.txtSperreDat.MaxLines_Warning_Label = Nothing - Me.txtSperreDat.Name = "txtSperreDat" - Me.txtSperreDat.ReadOnly = True - Me.txtSperreDat.Size = New System.Drawing.Size(100, 20) - Me.txtSperreDat.TabIndex = 2 - ' - 'txtOpLeihgeld - ' - Me.txtOpLeihgeld._DateTimeOnly = False - Me.txtOpLeihgeld._numbersOnly = False - Me.txtOpLeihgeld._numbersOnlyKommastellen = "" - Me.txtOpLeihgeld._numbersOnlyTrennzeichen = True - Me.txtOpLeihgeld._Prozent = False - Me.txtOpLeihgeld._ShortDateNew = False - Me.txtOpLeihgeld._ShortDateOnly = False - Me.txtOpLeihgeld._TimeOnly = False - Me.txtOpLeihgeld._TimeOnly_Seconds = False - Me.txtOpLeihgeld._value = Nothing - Me.txtOpLeihgeld._Waehrung = False - Me.txtOpLeihgeld._WaehrungZeichen = True - Me.txtOpLeihgeld.BackColor = System.Drawing.Color.White - Me.txtOpLeihgeld.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.txtOpLeihgeld.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtOpLeihgeld.ForeColor = System.Drawing.Color.Black - Me.txtOpLeihgeld.Location = New System.Drawing.Point(141, 9) - Me.txtOpLeihgeld.MaxLineLength = -1 - Me.txtOpLeihgeld.MaxLines_Warning = "" - Me.txtOpLeihgeld.MaxLines_Warning_Label = Nothing - Me.txtOpLeihgeld.Name = "txtOpLeihgeld" - Me.txtOpLeihgeld.ReadOnly = True - Me.txtOpLeihgeld.Size = New System.Drawing.Size(115, 13) - Me.txtOpLeihgeld.TabIndex = 1 - Me.txtOpLeihgeld.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' - 'usrCntlAnhaenge - ' - Me.usrCntlAnhaenge._DATENSERVER_KATEGORIE = "DOKUMENTE" - Me.usrCntlAnhaenge._DATENSERVER_ORDNER = "KD_ANHÄNGE" - Me.usrCntlAnhaenge._DATENSERVER_UOrdner1 = "ZOLL" - Me.usrCntlAnhaenge._DATENSERVER_UOrdner2 = "" - Me.usrCntlAnhaenge._DATENSERVER_UOrdner3 = "" - Me.usrCntlAnhaenge._OPEN_ORIGINAL = False - Me.usrCntlAnhaenge._TYPE = "" - Me.usrCntlAnhaenge.AllowDrop = True - Me.usrCntlAnhaenge.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.usrCntlAnhaenge.BackColor = System.Drawing.Color.White - Me.usrCntlAnhaenge.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.usrCntlAnhaenge.Cursor = System.Windows.Forms.Cursors.Default - Me.usrCntlAnhaenge.Dock = System.Windows.Forms.DockStyle.Fill - Me.usrCntlAnhaenge.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.usrCntlAnhaenge.Location = New System.Drawing.Point(0, 0) - Me.usrCntlAnhaenge.Margin = New System.Windows.Forms.Padding(0) - Me.usrCntlAnhaenge.Name = "usrCntlAnhaenge" - Me.usrCntlAnhaenge.Size = New System.Drawing.Size(655, 255) - Me.usrCntlAnhaenge.TabIndex = 0 - ' - 'btnThereforeTarifNr - ' - Me.btnThereforeTarifNr.allowBorder = False - Me.btnThereforeTarifNr.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.btnThereforeTarifNr.FlatAppearance.BorderSize = 0 - Me.btnThereforeTarifNr.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnThereforeTarifNr.ForeColor = System.Drawing.Color.Black - Me.btnThereforeTarifNr.Image = Global.SDL.My.Resources.Resources.therefore1 - Me.btnThereforeTarifNr.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnThereforeTarifNr.Location = New System.Drawing.Point(5, 3) - Me.btnThereforeTarifNr.Name = "btnThereforeTarifNr" - Me.btnThereforeTarifNr.Size = New System.Drawing.Size(118, 33) - Me.btnThereforeTarifNr.TabIndex = 0 - Me.btnThereforeTarifNr.Tag = "" - Me.btnThereforeTarifNr.Text = "Tarifnummern" - Me.btnThereforeTarifNr.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnThereforeTarifNr.UseVisualStyleBackColor = True - ' - 'btnThereforeKundeninfo - ' - Me.btnThereforeKundeninfo.allowBorder = False - Me.btnThereforeKundeninfo.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.btnThereforeKundeninfo.FlatAppearance.BorderSize = 0 - Me.btnThereforeKundeninfo.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnThereforeKundeninfo.ForeColor = System.Drawing.Color.Black - Me.btnThereforeKundeninfo.Image = Global.SDL.My.Resources.Resources.therefore1 - Me.btnThereforeKundeninfo.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnThereforeKundeninfo.Location = New System.Drawing.Point(144, 3) - Me.btnThereforeKundeninfo.Name = "btnThereforeKundeninfo" - Me.btnThereforeKundeninfo.Size = New System.Drawing.Size(118, 33) - Me.btnThereforeKundeninfo.TabIndex = 1 - Me.btnThereforeKundeninfo.Tag = "" - Me.btnThereforeKundeninfo.Text = "Kundeninfo" - Me.btnThereforeKundeninfo.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnThereforeKundeninfo.UseVisualStyleBackColor = True - ' - 'UsrCntlKundenBesonderheiten1 - ' - Me.UsrCntlKundenBesonderheiten1.AutoScroll = True - Me.UsrCntlKundenBesonderheiten1.BackColor = System.Drawing.Color.White - Me.UsrCntlKundenBesonderheiten1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.UsrCntlKundenBesonderheiten1.Location = New System.Drawing.Point(7, 32) - Me.UsrCntlKundenBesonderheiten1.Name = "UsrCntlKundenBesonderheiten1" - Me.UsrCntlKundenBesonderheiten1.Size = New System.Drawing.Size(107, 52) - Me.UsrCntlKundenBesonderheiten1.TabIndex = 6 - Me.UsrCntlKundenBesonderheiten1.Visible = False - ' - 'txtKundenbetreuerTeam - ' - Me.txtKundenbetreuerTeam._DateTimeOnly = False - Me.txtKundenbetreuerTeam._numbersOnly = False - Me.txtKundenbetreuerTeam._numbersOnlyKommastellen = "" - Me.txtKundenbetreuerTeam._numbersOnlyTrennzeichen = True - Me.txtKundenbetreuerTeam._Prozent = False - Me.txtKundenbetreuerTeam._ShortDateNew = False - Me.txtKundenbetreuerTeam._ShortDateOnly = False - Me.txtKundenbetreuerTeam._TimeOnly = False - Me.txtKundenbetreuerTeam._TimeOnly_Seconds = False - Me.txtKundenbetreuerTeam._value = "-" - Me.txtKundenbetreuerTeam._Waehrung = False - Me.txtKundenbetreuerTeam._WaehrungZeichen = True - Me.txtKundenbetreuerTeam.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.txtKundenbetreuerTeam.BackColor = System.Drawing.Color.WhiteSmoke - Me.txtKundenbetreuerTeam.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.txtKundenbetreuerTeam.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtKundenbetreuerTeam.ForeColor = System.Drawing.Color.Black - Me.txtKundenbetreuerTeam.Location = New System.Drawing.Point(6, 23) - Me.txtKundenbetreuerTeam.MaxLineLength = -1 - Me.txtKundenbetreuerTeam.MaxLines_Warning = "" - Me.txtKundenbetreuerTeam.MaxLines_Warning_Label = Nothing - Me.txtKundenbetreuerTeam.Name = "txtKundenbetreuerTeam" - Me.txtKundenbetreuerTeam.ReadOnly = True - Me.txtKundenbetreuerTeam.Size = New System.Drawing.Size(168, 13) - Me.txtKundenbetreuerTeam.TabIndex = 2 - Me.txtKundenbetreuerTeam.Text = "-" - ' - 'btnVeragAnspr - ' - Me.btnVeragAnspr.allowBorder = False - Me.btnVeragAnspr.BackgroundImage = Global.SDL.My.Resources.Resources.stift - Me.btnVeragAnspr.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.btnVeragAnspr.FlatAppearance.BorderSize = 0 - Me.btnVeragAnspr.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnVeragAnspr.ForeColor = System.Drawing.Color.Black - Me.btnVeragAnspr.Location = New System.Drawing.Point(158, 7) - Me.btnVeragAnspr.Name = "btnVeragAnspr" - Me.btnVeragAnspr.Size = New System.Drawing.Size(15, 12) - Me.btnVeragAnspr.TabIndex = 1 - Me.btnVeragAnspr.UseVisualStyleBackColor = True - Me.btnVeragAnspr.Visible = False - ' - 'txtKundenbetreuerVertretung - ' - Me.txtKundenbetreuerVertretung._DateTimeOnly = False - Me.txtKundenbetreuerVertretung._numbersOnly = False - Me.txtKundenbetreuerVertretung._numbersOnlyKommastellen = "" - Me.txtKundenbetreuerVertretung._numbersOnlyTrennzeichen = True - Me.txtKundenbetreuerVertretung._Prozent = False - Me.txtKundenbetreuerVertretung._ShortDateNew = False - Me.txtKundenbetreuerVertretung._ShortDateOnly = False - Me.txtKundenbetreuerVertretung._TimeOnly = False - Me.txtKundenbetreuerVertretung._TimeOnly_Seconds = False - Me.txtKundenbetreuerVertretung._value = "-" - Me.txtKundenbetreuerVertretung._Waehrung = False - Me.txtKundenbetreuerVertretung._WaehrungZeichen = True - Me.txtKundenbetreuerVertretung.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.txtKundenbetreuerVertretung.BackColor = System.Drawing.Color.WhiteSmoke - Me.txtKundenbetreuerVertretung.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.txtKundenbetreuerVertretung.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtKundenbetreuerVertretung.ForeColor = System.Drawing.Color.Black - Me.txtKundenbetreuerVertretung.Location = New System.Drawing.Point(6, 61) - Me.txtKundenbetreuerVertretung.MaxLineLength = -1 - Me.txtKundenbetreuerVertretung.MaxLines_Warning = "" - Me.txtKundenbetreuerVertretung.MaxLines_Warning_Label = Nothing - Me.txtKundenbetreuerVertretung.Multiline = True - Me.txtKundenbetreuerVertretung.Name = "txtKundenbetreuerVertretung" - Me.txtKundenbetreuerVertretung.ReadOnly = True - Me.txtKundenbetreuerVertretung.Size = New System.Drawing.Size(168, 24) - Me.txtKundenbetreuerVertretung.TabIndex = 4 - Me.txtKundenbetreuerVertretung.Text = "-" - Me.txtKundenbetreuerVertretung.Visible = False - ' - 'txtKundenbetreuer - ' - Me.txtKundenbetreuer._DateTimeOnly = False - Me.txtKundenbetreuer._numbersOnly = False - Me.txtKundenbetreuer._numbersOnlyKommastellen = "" - Me.txtKundenbetreuer._numbersOnlyTrennzeichen = True - Me.txtKundenbetreuer._Prozent = False - Me.txtKundenbetreuer._ShortDateNew = False - Me.txtKundenbetreuer._ShortDateOnly = False - Me.txtKundenbetreuer._TimeOnly = False - Me.txtKundenbetreuer._TimeOnly_Seconds = False - Me.txtKundenbetreuer._value = "-" - Me.txtKundenbetreuer._Waehrung = False - Me.txtKundenbetreuer._WaehrungZeichen = True - Me.txtKundenbetreuer.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.txtKundenbetreuer.BackColor = System.Drawing.Color.WhiteSmoke - Me.txtKundenbetreuer.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.txtKundenbetreuer.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtKundenbetreuer.ForeColor = System.Drawing.Color.Black - Me.txtKundenbetreuer.Location = New System.Drawing.Point(6, 42) - Me.txtKundenbetreuer.MaxLineLength = -1 - Me.txtKundenbetreuer.MaxLines_Warning = "" - Me.txtKundenbetreuer.MaxLines_Warning_Label = Nothing - Me.txtKundenbetreuer.Name = "txtKundenbetreuer" - Me.txtKundenbetreuer.ReadOnly = True - Me.txtKundenbetreuer.Size = New System.Drawing.Size(168, 13) - Me.txtKundenbetreuer.TabIndex = 3 - Me.txtKundenbetreuer.Text = "-" - ' - 'btnPunkt2Save - ' - Me.btnPunkt2Save.allowBorder = False - Me.btnPunkt2Save.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnPunkt2Save.BackgroundImage = Global.SDL.My.Resources.Resources.save - Me.btnPunkt2Save.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.btnPunkt2Save.FlatAppearance.BorderSize = 0 - Me.btnPunkt2Save.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnPunkt2Save.ForeColor = System.Drawing.Color.Black - Me.btnPunkt2Save.Location = New System.Drawing.Point(647, 205) - Me.btnPunkt2Save.Name = "btnPunkt2Save" - Me.btnPunkt2Save.Size = New System.Drawing.Size(20, 20) - Me.btnPunkt2Save.TabIndex = 12 - Me.btnPunkt2Save.UseVisualStyleBackColor = True - Me.btnPunkt2Save.Visible = False - ' - 'txtUmsatzJahr - ' - Me.txtUmsatzJahr._DateTimeOnly = False - Me.txtUmsatzJahr._numbersOnly = False - Me.txtUmsatzJahr._numbersOnlyKommastellen = "" - Me.txtUmsatzJahr._numbersOnlyTrennzeichen = True - Me.txtUmsatzJahr._Prozent = False - Me.txtUmsatzJahr._ShortDateNew = False - Me.txtUmsatzJahr._ShortDateOnly = False - Me.txtUmsatzJahr._TimeOnly = False - Me.txtUmsatzJahr._TimeOnly_Seconds = False - Me.txtUmsatzJahr._value = Nothing - Me.txtUmsatzJahr._Waehrung = False - Me.txtUmsatzJahr._WaehrungZeichen = True - Me.txtUmsatzJahr.BackColor = System.Drawing.Color.White - Me.txtUmsatzJahr.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.txtUmsatzJahr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtUmsatzJahr.ForeColor = System.Drawing.Color.Black - Me.txtUmsatzJahr.Location = New System.Drawing.Point(383, 274) - Me.txtUmsatzJahr.MaxLineLength = -1 - Me.txtUmsatzJahr.MaxLines_Warning = "" - Me.txtUmsatzJahr.MaxLines_Warning_Label = Nothing - Me.txtUmsatzJahr.Name = "txtUmsatzJahr" - Me.txtUmsatzJahr.ReadOnly = True - Me.txtUmsatzJahr.Size = New System.Drawing.Size(96, 13) - Me.txtUmsatzJahr.TabIndex = 32 - Me.txtUmsatzJahr.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' - 'cbxFiskalabfertigung - ' - Me.cbxFiskalabfertigung._value = "" - Me.cbxFiskalabfertigung.AutoSize = True - Me.cbxFiskalabfertigung.Checked_value = False - Me.cbxFiskalabfertigung.CheckedValue = False - Me.cbxFiskalabfertigung.Location = New System.Drawing.Point(39, 134) - Me.cbxFiskalabfertigung.Name = "cbxFiskalabfertigung" - Me.cbxFiskalabfertigung.Size = New System.Drawing.Size(160, 17) - Me.cbxFiskalabfertigung.TabIndex = 8 - Me.cbxFiskalabfertigung.Text = "Fiskalverzollung freigegeben" - Me.cbxFiskalabfertigung.UseVisualStyleBackColor = True - Me.cbxFiskalabfertigung.Visible = False - ' - 'txtAbf_ErsteAbfertigung - ' - Me.txtAbf_ErsteAbfertigung._DateTimeOnly = False - Me.txtAbf_ErsteAbfertigung._numbersOnly = False - Me.txtAbf_ErsteAbfertigung._numbersOnlyKommastellen = "" - Me.txtAbf_ErsteAbfertigung._numbersOnlyTrennzeichen = True - Me.txtAbf_ErsteAbfertigung._Prozent = False - Me.txtAbf_ErsteAbfertigung._ShortDateNew = False - Me.txtAbf_ErsteAbfertigung._ShortDateOnly = True - Me.txtAbf_ErsteAbfertigung._TimeOnly = False - Me.txtAbf_ErsteAbfertigung._TimeOnly_Seconds = False - Me.txtAbf_ErsteAbfertigung._value = "" - Me.txtAbf_ErsteAbfertigung._Waehrung = False - Me.txtAbf_ErsteAbfertigung._WaehrungZeichen = True - Me.txtAbf_ErsteAbfertigung.BackColor = System.Drawing.Color.White - Me.txtAbf_ErsteAbfertigung.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.txtAbf_ErsteAbfertigung.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtAbf_ErsteAbfertigung.ForeColor = System.Drawing.Color.Black - Me.txtAbf_ErsteAbfertigung.Location = New System.Drawing.Point(305, 195) - Me.txtAbf_ErsteAbfertigung.MaxLength = 10 - Me.txtAbf_ErsteAbfertigung.MaxLineLength = -1 - Me.txtAbf_ErsteAbfertigung.MaxLines_Warning = "" - Me.txtAbf_ErsteAbfertigung.MaxLines_Warning_Label = Nothing - Me.txtAbf_ErsteAbfertigung.Name = "txtAbf_ErsteAbfertigung" - Me.txtAbf_ErsteAbfertigung.ReadOnly = True - Me.txtAbf_ErsteAbfertigung.Size = New System.Drawing.Size(115, 13) - Me.txtAbf_ErsteAbfertigung.TabIndex = 14 - Me.txtAbf_ErsteAbfertigung.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - Me.txtAbf_ErsteAbfertigung.Visible = False - ' - 'FlatButton2 - ' - Me.FlatButton2.allowBorder = False - Me.FlatButton2.BackgroundImage = Global.SDL.My.Resources.Resources.pdf - Me.FlatButton2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.FlatButton2.FlatAppearance.BorderSize = 0 - Me.FlatButton2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.FlatButton2.ForeColor = System.Drawing.Color.Black - Me.FlatButton2.Location = New System.Drawing.Point(222, 6) - Me.FlatButton2.Name = "FlatButton2" - Me.FlatButton2.Size = New System.Drawing.Size(15, 12) - Me.FlatButton2.TabIndex = 11 - Me.FlatButton2.UseVisualStyleBackColor = True - ' - 'FlatButton6 - ' - Me.FlatButton6.allowBorder = False - Me.FlatButton6.BackgroundImage = Global.SDL.My.Resources.Resources.list - Me.FlatButton6.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.FlatButton6.FlatAppearance.BorderSize = 0 - Me.FlatButton6.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.FlatButton6.ForeColor = System.Drawing.Color.Black - Me.FlatButton6.Location = New System.Drawing.Point(202, 7) - Me.FlatButton6.Name = "FlatButton6" - Me.FlatButton6.Size = New System.Drawing.Size(15, 12) - Me.FlatButton6.TabIndex = 9 - Me.FlatButton6.UseVisualStyleBackColor = True - ' - 'btnBonitaetBearbeiten - ' - Me.btnBonitaetBearbeiten.allowBorder = False - Me.btnBonitaetBearbeiten.BackgroundImage = Global.SDL.My.Resources.Resources.plus - Me.btnBonitaetBearbeiten.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.btnBonitaetBearbeiten.FlatAppearance.BorderSize = 0 - Me.btnBonitaetBearbeiten.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnBonitaetBearbeiten.ForeColor = System.Drawing.Color.Black - Me.btnBonitaetBearbeiten.Location = New System.Drawing.Point(183, 6) - Me.btnBonitaetBearbeiten.Name = "btnBonitaetBearbeiten" - Me.btnBonitaetBearbeiten.Size = New System.Drawing.Size(15, 12) - Me.btnBonitaetBearbeiten.TabIndex = 8 - Me.btnBonitaetBearbeiten.UseVisualStyleBackColor = True - Me.btnBonitaetBearbeiten.Visible = False - ' - 'lblHoechstkredit - ' - Me.lblHoechstkredit._DateTimeOnly = False - Me.lblHoechstkredit._numbersOnly = True - Me.lblHoechstkredit._numbersOnlyKommastellen = "" - Me.lblHoechstkredit._numbersOnlyTrennzeichen = True - Me.lblHoechstkredit._Prozent = False - Me.lblHoechstkredit._ShortDateNew = False - Me.lblHoechstkredit._ShortDateOnly = False - Me.lblHoechstkredit._TimeOnly = False - Me.lblHoechstkredit._TimeOnly_Seconds = False - Me.lblHoechstkredit._value = "" - Me.lblHoechstkredit._Waehrung = True - Me.lblHoechstkredit._WaehrungZeichen = True - Me.lblHoechstkredit.BackColor = System.Drawing.Color.WhiteSmoke - Me.lblHoechstkredit.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.lblHoechstkredit.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblHoechstkredit.ForeColor = System.Drawing.Color.Black - Me.lblHoechstkredit.Location = New System.Drawing.Point(310, 5) - Me.lblHoechstkredit.MaxLineLength = -1 - Me.lblHoechstkredit.MaxLines_Warning = "" - Me.lblHoechstkredit.MaxLines_Warning_Label = Nothing - Me.lblHoechstkredit.Name = "lblHoechstkredit" - Me.lblHoechstkredit.ReadOnly = True - Me.lblHoechstkredit.Size = New System.Drawing.Size(96, 13) - Me.lblHoechstkredit.TabIndex = 7 - Me.lblHoechstkredit.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - Me.lblHoechstkredit.Visible = False - ' - 'lblBonitaet - ' - Me.lblBonitaet._DateTimeOnly = False - Me.lblBonitaet._numbersOnly = False - Me.lblBonitaet._numbersOnlyKommastellen = "" - Me.lblBonitaet._numbersOnlyTrennzeichen = True - Me.lblBonitaet._Prozent = False - Me.lblBonitaet._ShortDateNew = False - Me.lblBonitaet._ShortDateOnly = False - Me.lblBonitaet._TimeOnly = False - Me.lblBonitaet._TimeOnly_Seconds = False - Me.lblBonitaet._value = Nothing - Me.lblBonitaet._Waehrung = False - Me.lblBonitaet._WaehrungZeichen = True - Me.lblBonitaet.BackColor = System.Drawing.Color.WhiteSmoke - Me.lblBonitaet.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.lblBonitaet.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblBonitaet.ForeColor = System.Drawing.Color.Black - Me.lblBonitaet.Location = New System.Drawing.Point(106, 6) - Me.lblBonitaet.MaxLineLength = -1 - Me.lblBonitaet.MaxLines_Warning = "" - Me.lblBonitaet.MaxLines_Warning_Label = Nothing - Me.lblBonitaet.Name = "lblBonitaet" - Me.lblBonitaet.ReadOnly = True - Me.lblBonitaet.Size = New System.Drawing.Size(32, 13) - Me.lblBonitaet.TabIndex = 1 - Me.lblBonitaet.TextAlign = System.Windows.Forms.HorizontalAlignment.Center - ' - 'lblBonitaetRisikostufe - ' - Me.lblBonitaetRisikostufe._DateTimeOnly = False - Me.lblBonitaetRisikostufe._numbersOnly = False - Me.lblBonitaetRisikostufe._numbersOnlyKommastellen = "" - Me.lblBonitaetRisikostufe._numbersOnlyTrennzeichen = True - Me.lblBonitaetRisikostufe._Prozent = False - Me.lblBonitaetRisikostufe._ShortDateNew = False - Me.lblBonitaetRisikostufe._ShortDateOnly = False - Me.lblBonitaetRisikostufe._TimeOnly = False - Me.lblBonitaetRisikostufe._TimeOnly_Seconds = False - Me.lblBonitaetRisikostufe._value = Nothing - Me.lblBonitaetRisikostufe._Waehrung = False - Me.lblBonitaetRisikostufe._WaehrungZeichen = True - Me.lblBonitaetRisikostufe.BackColor = System.Drawing.Color.WhiteSmoke - Me.lblBonitaetRisikostufe.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.lblBonitaetRisikostufe.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblBonitaetRisikostufe.ForeColor = System.Drawing.Color.Black - Me.lblBonitaetRisikostufe.Location = New System.Drawing.Point(145, 6) - Me.lblBonitaetRisikostufe.MaxLineLength = -1 - Me.lblBonitaetRisikostufe.MaxLines_Warning = "" - Me.lblBonitaetRisikostufe.MaxLines_Warning_Label = Nothing - Me.lblBonitaetRisikostufe.Name = "lblBonitaetRisikostufe" - Me.lblBonitaetRisikostufe.ReadOnly = True - Me.lblBonitaetRisikostufe.Size = New System.Drawing.Size(20, 13) - Me.lblBonitaetRisikostufe.TabIndex = 3 - Me.lblBonitaetRisikostufe.TextAlign = System.Windows.Forms.HorizontalAlignment.Center - ' - 'lblBonitaetsdatum - ' - Me.lblBonitaetsdatum._DateTimeOnly = False - Me.lblBonitaetsdatum._numbersOnly = False - Me.lblBonitaetsdatum._numbersOnlyKommastellen = "" - Me.lblBonitaetsdatum._numbersOnlyTrennzeichen = True - Me.lblBonitaetsdatum._Prozent = False - Me.lblBonitaetsdatum._ShortDateNew = False - Me.lblBonitaetsdatum._ShortDateOnly = False - Me.lblBonitaetsdatum._TimeOnly = False - Me.lblBonitaetsdatum._TimeOnly_Seconds = False - Me.lblBonitaetsdatum._value = Nothing - Me.lblBonitaetsdatum._Waehrung = False - Me.lblBonitaetsdatum._WaehrungZeichen = True - Me.lblBonitaetsdatum.BackColor = System.Drawing.Color.WhiteSmoke - Me.lblBonitaetsdatum.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.lblBonitaetsdatum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblBonitaetsdatum.ForeColor = System.Drawing.Color.Black - Me.lblBonitaetsdatum.Location = New System.Drawing.Point(447, 6) - Me.lblBonitaetsdatum.MaxLineLength = -1 - Me.lblBonitaetsdatum.MaxLines_Warning = "" - Me.lblBonitaetsdatum.MaxLines_Warning_Label = Nothing - Me.lblBonitaetsdatum.Name = "lblBonitaetsdatum" - Me.lblBonitaetsdatum.ReadOnly = True - Me.lblBonitaetsdatum.Size = New System.Drawing.Size(77, 13) - Me.lblBonitaetsdatum.TabIndex = 5 - ' - 'txtOPFaellig - ' - Me.txtOPFaellig._DateTimeOnly = False - Me.txtOPFaellig._numbersOnly = False - Me.txtOPFaellig._numbersOnlyKommastellen = "" - Me.txtOPFaellig._numbersOnlyTrennzeichen = True - Me.txtOPFaellig._Prozent = False - Me.txtOPFaellig._ShortDateNew = False - Me.txtOPFaellig._ShortDateOnly = False - Me.txtOPFaellig._TimeOnly = False - Me.txtOPFaellig._TimeOnly_Seconds = False - Me.txtOPFaellig._value = Nothing - Me.txtOPFaellig._Waehrung = False - Me.txtOPFaellig._WaehrungZeichen = True - Me.txtOPFaellig.BackColor = System.Drawing.Color.AntiqueWhite - Me.txtOPFaellig.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.txtOPFaellig.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtOPFaellig.ForeColor = System.Drawing.Color.Black - Me.txtOPFaellig.Location = New System.Drawing.Point(114, 6) - Me.txtOPFaellig.MaxLineLength = -1 - Me.txtOPFaellig.MaxLines_Warning = "" - Me.txtOPFaellig.MaxLines_Warning_Label = Nothing - Me.txtOPFaellig.Name = "txtOPFaellig" - Me.txtOPFaellig.ReadOnly = True - Me.txtOPFaellig.Size = New System.Drawing.Size(108, 13) - Me.txtOPFaellig.TabIndex = 30 - Me.txtOPFaellig.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' - 'txtOffenePosten - ' - Me.txtOffenePosten._DateTimeOnly = False - Me.txtOffenePosten._numbersOnly = False - Me.txtOffenePosten._numbersOnlyKommastellen = "" - Me.txtOffenePosten._numbersOnlyTrennzeichen = True - Me.txtOffenePosten._Prozent = False - Me.txtOffenePosten._ShortDateNew = False - Me.txtOffenePosten._ShortDateOnly = False - Me.txtOffenePosten._TimeOnly = False - Me.txtOffenePosten._TimeOnly_Seconds = False - Me.txtOffenePosten._value = Nothing - Me.txtOffenePosten._Waehrung = False - Me.txtOffenePosten._WaehrungZeichen = True - Me.txtOffenePosten.BackColor = System.Drawing.Color.AntiqueWhite - Me.txtOffenePosten.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.txtOffenePosten.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtOffenePosten.ForeColor = System.Drawing.Color.Black - Me.txtOffenePosten.Location = New System.Drawing.Point(114, 66) - Me.txtOffenePosten.MaxLineLength = -1 - Me.txtOffenePosten.MaxLines_Warning = "" - Me.txtOffenePosten.MaxLines_Warning_Label = Nothing - Me.txtOffenePosten.Name = "txtOffenePosten" - Me.txtOffenePosten.ReadOnly = True - Me.txtOffenePosten.Size = New System.Drawing.Size(108, 13) - Me.txtOffenePosten.TabIndex = 28 - Me.txtOffenePosten.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' - 'txtOPCredit - ' - Me.txtOPCredit._DateTimeOnly = False - Me.txtOPCredit._numbersOnly = False - Me.txtOPCredit._numbersOnlyKommastellen = "" - Me.txtOPCredit._numbersOnlyTrennzeichen = True - Me.txtOPCredit._Prozent = False - Me.txtOPCredit._ShortDateNew = False - Me.txtOPCredit._ShortDateOnly = False - Me.txtOPCredit._TimeOnly = False - Me.txtOPCredit._TimeOnly_Seconds = False - Me.txtOPCredit._value = Nothing - Me.txtOPCredit._Waehrung = False - Me.txtOPCredit._WaehrungZeichen = True - Me.txtOPCredit.BackColor = System.Drawing.Color.AntiqueWhite - Me.txtOPCredit.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.txtOPCredit.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtOPCredit.ForeColor = System.Drawing.Color.Green - Me.txtOPCredit.Location = New System.Drawing.Point(114, 46) - Me.txtOPCredit.MaxLineLength = -1 - Me.txtOPCredit.MaxLines_Warning = "" - Me.txtOPCredit.MaxLines_Warning_Label = Nothing - Me.txtOPCredit.Name = "txtOPCredit" - Me.txtOPCredit.ReadOnly = True - Me.txtOPCredit.Size = New System.Drawing.Size(108, 13) - Me.txtOPCredit.TabIndex = 41 - Me.txtOPCredit.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' - 'txtOPNichtFaellig - ' - Me.txtOPNichtFaellig._DateTimeOnly = False - Me.txtOPNichtFaellig._numbersOnly = False - Me.txtOPNichtFaellig._numbersOnlyKommastellen = "" - Me.txtOPNichtFaellig._numbersOnlyTrennzeichen = True - Me.txtOPNichtFaellig._Prozent = False - Me.txtOPNichtFaellig._ShortDateNew = False - Me.txtOPNichtFaellig._ShortDateOnly = False - Me.txtOPNichtFaellig._TimeOnly = False - Me.txtOPNichtFaellig._TimeOnly_Seconds = False - Me.txtOPNichtFaellig._value = Nothing - Me.txtOPNichtFaellig._Waehrung = False - Me.txtOPNichtFaellig._WaehrungZeichen = True - Me.txtOPNichtFaellig.BackColor = System.Drawing.Color.AntiqueWhite - Me.txtOPNichtFaellig.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.txtOPNichtFaellig.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtOPNichtFaellig.ForeColor = System.Drawing.Color.Black - Me.txtOPNichtFaellig.Location = New System.Drawing.Point(114, 25) - Me.txtOPNichtFaellig.MaxLineLength = -1 - Me.txtOPNichtFaellig.MaxLines_Warning = "" - Me.txtOPNichtFaellig.MaxLines_Warning_Label = Nothing - Me.txtOPNichtFaellig.Name = "txtOPNichtFaellig" - Me.txtOPNichtFaellig.ReadOnly = True - Me.txtOPNichtFaellig.Size = New System.Drawing.Size(108, 13) - Me.txtOPNichtFaellig.TabIndex = 39 - Me.txtOPNichtFaellig.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' - 'txtOVK - ' - Me.txtOVK._DateTimeOnly = False - Me.txtOVK._numbersOnly = False - Me.txtOVK._numbersOnlyKommastellen = "" - Me.txtOVK._numbersOnlyTrennzeichen = True - Me.txtOVK._Prozent = False - Me.txtOVK._ShortDateNew = False - Me.txtOVK._ShortDateOnly = False - Me.txtOVK._TimeOnly = False - Me.txtOVK._TimeOnly_Seconds = False - Me.txtOVK._value = Nothing - Me.txtOVK._Waehrung = False - Me.txtOVK._WaehrungZeichen = True - Me.txtOVK.BackColor = System.Drawing.Color.AntiqueWhite - Me.txtOVK.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.txtOVK.Cursor = System.Windows.Forms.Cursors.Hand - Me.txtOVK.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtOVK.ForeColor = System.Drawing.Color.Green - Me.txtOVK.Location = New System.Drawing.Point(134, 4) - Me.txtOVK.MaxLineLength = -1 - Me.txtOVK.MaxLines_Warning = "" - Me.txtOVK.MaxLines_Warning_Label = Nothing - Me.txtOVK.Name = "txtOVK" - Me.txtOVK.ReadOnly = True - Me.txtOVK.Size = New System.Drawing.Size(108, 13) - Me.txtOVK.TabIndex = 44 - Me.txtOVK.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' - 'lblKreditlimit - ' - Me.lblKreditlimit._DateTimeOnly = False - Me.lblKreditlimit._numbersOnly = False - Me.lblKreditlimit._numbersOnlyKommastellen = "" - Me.lblKreditlimit._numbersOnlyTrennzeichen = True - Me.lblKreditlimit._Prozent = False - Me.lblKreditlimit._ShortDateNew = False - Me.lblKreditlimit._ShortDateOnly = False - Me.lblKreditlimit._TimeOnly = False - Me.lblKreditlimit._TimeOnly_Seconds = False - Me.lblKreditlimit._value = Nothing - Me.lblKreditlimit._Waehrung = False - Me.lblKreditlimit._WaehrungZeichen = True - Me.lblKreditlimit.BackColor = System.Drawing.Color.AntiqueWhite - Me.lblKreditlimit.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.lblKreditlimit.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblKreditlimit.ForeColor = System.Drawing.Color.Black - Me.lblKreditlimit.Location = New System.Drawing.Point(134, 24) - Me.lblKreditlimit.MaxLineLength = -1 - Me.lblKreditlimit.MaxLines_Warning = "" - Me.lblKreditlimit.MaxLines_Warning_Label = Nothing - Me.lblKreditlimit.Name = "lblKreditlimit" - Me.lblKreditlimit.ReadOnly = True - Me.lblKreditlimit.Size = New System.Drawing.Size(108, 13) - Me.lblKreditlimit.TabIndex = 20 - Me.lblKreditlimit.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' - 'txtZahlungsziel - ' - Me.txtZahlungsziel._DateTimeOnly = False - Me.txtZahlungsziel._numbersOnly = False - Me.txtZahlungsziel._numbersOnlyKommastellen = "" - Me.txtZahlungsziel._numbersOnlyTrennzeichen = True - Me.txtZahlungsziel._Prozent = False - Me.txtZahlungsziel._ShortDateNew = False - Me.txtZahlungsziel._ShortDateOnly = False - Me.txtZahlungsziel._TimeOnly = False - Me.txtZahlungsziel._TimeOnly_Seconds = False - Me.txtZahlungsziel._value = Nothing - Me.txtZahlungsziel._Waehrung = False - Me.txtZahlungsziel._WaehrungZeichen = True - Me.txtZahlungsziel.BackColor = System.Drawing.Color.White - Me.txtZahlungsziel.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.txtZahlungsziel.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtZahlungsziel.ForeColor = System.Drawing.Color.Black - Me.txtZahlungsziel.Location = New System.Drawing.Point(310, 255) - Me.txtZahlungsziel.MaxLineLength = -1 - Me.txtZahlungsziel.MaxLines_Warning = "" - Me.txtZahlungsziel.MaxLines_Warning_Label = Nothing - Me.txtZahlungsziel.Name = "txtZahlungsziel" - Me.txtZahlungsziel.ReadOnly = True - Me.txtZahlungsziel.Size = New System.Drawing.Size(56, 13) - Me.txtZahlungsziel.TabIndex = 34 - Me.txtZahlungsziel.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' - 'btncheckliste - ' - Me.btncheckliste.allowBorder = False - Me.btncheckliste.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.btncheckliste.FlatAppearance.BorderSize = 0 - Me.btncheckliste.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btncheckliste.ForeColor = System.Drawing.Color.Black - Me.btncheckliste.Image = Global.SDL.My.Resources.Resources.checklist - Me.btncheckliste.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.btncheckliste.Location = New System.Drawing.Point(388, 107) - Me.btncheckliste.Name = "btncheckliste" - Me.btncheckliste.Size = New System.Drawing.Size(88, 53) - Me.btncheckliste.TabIndex = 9 - Me.btncheckliste.Tag = "" - Me.btncheckliste.Text = "Checkliste" - Me.btncheckliste.TextAlign = System.Drawing.ContentAlignment.BottomCenter - Me.btncheckliste.UseVisualStyleBackColor = True - ' - 'FlatButton1 - ' - Me.FlatButton1.allowBorder = False - Me.FlatButton1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.FlatButton1.FlatAppearance.BorderSize = 0 - Me.FlatButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.FlatButton1.ForeColor = System.Drawing.Color.Black - Me.FlatButton1.Image = Global.SDL.My.Resources.Resources.compose - Me.FlatButton1.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.FlatButton1.Location = New System.Drawing.Point(392, -3) - Me.FlatButton1.Name = "FlatButton1" - Me.FlatButton1.Size = New System.Drawing.Size(84, 68) - Me.FlatButton1.TabIndex = 4 - Me.FlatButton1.Tag = "" - Me.FlatButton1.Text = "Änderungen" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "bekanntgeben" - Me.FlatButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter - Me.FlatButton1.UseVisualStyleBackColor = True - Me.FlatButton1.Visible = False - ' - 'ucKundenKontakte - ' - Me.ucKundenKontakte.Dock = System.Windows.Forms.DockStyle.Fill - Me.ucKundenKontakte.Location = New System.Drawing.Point(3, 3) - Me.ucKundenKontakte.Name = "ucKundenKontakte" - Me.ucKundenKontakte.Size = New System.Drawing.Size(473, 158) - Me.ucKundenKontakte.TabIndex = 0 - ' - 'txtVertragVermerk - ' - Me.txtVertragVermerk._DateTimeOnly = False - Me.txtVertragVermerk._numbersOnly = False - Me.txtVertragVermerk._numbersOnlyKommastellen = "" - Me.txtVertragVermerk._numbersOnlyTrennzeichen = True - Me.txtVertragVermerk._Prozent = False - Me.txtVertragVermerk._ShortDateNew = False - Me.txtVertragVermerk._ShortDateOnly = False - Me.txtVertragVermerk._TimeOnly = False - Me.txtVertragVermerk._TimeOnly_Seconds = False - Me.txtVertragVermerk._value = "" - Me.txtVertragVermerk._Waehrung = False - Me.txtVertragVermerk._WaehrungZeichen = True - Me.txtVertragVermerk.ForeColor = System.Drawing.Color.Black - Me.txtVertragVermerk.Location = New System.Drawing.Point(60, 23) - Me.txtVertragVermerk.MaxLineLength = -1 - Me.txtVertragVermerk.MaxLines_Warning = "" - Me.txtVertragVermerk.MaxLines_Warning_Label = Nothing - Me.txtVertragVermerk.Name = "txtVertragVermerk" - Me.txtVertragVermerk.Size = New System.Drawing.Size(326, 20) - Me.txtVertragVermerk.TabIndex = 6 - ' - 'cboVertrag - ' - Me.cboVertrag._allowedValuesFreiText = Nothing - Me.cboVertrag._allowFreiText = False - Me.cboVertrag._value = "" - Me.cboVertrag.FormattingEnabled = True - Me.cboVertrag.Location = New System.Drawing.Point(60, 3) - Me.cboVertrag.Name = "cboVertrag" - Me.cboVertrag.Size = New System.Drawing.Size(178, 21) - Me.cboVertrag.TabIndex = 1 - ' - 'datVertrag - ' - Me.datVertrag._DateTimeOnly = False - Me.datVertrag._numbersOnly = False - Me.datVertrag._numbersOnlyKommastellen = "" - Me.datVertrag._numbersOnlyTrennzeichen = True - Me.datVertrag._Prozent = False - Me.datVertrag._ShortDateNew = True - Me.datVertrag._ShortDateOnly = False - Me.datVertrag._TimeOnly = False - Me.datVertrag._TimeOnly_Seconds = False - Me.datVertrag._value = "" - Me.datVertrag._Waehrung = False - Me.datVertrag._WaehrungZeichen = True - Me.datVertrag.ForeColor = System.Drawing.Color.Black - Me.datVertrag.Location = New System.Drawing.Point(291, 3) - Me.datVertrag.MaxLength = 10 - Me.datVertrag.MaxLineLength = -1 - Me.datVertrag.MaxLines_Warning = "" - Me.datVertrag.MaxLines_Warning_Label = Nothing - Me.datVertrag.Name = "datVertrag" - Me.datVertrag.Size = New System.Drawing.Size(95, 20) - Me.datVertrag.TabIndex = 3 - ' - 'txtGGDatum - ' - Me.txtGGDatum._DateTimeOnly = False - Me.txtGGDatum._numbersOnly = False - Me.txtGGDatum._numbersOnlyKommastellen = "" - Me.txtGGDatum._numbersOnlyTrennzeichen = True - Me.txtGGDatum._Prozent = False - Me.txtGGDatum._ShortDateNew = True - Me.txtGGDatum._ShortDateOnly = False - Me.txtGGDatum._TimeOnly = False - Me.txtGGDatum._TimeOnly_Seconds = False - Me.txtGGDatum._value = "" - Me.txtGGDatum._Waehrung = False - Me.txtGGDatum._WaehrungZeichen = True - Me.txtGGDatum.ForeColor = System.Drawing.Color.Black - Me.txtGGDatum.Location = New System.Drawing.Point(256, 7) - Me.txtGGDatum.MaxLength = 10 - Me.txtGGDatum.MaxLineLength = -1 - Me.txtGGDatum.MaxLines_Warning = "" - Me.txtGGDatum.MaxLines_Warning_Label = Nothing - Me.txtGGDatum.Name = "txtGGDatum" - Me.txtGGDatum.Size = New System.Drawing.Size(100, 20) - Me.txtGGDatum.TabIndex = 2 - ' - 'txtT1VerzollungsadresseBestimmungszollstelle - ' - Me.txtT1VerzollungsadresseBestimmungszollstelle._allowFreitext = False - Me.txtT1VerzollungsadresseBestimmungszollstelle._AllowSetValue = False - Me.txtT1VerzollungsadresseBestimmungszollstelle._allowSpaceAsSplitter = False - Me.txtT1VerzollungsadresseBestimmungszollstelle._autoSizeGross = False - Me.txtT1VerzollungsadresseBestimmungszollstelle._hideIfListEmpty = True - Me.txtT1VerzollungsadresseBestimmungszollstelle._value = Nothing - Me.txtT1VerzollungsadresseBestimmungszollstelle.conn_art = "FMZOLL" - Me.txtT1VerzollungsadresseBestimmungszollstelle.dgvpos = "LEFT" - Me.txtT1VerzollungsadresseBestimmungszollstelle.DISPLAY_PARAM = Nothing - Me.txtT1VerzollungsadresseBestimmungszollstelle.INVISIBLE_COLUMNS = Nothing - Me.txtT1VerzollungsadresseBestimmungszollstelle.key_visible = False - Me.txtT1VerzollungsadresseBestimmungszollstelle.KEYPARAM = Nothing - Me.txtT1VerzollungsadresseBestimmungszollstelle.Location = New System.Drawing.Point(87, 7) - Me.txtT1VerzollungsadresseBestimmungszollstelle.MaxLength = 8 - Me.txtT1VerzollungsadresseBestimmungszollstelle.Name = "txtT1VerzollungsadresseBestimmungszollstelle" - Me.txtT1VerzollungsadresseBestimmungszollstelle.searchActive = True - Me.txtT1VerzollungsadresseBestimmungszollstelle.Size = New System.Drawing.Size(163, 20) - Me.txtT1VerzollungsadresseBestimmungszollstelle.SQL_ORDER_BY = Nothing - Me.txtT1VerzollungsadresseBestimmungszollstelle.SQL_SELECT = Nothing - Me.txtT1VerzollungsadresseBestimmungszollstelle.SQL_WHERE = Nothing - Me.txtT1VerzollungsadresseBestimmungszollstelle.SQL_WhereParamList = Nothing - Me.txtT1VerzollungsadresseBestimmungszollstelle.TabIndex = 1 - Me.txtT1VerzollungsadresseBestimmungszollstelle.usrcntl = Nothing - ' - 'UsrCntlKundenAvisoMailBenachrichtigung1 - ' - Me.UsrCntlKundenAvisoMailBenachrichtigung1.AutoScroll = True - Me.UsrCntlKundenAvisoMailBenachrichtigung1.BackColor = System.Drawing.Color.White - Me.UsrCntlKundenAvisoMailBenachrichtigung1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlKundenAvisoMailBenachrichtigung1.Location = New System.Drawing.Point(3, 3) - Me.UsrCntlKundenAvisoMailBenachrichtigung1.Name = "UsrCntlKundenAvisoMailBenachrichtigung1" - Me.UsrCntlKundenAvisoMailBenachrichtigung1.Size = New System.Drawing.Size(473, 158) - Me.UsrCntlKundenAvisoMailBenachrichtigung1.TabIndex = 0 - ' - 'txtInfoKdAtrNr - ' - Me.txtInfoKdAtrNr._DateTimeOnly = False - Me.txtInfoKdAtrNr._numbersOnly = False - Me.txtInfoKdAtrNr._numbersOnlyKommastellen = "" - Me.txtInfoKdAtrNr._numbersOnlyTrennzeichen = True - Me.txtInfoKdAtrNr._Prozent = False - Me.txtInfoKdAtrNr._ShortDateNew = False - Me.txtInfoKdAtrNr._ShortDateOnly = False - Me.txtInfoKdAtrNr._TimeOnly = False - Me.txtInfoKdAtrNr._TimeOnly_Seconds = False - Me.txtInfoKdAtrNr._value = "" - Me.txtInfoKdAtrNr._Waehrung = False - Me.txtInfoKdAtrNr._WaehrungZeichen = True - Me.txtInfoKdAtrNr.Enabled = False - Me.txtInfoKdAtrNr.ForeColor = System.Drawing.Color.Black - Me.txtInfoKdAtrNr.Location = New System.Drawing.Point(266, 41) - Me.txtInfoKdAtrNr.MaxLineLength = -1 - Me.txtInfoKdAtrNr.MaxLines_Warning = "" - Me.txtInfoKdAtrNr.MaxLines_Warning_Label = Nothing - Me.txtInfoKdAtrNr.Name = "txtInfoKdAtrNr" - Me.txtInfoKdAtrNr.Size = New System.Drawing.Size(192, 20) - Me.txtInfoKdAtrNr.TabIndex = 6 - ' - 'txtFixeKdAtrNr - ' - Me.txtFixeKdAtrNr._DateTimeOnly = False - Me.txtFixeKdAtrNr._numbersOnly = False - Me.txtFixeKdAtrNr._numbersOnlyKommastellen = "" - Me.txtFixeKdAtrNr._numbersOnlyTrennzeichen = True - Me.txtFixeKdAtrNr._Prozent = False - Me.txtFixeKdAtrNr._ShortDateNew = False - Me.txtFixeKdAtrNr._ShortDateOnly = False - Me.txtFixeKdAtrNr._TimeOnly = False - Me.txtFixeKdAtrNr._TimeOnly_Seconds = False - Me.txtFixeKdAtrNr._value = "" - Me.txtFixeKdAtrNr._Waehrung = False - Me.txtFixeKdAtrNr._WaehrungZeichen = True - Me.txtFixeKdAtrNr.Enabled = False - Me.txtFixeKdAtrNr.ForeColor = System.Drawing.Color.Black - Me.txtFixeKdAtrNr.Location = New System.Drawing.Point(309, 22) - Me.txtFixeKdAtrNr.MaxLineLength = -1 - Me.txtFixeKdAtrNr.MaxLines_Warning = "" - Me.txtFixeKdAtrNr.MaxLines_Warning_Label = Nothing - Me.txtFixeKdAtrNr.Name = "txtFixeKdAtrNr" - Me.txtFixeKdAtrNr.Size = New System.Drawing.Size(149, 20) - Me.txtFixeKdAtrNr.TabIndex = 4 - ' - 'FlatButton4 - ' - Me.FlatButton4.allowBorder = False - Me.FlatButton4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.FlatButton4.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.FlatButton4.ForeColor = System.Drawing.Color.Black - Me.FlatButton4.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.FlatButton4.Location = New System.Drawing.Point(365, 134) - Me.FlatButton4.Name = "FlatButton4" - Me.FlatButton4.Size = New System.Drawing.Size(92, 26) - Me.FlatButton4.TabIndex = 9 - Me.FlatButton4.Tag = "" - Me.FlatButton4.Text = "Speichern" - Me.FlatButton4.UseVisualStyleBackColor = True - ' - 'dgvAufschub - ' - Me.dgvAufschub.AKTUALISIERUNGS_INTERVALL = -1 - Me.dgvAufschub.AllowUserToAddRows = False - Me.dgvAufschub.AllowUserToDeleteRows = False - Me.dgvAufschub.AllowUserToResizeColumns = False - Me.dgvAufschub.AllowUserToResizeRows = False - Me.dgvAufschub.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvAufschub.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle10 - Me.dgvAufschub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvAufschub.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.KtoId, Me.Art, Me.HZA, Me.KontoNr, Me.EORI, Me.NL, Me.BIN}) - DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvAufschub.DefaultCellStyle = DataGridViewCellStyle12 - Me.dgvAufschub.Location = New System.Drawing.Point(13, 61) - Me.dgvAufschub.MultiSelect = False - Me.dgvAufschub.Name = "dgvAufschub" - Me.dgvAufschub.ReadOnly = True - Me.dgvAufschub.RowHeadersVisible = False - Me.dgvAufschub.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvAufschub.Size = New System.Drawing.Size(473, 75) - Me.dgvAufschub.TabIndex = 11 - Me.dgvAufschub.TabStop = False - ' - 'KtoId - ' - Me.KtoId.HeaderText = "Id" - Me.KtoId.Name = "KtoId" - Me.KtoId.ReadOnly = True - Me.KtoId.Visible = False - ' - 'Art - ' - Me.Art.HeaderText = "Aufschub" - Me.Art.Name = "Art" - Me.Art.ReadOnly = True - Me.Art.Width = 120 - ' - 'HZA - ' - DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - Me.HZA.DefaultCellStyle = DataGridViewCellStyle11 - Me.HZA.HeaderText = "HZA" - Me.HZA.Name = "HZA" - Me.HZA.ReadOnly = True - Me.HZA.Width = 35 - ' - 'KontoNr - ' - Me.KontoNr.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None - Me.KontoNr.HeaderText = "Konto Nr." - Me.KontoNr.Name = "KontoNr" - Me.KontoNr.ReadOnly = True - Me.KontoNr.Resizable = System.Windows.Forms.DataGridViewTriState.[True] - ' - 'EORI - ' - Me.EORI.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - Me.EORI.HeaderText = "EORI" - Me.EORI.Name = "EORI" - Me.EORI.ReadOnly = True - ' - 'NL - ' - Me.NL.HeaderText = "NL" - Me.NL.Name = "NL" - Me.NL.ReadOnly = True - Me.NL.Width = 60 - ' - 'BIN - ' - Me.BIN.HeaderText = "BIN" - Me.BIN.Name = "BIN" - Me.BIN.ReadOnly = True - Me.BIN.Visible = False - ' 'SessionService1 ' Me.SessionService1.Credentials = Nothing @@ -3447,6 +3462,7 @@ Partial Class usrCntlKundenuebersicht Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White + Me.Controls.Add(Me.lblInsolvent) Me.Controls.Add(Me.btnOP) Me.Controls.Add(Me.btnReloadOP) Me.Controls.Add(Me.lblFirma) @@ -3526,12 +3542,12 @@ Partial Class usrCntlKundenuebersicht Me.tbKdSpez.PerformLayout() Me.tbSonstiges.ResumeLayout(False) Me.tbSonstiges.PerformLayout() + CType(Me.dgvAufschub, System.ComponentModel.ISupportInitialize).EndInit() Me.ContextMenuStrip1.ResumeLayout(False) Me.ContextMenuStrip3.ResumeLayout(False) Me.ContextMenuStrip2.ResumeLayout(False) Me.ContextMenuStrip4.ResumeLayout(False) Me.ContextMenuStrip5.ResumeLayout(False) - CType(Me.dgvAufschub, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -3764,4 +3780,5 @@ Partial Class usrCntlKundenuebersicht Friend WithEvents NL As DataGridViewTextBoxColumn Friend WithEvents BIN As DataGridViewTextBoxColumn Friend WithEvents pbCreditsafeChanges As PictureBox + Friend WithEvents lblInsolvent As Label End Class diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index e1273e87..66b8777e 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -518,6 +518,8 @@ Public Class usrCntlKundenuebersicht ' TMPText = TMPText.Replace("/", "" & vbNewLine) rtbAbf_Besonderheiten.Text = TMPText + initInsolvent(KUNDE_ERW.kde_CSinsolventAm) + ' lblKreditlimit.BackColor = Color.White lblKreditlimit.Text = checkNullNbr(KUNDE.Kreditlimit).ToString("C", CultureInfo.CurrentCulture) If KUNDE.Kreditlimit <> 0 And KUNDE.Kreditlimit <> 2600 Then @@ -714,6 +716,21 @@ Public Class usrCntlKundenuebersicht End If End Sub + Sub initInsolvent(insolvent) + If insolvent IsNot Nothing Then + 'Me.BackColor = Color.Red + lblInsolvent.Visible = True + lblInsolvent.Text = "KUNDE INSOLVENT " & IIf(IsDate(insolvent), " SEIT " & CDate(insolvent).ToShortDateString, "") + rtbInfo.Visible = True + 'lblTARIFE.ForeColor = Color.White + Else + 'Me.BackColor = Color.White + lblInsolvent.Visible = False + rtbInfo.Visible = False + 'lblTARIFE.ForeColor = Color.FromArgb(0, 54, 128) + End If + End Sub + Sub showForm(t As String, Optional h As String = "") Dim f As New Form @@ -2857,37 +2874,37 @@ Public Class usrCntlKundenuebersicht If lastChecked = Today Then - Dim bonaus = VERAG_PROG_ALLGEMEIN.cBonitaetsauskunft.LOADByKdNrDate(kdNr, Today) - If bonaus IsNot Nothing Then - If bonaus.ba_Pruefungstool = "creditsafe API" AndAlso bonaus.ba_datenarchivId > -1 Then - MsgBox("Heute wurde bereits eine erfolgreiche Abfrage durchgeführt" & vbNewLine & "Vorgang wird abgebrochen!") - Cursor = Cursors.Default - btnCreditsafe.Enabled = True - Exit Sub - End If + Dim bonaus = VERAG_PROG_ALLGEMEIN.cBonitaetsauskunft.LOADByKdNrDate(kdNr, Today) + If bonaus IsNot Nothing Then + If bonaus.ba_Pruefungstool = "creditsafe API" AndAlso bonaus.ba_datenarchivId > -1 Then + MsgBox("Heute wurde bereits eine erfolgreiche Abfrage durchgeführt" & vbNewLine & "Vorgang wird abgebrochen!") + Cursor = Cursors.Default + btnCreditsafe.Enabled = True + Exit Sub End If End If + End If - If cs.checkDateOfLastRequest(company) < lastChecked Then - Dim a As MsgBoxResult = MsgBox("Seit der letzen Abfrage (" & lastChecked.ToShortDateString & ") wurde bei Creditsafe keine Änderung gemacht!" & vbNewLine & "Trotzdem Creditreport-Daten aktualisieren?", vbYesNo) - If a = vbYes Then + If cs.checkDateOfLastRequest(company) < lastChecked Then + Dim a As MsgBoxResult = MsgBox("Seit der letzen Abfrage (" & lastChecked.ToShortDateString & ") wurde bei Creditsafe keine Änderung gemacht!" & vbNewLine & "Trotzdem Creditreport-Daten aktualisieren?", vbYesNo) + If a = vbYes Then - setCreditsafereportEntry(cs, company, True) 'doppelte Abfragen mitprotokollieren - - End If - - Else - setCreditsafereportEntry(cs, company) + setCreditsafereportEntry(cs, company, True) 'doppelte Abfragen mitprotokollieren End If + Else - setCreditsafereportEntry(cs, company) + End If + Else + + setCreditsafereportEntry(cs, company) + End If @@ -3369,7 +3386,7 @@ Public Class usrCntlKundenuebersicht If currentBonID > 0 Then company.csBonID = currentBonID Dim dt As New DataTable() - If cs.getCompanyEvents(company, dt, checklastDate, True) = "Error" Then + If cs.getCompanyEvents(company, dt, True, 0, checklastDate, True) = "Error" Then Exit Sub End If diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb index 6dcd6952..b9854ee8 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb @@ -23,31 +23,31 @@ Partial Class usrcntlKundeBearbeitenFull Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle32 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle33 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle34 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle35 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle36 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle37 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle38 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle39 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle40 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle41 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle42 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle43 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle44 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle31 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle45 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle46 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle47 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle48 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle49 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle50 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.tbcntrDetails = New System.Windows.Forms.TabControl() Me.tbAbfertigung = New System.Windows.Forms.TabPage() Me.cbxVerzolltBeiExport = New System.Windows.Forms.CheckBox() @@ -265,6 +265,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtUSt_GVAusgestelltAm = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtUSt_GVAngefordertAm = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.tbSonstiges = New System.Windows.Forms.TabPage() + Me.cbxCS_Added = New System.Windows.Forms.CheckBox() Me.Label113 = New System.Windows.Forms.Label() Me.Label112 = New System.Windows.Forms.Label() Me.dgvIDS_Rabatte = New System.Windows.Forms.DataGridView() @@ -405,7 +406,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cboAuswahl = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.cbxCS_Added = New System.Windows.Forms.CheckBox() + Me.cbxCSInsolvent = New System.Windows.Forms.CheckBox() Me.tbcntrDetails.SuspendLayout() Me.tbAbfertigung.SuspendLayout() Me.tbcntrAbf.SuspendLayout() @@ -3110,8 +3111,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvUmsatzbericht.AllowUserToDeleteRows = False Me.dgvUmsatzbericht.AllowUserToOrderColumns = True Me.dgvUmsatzbericht.AllowUserToResizeRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle32.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle32 Me.dgvUmsatzbericht.BackgroundColor = System.Drawing.Color.White Me.dgvUmsatzbericht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvUmsatzbericht.Location = New System.Drawing.Point(6, 25) @@ -3210,8 +3211,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvOffenePosten.AllowUserToDeleteRows = False Me.dgvOffenePosten.AllowUserToOrderColumns = True Me.dgvOffenePosten.AllowUserToResizeRows = False - DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle33.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle33 Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvOffenePosten.Location = New System.Drawing.Point(6, 38) @@ -3372,41 +3373,41 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvKreditkarten.AllowUserToDeleteRows = False Me.dgvKreditkarten.AllowUserToOrderColumns = True Me.dgvKreditkarten.AllowUserToResizeRows = False - DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle34.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle34 Me.dgvKreditkarten.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle35.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle35.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle35.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle35.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle35.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle35 Me.dgvKreditkarten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle5 + DataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle36.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle36.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle36.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle36.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle36 Me.dgvKreditkarten.Location = New System.Drawing.Point(9, 20) Me.dgvKreditkarten.MultiSelect = False Me.dgvKreditkarten.Name = "dgvKreditkarten" Me.dgvKreditkarten.ReadOnly = True - DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle6 + DataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle37.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle37.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle37.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle37.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle37.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle37.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle37 Me.dgvKreditkarten.RowHeadersVisible = False - DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle7 + DataGridViewCellStyle38.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle38 Me.dgvKreditkarten.RowTemplate.DefaultCellStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.dgvKreditkarten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvKreditkarten.Size = New System.Drawing.Size(642, 312) @@ -3486,26 +3487,26 @@ Partial Class usrcntlKundeBearbeitenFull ' 'dgvMWST ' - DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvMWST.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8 + DataGridViewCellStyle39.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvMWST.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle39 Me.dgvMWST.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvMWST.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle9 + DataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle40.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle40.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle40.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle40.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle40.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle40.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvMWST.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle40 Me.dgvMWST.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvMWST.DefaultCellStyle = DataGridViewCellStyle10 + DataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle41.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle41.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle41.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle41.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle41.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle41.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvMWST.DefaultCellStyle = DataGridViewCellStyle41 Me.dgvMWST.Location = New System.Drawing.Point(9, 359) Me.dgvMWST.Name = "dgvMWST" Me.dgvMWST.Size = New System.Drawing.Size(171, 125) @@ -3590,26 +3591,26 @@ Partial Class usrcntlKundeBearbeitenFull ' 'dgvUstv_LaenderUndSteuernummern ' - DataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11 + DataGridViewCellStyle42.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle42 Me.dgvUstv_LaenderUndSteuernummern.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle12 + DataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle43.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle43.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle43.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle43.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle43.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle43.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle43 Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvUstv_LaenderUndSteuernummern.DefaultCellStyle = DataGridViewCellStyle13 + DataGridViewCellStyle44.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle44.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle44.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle44.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle44.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle44.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle44.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvUstv_LaenderUndSteuernummern.DefaultCellStyle = DataGridViewCellStyle44 Me.dgvUstv_LaenderUndSteuernummern.Location = New System.Drawing.Point(9, 94) Me.dgvUstv_LaenderUndSteuernummern.Name = "dgvUstv_LaenderUndSteuernummern" Me.dgvUstv_LaenderUndSteuernummern.Size = New System.Drawing.Size(657, 259) @@ -3745,6 +3746,7 @@ Partial Class usrcntlKundeBearbeitenFull ' 'tbSonstiges ' + Me.tbSonstiges.Controls.Add(Me.cbxCSInsolvent) Me.tbSonstiges.Controls.Add(Me.cbxCS_Added) Me.tbSonstiges.Controls.Add(Me.Label113) Me.tbSonstiges.Controls.Add(Me.Label112) @@ -3791,6 +3793,15 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbSonstiges.Text = "Sonstiges" Me.tbSonstiges.UseVisualStyleBackColor = True ' + 'cbxCS_Added + ' + Me.cbxCS_Added.AutoSize = True + Me.cbxCS_Added.Location = New System.Drawing.Point(406, 9) + Me.cbxCS_Added.Name = "cbxCS_Added" + Me.cbxCS_Added.Size = New System.Drawing.Size(15, 14) + Me.cbxCS_Added.TabIndex = 37 + Me.cbxCS_Added.UseVisualStyleBackColor = True + ' 'Label113 ' Me.Label113.AutoSize = True @@ -3807,7 +3818,7 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.Label112.AutoSize = True Me.Label112.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label112.Location = New System.Drawing.Point(425, 92) + Me.Label112.Location = New System.Drawing.Point(425, 119) Me.Label112.Name = "Label112" Me.Label112.Size = New System.Drawing.Size(119, 13) Me.Label112.TabIndex = 35 @@ -3818,26 +3829,26 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvIDS_Rabatte.AllowUserToAddRows = False Me.dgvIDS_Rabatte.AllowUserToDeleteRows = False Me.dgvIDS_Rabatte.AllowUserToResizeRows = False - DataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvIDS_Rabatte.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14 + DataGridViewCellStyle26.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvIDS_Rabatte.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle26 Me.dgvIDS_Rabatte.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvIDS_Rabatte.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle15 + DataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvIDS_Rabatte.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle27 Me.dgvIDS_Rabatte.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvIDS_Rabatte.DefaultCellStyle = DataGridViewCellStyle16 + DataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle28.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvIDS_Rabatte.DefaultCellStyle = DataGridViewCellStyle28 Me.dgvIDS_Rabatte.Location = New System.Drawing.Point(9, 317) Me.dgvIDS_Rabatte.MultiSelect = False Me.dgvIDS_Rabatte.Name = "dgvIDS_Rabatte" @@ -3925,7 +3936,7 @@ Partial Class usrcntlKundeBearbeitenFull ' 'txtSonst_KdNrTOBB ' - Me.txtSonst_KdNrTOBB.Location = New System.Drawing.Point(540, 50) + Me.txtSonst_KdNrTOBB.Location = New System.Drawing.Point(540, 71) Me.txtSonst_KdNrTOBB.MaxLength = 20 Me.txtSonst_KdNrTOBB.Name = "txtSonst_KdNrTOBB" Me.txtSonst_KdNrTOBB.Size = New System.Drawing.Size(122, 20) @@ -3937,7 +3948,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.Label96.AutoSize = True Me.Label96.Enabled = False Me.Label96.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label96.Location = New System.Drawing.Point(427, 53) + Me.Label96.Location = New System.Drawing.Point(427, 74) Me.Label96.Name = "Label96" Me.Label96.Size = New System.Drawing.Size(83, 13) Me.Label96.TabIndex = 21 @@ -3978,26 +3989,26 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvSonst_IDSKunden.AllowUserToAddRows = False Me.dgvSonst_IDSKunden.AllowUserToDeleteRows = False Me.dgvSonst_IDSKunden.AllowUserToResizeRows = False - DataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17 + DataGridViewCellStyle29.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle29 Me.dgvSonst_IDSKunden.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSonst_IDSKunden.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle18 + DataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle30.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle30.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle30.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle30.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle30.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSonst_IDSKunden.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle30 Me.dgvSonst_IDSKunden.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvSonst_IDSKunden.DefaultCellStyle = DataGridViewCellStyle19 + DataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle31.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle31.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle31.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle31.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvSonst_IDSKunden.DefaultCellStyle = DataGridViewCellStyle31 Me.dgvSonst_IDSKunden.Location = New System.Drawing.Point(9, 214) Me.dgvSonst_IDSKunden.MultiSelect = False Me.dgvSonst_IDSKunden.Name = "dgvSonst_IDSKunden" @@ -4007,37 +4018,37 @@ Partial Class usrcntlKundeBearbeitenFull 'cbxSonst_CsvAsfinag ' Me.cbxSonst_CsvAsfinag.AutoSize = True - Me.cbxSonst_CsvAsfinag.Location = New System.Drawing.Point(428, 131) + Me.cbxSonst_CsvAsfinag.Location = New System.Drawing.Point(504, 165) Me.cbxSonst_CsvAsfinag.Name = "cbxSonst_CsvAsfinag" - Me.cbxSonst_CsvAsfinag.Size = New System.Drawing.Size(136, 17) + Me.cbxSonst_CsvAsfinag.Size = New System.Drawing.Size(62, 17) Me.cbxSonst_CsvAsfinag.TabIndex = 15 - Me.cbxSonst_CsvAsfinag.Text = "AT-Abrechnungsdaten " + Me.cbxSonst_CsvAsfinag.Text = "AT-Abr." Me.cbxSonst_CsvAsfinag.UseVisualStyleBackColor = True ' 'cbxSonst_CsvUTA ' Me.cbxSonst_CsvUTA.AutoSize = True - Me.cbxSonst_CsvUTA.Location = New System.Drawing.Point(428, 177) + Me.cbxSonst_CsvUTA.Location = New System.Drawing.Point(572, 165) Me.cbxSonst_CsvUTA.Name = "cbxSonst_CsvUTA" - Me.cbxSonst_CsvUTA.Size = New System.Drawing.Size(144, 17) + Me.cbxSonst_CsvUTA.Size = New System.Drawing.Size(73, 17) Me.cbxSonst_CsvUTA.TabIndex = 14 - Me.cbxSonst_CsvUTA.Text = "UTA-Abrechnungsdaten " + Me.cbxSonst_CsvUTA.Text = "UTA-Abr. " Me.cbxSonst_CsvUTA.UseVisualStyleBackColor = True ' 'cbxSonst_CsvMSE ' Me.cbxSonst_CsvMSE.AutoSize = True - Me.cbxSonst_CsvMSE.Location = New System.Drawing.Point(428, 154) + Me.cbxSonst_CsvMSE.Location = New System.Drawing.Point(428, 165) Me.cbxSonst_CsvMSE.Name = "cbxSonst_CsvMSE" - Me.cbxSonst_CsvMSE.Size = New System.Drawing.Size(142, 17) + Me.cbxSonst_CsvMSE.Size = New System.Drawing.Size(71, 17) Me.cbxSonst_CsvMSE.TabIndex = 9 - Me.cbxSonst_CsvMSE.Text = "MSE-Abrechnungsdaten" + Me.cbxSonst_CsvMSE.Text = "MSE-Abr." Me.cbxSonst_CsvMSE.UseVisualStyleBackColor = True ' 'cbxSonst_CsvMautbericht ' Me.cbxSonst_CsvMautbericht.AutoSize = True - Me.cbxSonst_CsvMautbericht.Location = New System.Drawing.Point(428, 111) + Me.cbxSonst_CsvMautbericht.Location = New System.Drawing.Point(428, 141) Me.cbxSonst_CsvMautbericht.Name = "cbxSonst_CsvMautbericht" Me.cbxSonst_CsvMautbericht.Size = New System.Drawing.Size(82, 17) Me.cbxSonst_CsvMautbericht.TabIndex = 2 @@ -4063,7 +4074,7 @@ Partial Class usrcntlKundeBearbeitenFull ' 'txtSonst_KdNrTelepass ' - Me.txtSonst_KdNrTelepass.Location = New System.Drawing.Point(540, 73) + Me.txtSonst_KdNrTelepass.Location = New System.Drawing.Point(540, 94) Me.txtSonst_KdNrTelepass.Name = "txtSonst_KdNrTelepass" Me.txtSonst_KdNrTelepass.Size = New System.Drawing.Size(122, 20) Me.txtSonst_KdNrTelepass.TabIndex = 11 @@ -4072,7 +4083,7 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.Label74.AutoSize = True Me.Label74.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label74.Location = New System.Drawing.Point(425, 76) + Me.Label74.Location = New System.Drawing.Point(425, 97) Me.Label74.Name = "Label74" Me.Label74.Size = New System.Drawing.Size(109, 13) Me.Label74.TabIndex = 10 @@ -4115,7 +4126,7 @@ Partial Class usrcntlKundeBearbeitenFull 'txtSonst_KdNrIDS ' Me.txtSonst_KdNrIDS.Enabled = False - Me.txtSonst_KdNrIDS.Location = New System.Drawing.Point(540, 28) + Me.txtSonst_KdNrIDS.Location = New System.Drawing.Point(540, 49) Me.txtSonst_KdNrIDS.Name = "txtSonst_KdNrIDS" Me.txtSonst_KdNrIDS.Size = New System.Drawing.Size(122, 20) Me.txtSonst_KdNrIDS.TabIndex = 4 @@ -4126,7 +4137,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.Label70.AutoSize = True Me.Label70.Enabled = False Me.Label70.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label70.Location = New System.Drawing.Point(427, 28) + Me.Label70.Location = New System.Drawing.Point(427, 49) Me.Label70.Name = "Label70" Me.Label70.Size = New System.Drawing.Size(72, 13) Me.Label70.TabIndex = 3 @@ -4308,26 +4319,26 @@ Partial Class usrcntlKundeBearbeitenFull 'DataGridView1 ' Me.DataGridView1.AllowUserToResizeRows = False - DataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle20 + DataGridViewCellStyle45.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle45 Me.DataGridView1.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.DataGridView1.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle21 + DataGridViewCellStyle46.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle46.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle46.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle46.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle46.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle46.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle46.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.DataGridView1.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle46 Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.DataGridView1.DefaultCellStyle = DataGridViewCellStyle22 + DataGridViewCellStyle47.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle47.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle47.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle47.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle47.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle47.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle47.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.DataGridView1.DefaultCellStyle = DataGridViewCellStyle47 Me.DataGridView1.Enabled = False Me.DataGridView1.Location = New System.Drawing.Point(6, 111) Me.DataGridView1.MultiSelect = False @@ -4381,26 +4392,26 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.dgvBankverbindungen.AllowUserToDeleteRows = False Me.dgvBankverbindungen.AllowUserToResizeRows = False - DataGridViewCellStyle23.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvBankverbindungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle23 + DataGridViewCellStyle48.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvBankverbindungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle48 Me.dgvBankverbindungen.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvBankverbindungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle24 + DataGridViewCellStyle49.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle49.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle49.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle49.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle49.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle49.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle49.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvBankverbindungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle49 Me.dgvBankverbindungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvBankverbindungen.DefaultCellStyle = DataGridViewCellStyle25 + DataGridViewCellStyle50.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle50.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle50.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle50.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle50.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle50.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle50.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvBankverbindungen.DefaultCellStyle = DataGridViewCellStyle50 Me.dgvBankverbindungen.Location = New System.Drawing.Point(3, 40) Me.dgvBankverbindungen.MultiSelect = False Me.dgvBankverbindungen.Name = "dgvBankverbindungen" @@ -5529,14 +5540,15 @@ Partial Class usrcntlKundeBearbeitenFull Me.DataGridViewTextBoxColumn2.HeaderText = "E-Mail" Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" ' - 'cbxCS_Added + 'cbxCSInsolvent ' - Me.cbxCS_Added.AutoSize = True - Me.cbxCS_Added.Location = New System.Drawing.Point(406, 9) - Me.cbxCS_Added.Name = "cbxCS_Added" - Me.cbxCS_Added.Size = New System.Drawing.Size(15, 14) - Me.cbxCS_Added.TabIndex = 37 - Me.cbxCS_Added.UseVisualStyleBackColor = True + Me.cbxCSInsolvent.AutoSize = True + Me.cbxCSInsolvent.Location = New System.Drawing.Point(406, 26) + Me.cbxCSInsolvent.Name = "cbxCSInsolvent" + Me.cbxCSInsolvent.Size = New System.Drawing.Size(102, 17) + Me.cbxCSInsolvent.TabIndex = 39 + Me.cbxCSInsolvent.Text = "Kunde insolvent" + Me.cbxCSInsolvent.UseVisualStyleBackColor = True ' 'usrcntlKundeBearbeitenFull ' @@ -5997,4 +6009,5 @@ Partial Class usrcntlKundeBearbeitenFull Friend WithEvents cbxErstattungsart As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents cbpKopfsammelrechnung As CheckBox Friend WithEvents cbxCS_Added As CheckBox + Friend WithEvents cbxCSInsolvent As CheckBox End Class diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index 4ef19144..85d879cd 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -213,6 +213,7 @@ txtVorauszahlung.Text = loadValue(KUNDE_ERW.kde_AnmerkungVZ, "") cbxFR.Checked = loadValue(KUNDE_ERW.kde_FR, False) cbxCS_Added.Checked = loadValue(KUNDE_ERW.kde_CSPortfolioAdded, False) + cbxCSInsolvent.Checked = IIf(Not IsDBNull(KUNDE_ERW.kde_CSinsolventAm), True, False) txtFR.Text = loadValue(KUNDE_ERW.kde_AnmerkungFR, "") cbpKopfsammelrechnung.Checked = KUNDE_ERW.kde_Kopfsammelrechnung txtAnmerkungAntraege.Text = loadValue(KUNDE_ERW.kde_AnmerkungAntrag, "") @@ -716,6 +717,7 @@ KUNDE_ERW.kde_txtVersicherungDeckungsquote = isLeerNothingDbl(txtVersicherungDeckungsquote._value) KUNDE_ERW.kde_txtVersicherungNichtVersicherbar = cbxNichtVersicherbar.Checked KUNDE_ERW.kde_CSPortfolioAdded = cbxCS_Added.Checked + KUNDE_ERW.kde_Versicherung_GemeldeterBetrag = isLeerNothingDbl(txtVersicherung_GemeldeterBetrag._value) KUNDE_ERW.kde_txtVersicherungEHNr = isLeerNothing(txtVers_EHNr._value) @@ -2349,5 +2351,21 @@ If Not cbxVorauszahlung.Checked Then txtVorauszahlung.Text = "" End Sub + Private Sub cbxCSInsolvent_CheckedChanged(sender As Object, e As EventArgs) Handles cbxCSInsolvent.CheckedChanged + If KUNDE_ERW.kde_CSinsolventAm IsNot Nothing AndAlso Not cbxCSInsolvent.Checked Then + If vbYes = MsgBox("Möchten Sie die Anmerkung der Insolvent deaktivieren?" & vbNewLine & " Diese Anmerkung wurde automatisch über die Creditsafe-API eingelesen!", vbYesNoCancel) Then + cbxCSInsolvent.Checked = False + KUNDE_ERW.kde_CSinsolventAm = Nothing + KUNDE_ERW.SAVE() + Else + cbxCSInsolvent.Checked = True + End If + + ElseIf KUNDE_ERW.kde_CSinsolventAm Is Nothing And cbxCSInsolvent.Checked Then + MsgBox("Wert kann nicht manuell gesetzt werden!") + cbxCSInsolvent.Checked = False + End If + + End Sub End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb b/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb index 914bea2e..a1186542 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb @@ -17,7 +17,6 @@ Public Class cKundenErweitert 'Property kde_Hoechstkredit As Object = Nothing Property kde_Versicherung_Deckungsstopp As Boolean = False Property kde_Versicherung_DeckungsstoppDatum As Object = Nothing - Property kde_Versicherung_Uebergeben As Boolean = False Property kde_Versicherung_UebergebenAm As Object = Nothing Property kde_Versicherung_AnerkennungVersicherungsfall As Boolean = False @@ -28,7 +27,6 @@ Public Class cKundenErweitert Property kde_Versicherung_GemeldeterBetrag As Object = Nothing Property kde_txtVersicherungEHNr As Object = Nothing - Property kde_Leihgeld_Provision As Object = Nothing Property kde_Leihgeld_ProvisionPreisstaffel As Object = Nothing Property kde_Leihgeld_ProvisionAuftraggeber As Object = Nothing @@ -44,7 +42,6 @@ Public Class cKundenErweitert Property Email_AVM As Boolean = False Property Depot_Kunde As Boolean = False Property FiBuSchnittstelleLG As Boolean = False - Property Zahlungsziel2 As Object = Nothing Property Zahlungsziel3 As Object = Nothing Property EmailAnkunft_Export As Boolean = False @@ -53,7 +50,6 @@ Public Class cKundenErweitert Property kde_CreditSaveBonitaetsklasse As Object = Nothing Property kde_CreditSaveBonitaetsIndex As Object = Nothing Property kde_CreditSaveBonitaetsScore As Object = Nothing - Property kde_CreditSaveId As String = "" Property kde_CreditSaveNo As String = "" Property kde_Inkasso_Uebergeben As Boolean = False @@ -98,13 +94,8 @@ Public Class cKundenErweitert Property kde_Erstattungsart As Object = Nothing Property kde_BezFIBU As Object = Nothing Property kde_Kopfsammelrechnung As Boolean = False - Property kde_CSPortfolioAdded As Boolean = False - - - - - + Property kde_CSinsolventAm As Object = Nothing Dim SQL As New SQL @@ -205,6 +196,7 @@ Public Class cKundenErweitert list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_BezFIBU", kde_BezFIBU)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_Kopfsammelrechnung", kde_Kopfsammelrechnung)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CSPortfolioAdded", kde_CSPortfolioAdded)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CSinsolventAm", kde_CSinsolventAm)) Return list End Function diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb index ff895f01..7d219a96 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb @@ -5,7 +5,6 @@ Imports System.Net Imports System.Reflection Imports System.Text.RegularExpressions Imports System.Threading -Imports VERAG_PROG_ALLGEMEIN.TESTJSON Public Class cCreditSafeAPI @@ -471,9 +470,10 @@ Public Class cCreditSafeAPI End Function + Shared Function getCompanyEventsDetails(company As Company, ByRef dtEvents As DataTable, Optional checklastChecked As Boolean = False, Optional updateKunden As Boolean = False, Optional showError As Boolean = False, Optional getTotalNr As Boolean = False, Optional setzeKundenbesonderheiten As Boolean = False, Optional sendMail As Boolean = False, Optional firma As String = "VERAG") As String - Shared Function getCompanyEvents(company As Company, ByRef dtEvents As DataTable, ByRef companyDetailEvents As Boolean, ByRef maxPages As Integer, Optional checklastChecked As Boolean = False, Optional updateKunden As Boolean = False, Optional showError As Boolean = False, Optional getTotalNr As Boolean = False, Optional setzeKundenbesonderheiten As Boolean = False, Optional sendMail As Boolean = False, Optional firma As String = "VERAG", Optional page As Integer = 0) As String + '------------------------------- PRO KUNDE 'rest.AddQueryParam("from", Today().AddDays(-1)) @@ -486,17 +486,8 @@ Public Class cCreditSafeAPI End If Dim failureDesc As String - - Dim myUrl As String = "" - - If Not companyDetailEvents Then - myUrl = API_STRING & "/v1/monitoring/portfolios/1662419/notificationEvents" - Else - myUrl = API_STRING & "/v1/monitoring/companies/" & company.creditSafeId & "/events" & IIf(checklastChecked, "?startDate=" & checkDate, "") - End If - - - Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token, failureDesc, Not companyDetailEvents,,, Not companyDetailEvents, page) + Dim myUrl As String = API_STRING & "/v1/monitoring/companies/" & company.creditSafeId & "/events" & IIf(checklastChecked, "?startDate=" & checkDate, "") + Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token, failureDesc) If failureDesc <> "" Then If showError Then MsgBox(failureDesc) @@ -535,15 +526,6 @@ Public Class cCreditSafeAPI Return "data not found." End If - - Dim pagination As Chilkat.JsonObject = json.ObjectOf("pagination") - If Not (json.LastMethodSuccess = False) Then - Dim Lastpage As String = pagination.StringOf("last") - If IsNumeric(Lastpage) Then maxPages = Lastpage - End If - - - Dim numCompanies As Integer = companieData.Size Dim defaultCL As Double = -10000000 @@ -585,51 +567,11 @@ Public Class cCreditSafeAPI R("eventDate") = dateTime.GetAsTimestamp(getAsLocal) R("createdDate") = dateTime.GetAsTimestamp(getAsLocal) - If IsDBNull(R("companyId")) Then - Dim compObjHead As Chilkat.JsonObject = compObj.ObjectOf("company") - R("companyId") = compObjHead.StringOf("id") - If IsDBNull(R("portfolioId")) Then R("portfolioId") = compObjHead.StringOf("portfolioId") - End If - dtEvents.Rows.Add(R) - Dim dtKundenNr As New DataTable - If company.kdNr = 0 Then - dtKundenNr = SQL.loadDgvBySql("select distinct(ba_KundenNr),f.Firma from Kunden - inner join tblKundenErweitert on Kunden.KundenNr = kde_KundenNr - inner join Filialen as f on f.FilialenNr = Kunden.FilialenNr - inner join tblBonitaetsauskunft on ba_KundenNr = kde_KundenNr - where isnull(tblKundenErweitert.kde_CreditSaveId,'') ='" & R("companyId") & "'", "FMZOLL") - - - End If - - If dtKundenNr.Rows.Count > 0 Then - - For Each row As DataRow In dtKundenNr.Rows - company.kdNr = row("ba_KundenNr") - company.creditSafeId = R("companyId") - firma = row("Firma") - Dim currentBonID As String = (New SQL).getValueTxtBySql("Select Top(1) isnull(ba_id, -1) FROM [tblBonitaetsauskunft] where ba_KundenNr = " & company.kdNr & " AND [ba_Pruefungstool] = 'creditsafe API' ORDER BY ba_Datum DESC", "FMZOLL") - If currentBonID <> "" AndAlso IsNumeric(currentBonID) AndAlso currentBonID > 0 Then - company.csBonID = currentBonID - End If - createEvents(R, company.kdNr, company, CL, CR, CL_Datum, CR_Datum) - updateKundenWithEvent(company, CL, CR, CL_Datum, CR_Datum, setzeKundenbesonderheiten, defaultCR, defaultCL, updateKunden, sendMail, firma) - Next - - company.kdNr = 0 'wichtig, wieder zurücksetzen! - - Else - - If company.kdNr <> 0 Then - createEvents(R, company.kdNr, company, CL, CR, CL_Datum, CR_Datum) - End If - - End If + createEvents(R, company.kdNr, company, CL, CR, CL_Datum, CR_Datum) j = j + 1 - End While 'Next @@ -640,21 +582,334 @@ Public Class cCreditSafeAPI 'viewEvents = New DataView(dtEvents, "localEventCode IN ('CL','CR') or e.globalEventCode IN ('CL','CR')", "", DataViewRowState.CurrentRows) End If - If company.kdNr <> 0 AndAlso companyDetailEvents Then updateKundenWithEvent(company, CL, CR, CL_Datum, CR_Datum, setzeKundenbesonderheiten, defaultCR, defaultCL, updateKunden, sendMail, firma) + Dim triggerMail As Boolean = False + Dim KUNDE As New cKunde(company.kdNr) + Dim Mailtext As String = "" + + updateKundenWithEvent(KUNDE, company, CL, CR, CL_Datum, CR_Datum, setzeKundenbesonderheiten, defaultCR, defaultCL, updateKunden, sendMail, triggerMail, Mailtext, firma) + + 'If company.kdNr > 0 AndAlso (CR <> -1000000 Or CL <> -1000000) Then + ' Dim KUNDE As New cKunde(company.kdNr) + + ' Dim Mailtext As String = "" + + ' If KUNDE.Bonitätsdatum <= CL_Datum Or KUNDE.Bonitätsdatum <= CR_Datum Then + + ' Dim Index As Double = -1 + ' Dim ADR As New cAdressen(KUNDE.KundenNr) + ' Dim riskClass As String = "" + ' Dim riskClassChanged As Boolean = False + ' Dim KUNDE_ERW As New cKundenErweitert(KUNDE.KundenNr) + + ' If Not (ADR.LandKz = "AT" Or ADR.LandKz = "A") Then 'bei nicht österr. den Index nehmen, sonst den Score + ' Index = IIf(CR = defaultCL, -1, calculatedBonIndexFromBonScore(CR, riskClass)) + ' Else + ' If CR <> defaultCL Then calculatedBonIndexFromBonScore(CR, riskClass) + ' End If + + ' If Index <> -1 Then + ' If KUNDE_ERW.kde_CreditSaveBonitaetsIndex <> Index Then + ' createInfo("B-INDEX", KUNDE_ERW, KUNDE, Index, riskClass, Mailtext, triggerMail, setzeKundenbesonderheiten) + ' KUNDE_ERW.kde_CreditSaveBonitaetsIndex = Index + ' KUNDE_ERW.kde_CreditSaveBonitaetsklasse = riskClass + ' KUNDE.Bonitätsdatum = Today() + ' End If + ' Else + ' If KUNDE_ERW.kde_CreditSaveBonitaetsScore <> CR AndAlso CR <> defaultCR Then + ' createInfo("B-SCORE", KUNDE_ERW, KUNDE, CR, riskClass, Mailtext, triggerMail, setzeKundenbesonderheiten) + ' KUNDE_ERW.kde_CreditSaveBonitaetsScore = CR + ' KUNDE_ERW.kde_CreditSaveBonitaetsklasse = riskClass + ' KUNDE.Bonitätsdatum = Today() + ' End If + ' End If + + ' If KUNDE.Höchstkredit <> CL AndAlso CL <> defaultCL Then + ' createInfo("KREDITLIMIT", KUNDE_ERW, KUNDE, CL, riskClass, Mailtext, triggerMail, setzeKundenbesonderheiten) + ' KUNDE.Höchstkredit = CL + ' If KUNDE.Bonitätsdatum <= CDate(CL_Datum) Then + ' KUNDE.Bonitätsdatum = Today() + ' End If + ' End If + + ' If updateKunden Then KUNDE_ERW.SAVE() + ' End If + + ' If updateKunden Then KUNDE.SAVE() + + If triggerMail AndAlso sendMail Then + Dim ADR As New cAdressen(KUNDE.KundenNr) + + Dim empfanegerMail As String = "as@verag.ag" + + Select Case firma + Case "VERAG" : empfanegerMail = "as@verag.ag" + Case "IMEX" : empfanegerMail = "Viktoria.Leirich@imex-group.at" + 'Case "AMBAR" : empfanegerMail = "Buchhaltung@ambarlog.com" + 'Case "UNISPED" : empfanegerMail = "sabine.muehlboeck@unisped.at" + End Select + + If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then empfanegerMail = "d.breimaier@verag.ag" + + VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfanegerMail, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & "CREDITSAFE " & KUNDE.KundenNr, "Änderungen der Creditsafe-Daten von Kunden " & KUNDE.KundenNr & " " & ADR.Ordnungsbegriff & Mailtext.ToString & "

" & "*Automatic generated e-mail*",,,,, "d.breimaier@verag.ag") + End If + + 'End if + + + + Return "Anzahl gefundener Datensätze: " & numCompanies End Function - Private Shared Sub updateKundenWithEvent(company As Company, CL As Integer, CR As Integer, CL_Datum As Date, CR_Datum As Date, setzeKundenbesonderheiten As Boolean, defaultCR As Integer, defaultCL As Integer, updateKunden As Boolean, sendMail As Boolean, Optional firma As String = "VERAG") + + Shared Function getCompanyEvents(company As Company, ByRef dtEvents As DataTable, ByRef companyDetailEvents As Boolean, ByRef maxPages As Integer, Optional checklastChecked As Boolean = False, Optional updateKunden As Boolean = False, Optional showError As Boolean = False, Optional getTotalNr As Boolean = False, Optional setzeKundenbesonderheiten As Boolean = False, Optional sendMail As Boolean = False, Optional firma As String = "VERAG", Optional page As Integer = 0) As String + + '------------------------------- ALLE KUNDEN + + + Dim checkDate As String = "" + + If company IsNot Nothing AndAlso IsDate(company.lastChecked) Then + checkDate = company.lastChecked.ToString("yyyy-MM-ddTHH:mm:ss") + Else + checkDate = Today().AddDays(-30).ToString("yyyy-MM-ddTHH:mm:ss") + End If + + Dim failureDesc As String + + Dim myUrl As String = API_STRING & "/v1/monitoring/portfolios/1662419/notificationEvents" + + Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token, failureDesc, Not companyDetailEvents,,, Not companyDetailEvents, page) + + If failureDesc <> "" Then + If showError Then MsgBox(failureDesc) + Return "Error" & vbNewLine & failureDesc & vbNewLine & myUrl + End If + + Dim json As New Chilkat.JsonObject + Dim success As Boolean = json.Load(jsonRespString) + If (success <> True) Then + Debug.WriteLine(json.LastErrorText) + Return "Verbindungsfehler" & vbNewLine & json.LastErrorText + End If + + If dtEvents.Columns.Count = 0 Then + dtEvents.Columns.Add("eventId", GetType(String)) + dtEvents.Columns.Add("companyId", GetType(String)) + dtEvents.Columns.Add("portfolioId", GetType(String)) + dtEvents.Columns.Add("ruleName", GetType(String)) + dtEvents.Columns.Add("localEventCode", GetType(String)) + dtEvents.Columns.Add("globalEventCode", GetType(String)) + dtEvents.Columns.Add("newValue", GetType(String)) + dtEvents.Columns.Add("oldValue", GetType(String)) + dtEvents.Columns.Add("eventDate", GetType(DateTime)) + dtEvents.Columns.Add("createdDate", GetType(DateTime)) + End If + + dtEvents.Rows.Clear() + + Dim num As Integer = json.SizeOfArray("data") + If num = 0 OrElse getTotalNr Then + Return json.StringOf("totalCount") + End If + + Dim companieData As Chilkat.JsonArray = json.ArrayOf("data") + If (json.LastMethodSuccess = False) Then + Return "data not found." + End If + + + Dim pagination As Chilkat.JsonObject = json.ObjectOf("paging") + If Not (json.LastMethodSuccess = False) Then + Dim Lastpage As String = pagination.StringOf("last") + If IsNumeric(Lastpage) Then maxPages = Lastpage + End If + + Dim numCompanies As Integer = companieData.Size + + Dim defaultCL As Double = -10000000 + Dim defaultCR As Integer = -10000000 + + Dim CL As Double = defaultCL + Dim CR As Integer = defaultCR + Dim CL_Datum As Date = company.lastChecked + Dim CR_Datum As Date = company.lastChecked + + Dim j As Integer = 0 + + Dim lastcompanyID As String = "" + Dim Mailtext As String = "" Dim triggerMail As Boolean = False - If company.kdNr > 0 AndAlso (CR <> -1000000 Or CL <> -1000000) Then - Dim KUNDE As New cKunde(company.kdNr) + Dim triggerMailEnd As Boolean = False + Dim MailtextEnd As String = "" - Dim Mailtext As String = "" + While j < numCompanies + + Dim compObj As Chilkat.JsonObject = companieData.ObjectAt(j) + Dim compObjNext As Chilkat.JsonObject = Nothing + + If (j + 1) < numCompanies Then + compObjNext = companieData.ObjectAt(j + 1) + Else + compObjNext = companieData.ObjectAt(j) + End If + + Dim companychanges As Boolean = False + Dim index = companieData.FindString("eventId", False) + + Dim dateTime As New Chilkat.CkDateTime + Dim dt As New Chilkat.DtObj + Dim getAsLocal As Boolean = False + + success = compObj.DateOf("eventDate", dateTime) + success = compObj.DateOf("createdDate", dateTime) + Debug.WriteLine(dateTime.GetAsTimestamp(getAsLocal)) + + + Dim R As DataRow = dtEvents.NewRow + R("eventId") = compObj.StringOf("eventId") + R("companyId") = compObj.StringOf("companyId") + R("portfolioId") = compObj.StringOf("portfolioId") + R("ruleName") = compObj.StringOf("ruleName") + R("localEventCode") = compObj.StringOf("localEventCode") + R("globalEventCode") = compObj.StringOf("globalEventCode") + R("oldValue") = compObj.StringOf("oldValue") + R("newValue") = compObj.StringOf("newValue") + R("eventDate") = dateTime.GetAsTimestamp(getAsLocal) + R("createdDate") = dateTime.GetAsTimestamp(getAsLocal) + + If IsDBNull(R("companyId")) Then + Dim compObjHead As Chilkat.JsonObject = compObj.ObjectOf("company") + R("companyId") = compObjHead.StringOf("id") + If IsDBNull(R("portfolioId")) Then R("portfolioId") = compObjHead.StringOf("portfolioId") + End If + + Dim nextcompid = "" + + If compObjNext IsNot Nothing Then + Dim nextcompObjHead As Chilkat.JsonObject = compObjNext.ObjectOf("company") + nextcompid = nextcompObjHead.StringOf("id") + + If nextcompid <> R("companyId") Then + companychanges = True + Else + companychanges = False + End If + + End If + 'dtEvents.Rows.Add(R) + + Dim dtKundenNr As New DataTable + 'If company.kdNr = 0 Then + dtKundenNr = SQL.loadDgvBySql("select distinct(ba_KundenNr),f.Firma from Kunden + inner join tblKundenErweitert on Kunden.KundenNr = kde_KundenNr + inner join Filialen as f on f.FilialenNr = Kunden.FilialenNr + inner join tblBonitaetsauskunft on ba_KundenNr = kde_KundenNr + where isnull(tblKundenErweitert.kde_CreditSaveId,'') ='" & R("companyId") & "'", "FMZOLL") + + + 'End If + + Dim dtFirmen As New DataTable() + + If dtFirmen.Columns.Count = 0 Then dtFirmen.Columns.Add("Firma", GetType(String)) + + If dtKundenNr.Rows.Count > 0 Then + + For Each row As DataRow In dtKundenNr.Rows + company.kdNr = row("ba_KundenNr") + company.creditSafeId = R("companyId") + firma = row("Firma") + + Dim firmRow As DataRow = dtFirmen.NewRow + firmRow("Firma") = firma + dtFirmen.Rows.Add(firmRow) + + Dim currentBonID As String = (New SQL).getValueTxtBySql("Select Top(1) isnull(ba_id, -1) FROM [tblBonitaetsauskunft] where ba_KundenNr = " & company.kdNr & " AND [ba_Pruefungstool] = 'creditsafe API' ORDER BY ba_Datum DESC", "FMZOLL") + If currentBonID <> "" AndAlso IsNumeric(currentBonID) AndAlso currentBonID > 0 Then + company.csBonID = currentBonID + End If + + createEvents(R, company.kdNr, company, CL, CR, CL_Datum, CR_Datum) + + Next + + + End If + + + '-------------------------------------------------------------------- + + If companychanges Then + + If dtKundenNr.Rows.Count > 0 Then + For Each row As DataRow In dtKundenNr.Rows + + + Dim KUNDE As New cKunde(row("ba_KundenNr")) + company.kdNr = row("ba_KundenNr") + company.creditSafeId = R("companyId") + firma = row("Firma") + updateKundenWithEvent(KUNDE, company, CL, CR, CL_Datum, CR_Datum, setzeKundenbesonderheiten, defaultCR, defaultCL, updateKunden, sendMail, triggerMail, Mailtext, firma) + + If company.kdNr <> 0 Then + If triggerMail AndAlso sendMail AndAlso Mailtext <> "" Then + Dim ADR As New cAdressen(company.kdNr) + Dim empfanegerMail = "as@verag.ag" + + For Each firmRowTemp As DataRow In dtFirmen.Rows + Select Case firmRowTemp("Firma") + Case "VERAG" : empfanegerMail = "as@verag.ag" + Case "IMEX" : empfanegerMail = "Viktoria.Leirich@imex-group.at" + 'Case "AMBAR" : empfanegerMail = "Buchhaltung@ambarlog.com" + 'Case "UNISPED" : empfanegerMail = "sabine.muehlboeck@unisped.at" + End Select + + If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then empfanegerMail = "d.breimaier@verag.ag" + VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfanegerMail, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & "CREDITSAFE " & KUNDE.KundenNr & " (" & firmRowTemp("Firma") & ")", "Änderungen der Creditsafe-Daten von Kunden " & KUNDE.KundenNr & " " & ADR.Ordnungsbegriff & Mailtext.ToString & "

" & "*Automatic generated e-mail*",,,,, "d.breimaier@verag.ag") + Next + Mailtext = "" + End If + + End If + + Next + End If + 'wichtig, alles wieder zurücksetzen!!!!! + CL = defaultCL + CR = defaultCR + CL_Datum = company.lastChecked + CR_Datum = company.lastChecked + company.kdNr = 0 + triggerMail = False + Mailtext = "" + company.BANKRUPT_REGISTERED = False + End If + + '-------------------------------------------------------------------- + + j = j + 1 + + End While + + Return "Anzahl gefundener Datensätze: " & numCompanies + + End Function + + Private Shared Sub resetValues(com As Company) + + End Sub + + + + Private Shared Sub updateKundenWithEvent(KUNDE As cKunde, company As Company, CL As Integer, CR As Integer, CL_Datum As Date, CR_Datum As Date, setzeKundenbesonderheiten As Boolean, defaultCR As Integer, defaultCL As Integer, updateKunden As Boolean, sendMail As Boolean, ByRef triggerMail As Boolean, ByRef MailText As String, Optional firma As String = "VERAG") + + If company.kdNr > 0 AndAlso (CR <> -1000000 Or CL <> -1000000) Then If KUNDE.Bonitätsdatum <= CL_Datum Or KUNDE.Bonitätsdatum <= CR_Datum Then @@ -672,14 +927,14 @@ Public Class cCreditSafeAPI If Index <> -1 Then If KUNDE_ERW.kde_CreditSaveBonitaetsIndex <> Index Then - createInfo("B-INDEX", KUNDE_ERW, KUNDE, Index, riskClass, Mailtext, triggerMail, setzeKundenbesonderheiten) + createInfo("B-INDEX", KUNDE_ERW, KUNDE, Index, riskClass, MailText, triggerMail, setzeKundenbesonderheiten) KUNDE_ERW.kde_CreditSaveBonitaetsIndex = Index KUNDE_ERW.kde_CreditSaveBonitaetsklasse = riskClass KUNDE.Bonitätsdatum = Today() End If Else If KUNDE_ERW.kde_CreditSaveBonitaetsScore <> CR AndAlso CR <> defaultCR Then - createInfo("B-SCORE", KUNDE_ERW, KUNDE, CR, riskClass, Mailtext, triggerMail, setzeKundenbesonderheiten) + createInfo("B-SCORE", KUNDE_ERW, KUNDE, CR, riskClass, MailText, triggerMail, setzeKundenbesonderheiten) KUNDE_ERW.kde_CreditSaveBonitaetsScore = CR KUNDE_ERW.kde_CreditSaveBonitaetsklasse = riskClass KUNDE.Bonitätsdatum = Today() @@ -687,15 +942,16 @@ Public Class cCreditSafeAPI End If If KUNDE.Höchstkredit <> CL AndAlso CL <> defaultCL Then - createInfo("KREDITLIMIT", KUNDE_ERW, KUNDE, CL, riskClass, Mailtext, triggerMail, setzeKundenbesonderheiten) + createInfo("KREDITLIMIT", KUNDE_ERW, KUNDE, CL, riskClass, MailText, triggerMail, setzeKundenbesonderheiten) KUNDE.Höchstkredit = CL If KUNDE.Bonitätsdatum <= CDate(CL_Datum) Then KUNDE.Bonitätsdatum = Today() End If End If - If company.BANKRUPT_REGISTERED Then - createInfo("BANKRUPT_REGISTERED", KUNDE_ERW, KUNDE, CL, riskClass, Mailtext, triggerMail, setzeKundenbesonderheiten, company) + If company.BANKRUPT_REGISTERED AndAlso Not MailText.Contains("FÜR INSOLVENT ERKLÄRT") Then + createInfo("BANKRUPT_REGISTERED", KUNDE_ERW, KUNDE, CL, riskClass, MailText, triggerMail, setzeKundenbesonderheiten, company) + KUNDE_ERW.kde_CSinsolventAm = company.BANKRUPT_REGISTERED_DATE End If If updateKunden Then KUNDE_ERW.SAVE() @@ -703,24 +959,11 @@ Public Class cCreditSafeAPI If updateKunden Then KUNDE.SAVE() - If triggerMail AndAlso sendMail Then - Dim ADR As New cAdressen(KUNDE.KundenNr) - Dim empfanegerMail = IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "d.breimaier@verag.ag", "as@verag.ag") - If Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then - Select Case firma - Case "VERAG" : empfanegerMail = "as@verag.ag" - Case "IMEX" : empfanegerMail = "Viktoria.Leirich@imex-group.at" - Case "AMBAR" : empfanegerMail = "Buchhaltung@ambarlog.com" - Case "UNISPED" : empfanegerMail = "sabine.muehlboeck@unisped.at" - End Select - End If - VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfanegerMail, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & "CREDITSAFE " & KUNDE.KundenNr, "Änderungen der Creditsafe-Daten von Kunden " & KUNDE.KundenNr & " " & ADR.Ordnungsbegriff & Mailtext.ToString & "

" & "*Automatic generated e-mail*",,,,, "d.breimaier@verag.ag") - End If End If End Sub - Private Shared Sub createEvents(R As DataRow, KundeNr As Integer, company As Company, CL As Integer, CR As Integer, ByRef CL_Datum As Date, ByRef CR_Datum As Date) + Private Shared Sub createEvents(R As DataRow, KundeNr As Integer, company As Company, ByRef CL As Integer, ByRef CR As Integer, ByRef CL_Datum As Date, ByRef CR_Datum As Date) Dim cEvent As New cCreditsafeEvent(CLng(R("eventId")), KundeNr) @@ -732,6 +975,8 @@ Public Class cCreditSafeAPI Select Case R("localEventCode").trim() Case "DECREASE_LIMIT", "INCREASE_LIMIT" : globaleventcode = "CL" Case "DECREASE_RATING", "INCREASE_RATING" : globaleventcode = "CR" + Case "55" : If R("companyId").ToString.StartsWith("NL") Then globaleventcode = "CR" 'nur Holland! + Case "56" : If R("companyId").ToString.StartsWith("NL") Then globaleventcode = "CL" 'nur Holland! End Select End If @@ -813,8 +1058,6 @@ Public Class cCreditSafeAPI cEvent.kundenNr = company.kdNr cEvent.SAVE() - - End Sub @@ -1412,7 +1655,7 @@ Public Class cCreditSafeAPI Select Case typ Case "B-INDEX", "B-SCORE", "KREDITLIMIT" : textVermerk &= "ACHTUNG, Veränderung des " & typ & " von " & oldValue.ToString & " auf " & newValue.ToString & " ( um " & changedInProzent.ToString("F2") & "% ) " & Risk - Case "BANKRUPT_REGISTERED" : textVermerk &= " KUNDE WURDE LAUT CREDITSAFE " & IIf(company IsNot Nothing, " AM " & company.BANKRUPT_REGISTERED_DATE.ToShortDateString, "") & " FÜR INSOLVENT ERKLÄRT " + Case "BANKRUPT_REGISTERED" : textVermerk &= " KUNDE WURDE LAUT CREDITSAFE " & IIf(company IsNot Nothing, " AM " & company.BANKRUPT_REGISTERED_DATE.ToShortDateString, "") & " FÜR INSOLVENT ERKLÄRT " & Risk End Select mailText &= "

" & textVermerk From fde2dce69e3327f48eab96a80df65013f24ec9fe Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 26 Sep 2025 17:14:08 +0200 Subject: [PATCH 17/27] timas, Rechnungausgang, etc. --- SDL/frmMain.vb | 30 +++- .../Classes/cRechnungsausgang.vb | 2 +- .../Schnittstellen/TIMAS/cTimasAPI.vb | 2 +- .../VERAG_PROG_ALLGEMEIN.vbproj | 9 ++ .../frmTimasabfrage.Designer.vb | 142 ++++++++++++++++++ VERAG_PROG_ALLGEMEIN/frmTimasabfrage.resx | 120 +++++++++++++++ VERAG_PROG_ALLGEMEIN/frmTimasabfrage.vb | 38 +++++ 7 files changed, 335 insertions(+), 8 deletions(-) create mode 100644 VERAG_PROG_ALLGEMEIN/frmTimasabfrage.Designer.vb create mode 100644 VERAG_PROG_ALLGEMEIN/frmTimasabfrage.resx create mode 100644 VERAG_PROG_ALLGEMEIN/frmTimasabfrage.vb diff --git a/SDL/frmMain.vb b/SDL/frmMain.vb index 108de584..70a95bca 100644 --- a/SDL/frmMain.vb +++ b/SDL/frmMain.vb @@ -151,23 +151,41 @@ Public Class frmMain Dim isEndpointRunning As Boolean = True timas.getTimeEntries(cAllgemein.MITARBEITER.mit_timasId, infoMessage, timeEntryExisting,, isEndpointRunning) If Not timeEntryExisting AndAlso isEndpointRunning Then - Dim a As MsgBoxResult = MsgBox("Für " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & " wurde heute noch keine Zeit erfasst" & vbNewLine & Now.ToString() & " als Startzeit erfassen?", vbYesNo) - If a = vbYes Then + Dim frm As New frmTimasabfrage(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER) + frm.TopMost = True + frm.ShowDialog() + + If frm.DialogResult = DialogResult.OK Then If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasMehrereFirmen Then Dim f As New frmZEButtons("in", VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasFirmen) f.ShowDialog() - f.BringToFront() + f.TopMost = True Else Dim info - timas.setTimeEntry(cAllgemein.MITARBEITER, Now, info, "in", IIf(cAllgemein.MITARBEITER.mit_homeoffice, 3, 0)) + timas.setTimeEntry(cAllgemein.MITARBEITER, Now, info, "in", frm.cboTyp._value) MsgBox(info) End If - Else - End If + 'Dim a As MsgBoxResult = MsgBox("Für " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & " wurde heute noch keine Zeit erfasst" & vbNewLine & Now.ToString() & " als Startzeit erfassen?", vbYesNo) + 'If a = vbYes Then + + ' If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasMehrereFirmen Then + ' Dim f As New frmZEButtons("in", VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasFirmen) + ' f.ShowDialog() + ' f.BringToFront() + ' Else + ' Dim info + ' timas.setTimeEntry(cAllgemein.MITARBEITER, Now, info, "in", IIf(cAllgemein.MITARBEITER.mit_homeoffice, 3, 0)) + ' MsgBox(info) + ' End If + + 'Else + + 'End If + End If End If diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb b/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb index da6ad4d4..cc3a2a59 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb @@ -557,7 +557,7 @@ Public Class cRechnungsausgang If FIRMA.Firma_ID = 19 Then Select Case Me.BelegartenKz - Case "AR" : If (Me.SteuerfreierGesamtbetrag + Me.SteuerpflichtigerGesamtbetrag) > 0 Then errMsg = "ERROR: Vorzeichenfehler!" : Return False + Case "AR" : If (Me.SteuerfreierGesamtbetrag + Me.SteuerpflichtigerGesamtbetrag) < 0 Then errMsg = "ERROR: Vorzeichenfehler!" : Return False Case "AG" : If (Me.SteuerfreierGesamtbetrag + Me.SteuerpflichtigerGesamtbetrag) < 0 Then errMsg = "ERROR: Vorzeichenfehler!" : Return False End Select End If diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb index b0f3516a..4a01cfe5 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb @@ -934,7 +934,7 @@ Public Class cTimasAPI Select Case inout Case "in" - entryType = "KOMMT" + entryType = "KOMMT" & IIf(art = 0, "(Büro)", "") & IIf(art = 3, "(Homeoffice)", "") Case "out" entryType = "GEHT" diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj index c59c1cdb..d31def16 100644 --- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj +++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj @@ -386,6 +386,12 @@ + + frmTimasabfrage.vb + + + Form + frmDatumsabfrage.vb @@ -808,6 +814,9 @@ frmVorlagenUpload.vb + + frmTimasabfrage.vb + frmDatumsabfrage.vb diff --git a/VERAG_PROG_ALLGEMEIN/frmTimasabfrage.Designer.vb b/VERAG_PROG_ALLGEMEIN/frmTimasabfrage.Designer.vb new file mode 100644 index 00000000..d66262d8 --- /dev/null +++ b/VERAG_PROG_ALLGEMEIN/frmTimasabfrage.Designer.vb @@ -0,0 +1,142 @@ +Imports System.Windows.Forms + + +Partial Class frmTimasabfrage + Inherits System.Windows.Forms.Form + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + 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() + Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) + Me.Button1 = New System.Windows.Forms.Button() + Me.cboTyp = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.btnClose = New System.Windows.Forms.Button() + Me.btn = New System.Windows.Forms.Button() + Me.Label1 = New System.Windows.Forms.Label() + Me.MyPanel1.SuspendLayout() + Me.SuspendLayout() + ' + 'MyPanel1 + ' + Me.MyPanel1.BackColor = System.Drawing.Color.White + Me.MyPanel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.MyPanel1.Controls.Add(Me.Button1) + Me.MyPanel1.Controls.Add(Me.cboTyp) + Me.MyPanel1.Controls.Add(Me.btnClose) + Me.MyPanel1.Controls.Add(Me.btn) + Me.MyPanel1.Controls.Add(Me.Label1) + Me.MyPanel1.Dock = System.Windows.Forms.DockStyle.Fill + Me.MyPanel1.Location = New System.Drawing.Point(0, 0) + Me.MyPanel1.Name = "MyPanel1" + Me.MyPanel1.Size = New System.Drawing.Size(264, 84) + Me.MyPanel1.TabIndex = 3 + ' + 'Button1 + ' + Me.Button1.DialogResult = System.Windows.Forms.DialogResult.OK + Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) + Me.Button1.Location = New System.Drawing.Point(6, 52) + Me.Button1.Margin = New System.Windows.Forms.Padding(0) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(57, 22) + Me.Button1.TabIndex = 7 + Me.Button1.Text = "OK" + Me.Button1.UseVisualStyleBackColor = True + ' + 'cboTyp + ' + Me.cboTyp._allowedValuesFreiText = Nothing + Me.cboTyp._allowFreiText = False + Me.cboTyp._value = "" + Me.cboTyp.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.cboTyp.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboTyp.DropDownWidth = 224 + Me.cboTyp.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.cboTyp.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cboTyp.FormattingEnabled = True + Me.cboTyp.Items.AddRange(New Object() {"", "100000-199999: XXXXXX", "200000-299999: XXXXXX", "300000-399999: XXXXXX", "400000-499999: XXXXXX", "500000-599999: XXXXXX", "600000-699999: XXXXXX", "700000-799999: XXXXXX", "800000-899999: XXXXXX", "900000-999999: XXXXXX"}) + Me.cboTyp.Location = New System.Drawing.Point(79, 23) + Me.cboTyp.Name = "cboTyp" + Me.cboTyp.Size = New System.Drawing.Size(84, 28) + Me.cboTyp.TabIndex = 4 + ' + 'btnClose + ' + Me.btnClose.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnClose.BackColor = System.Drawing.Color.Red + Me.btnClose.FlatAppearance.BorderColor = System.Drawing.Color.White + Me.btnClose.FlatAppearance.BorderSize = 0 + Me.btnClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnClose.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!, System.Drawing.FontStyle.Bold) + Me.btnClose.ForeColor = System.Drawing.Color.White + Me.btnClose.Location = New System.Drawing.Point(231, 0) + Me.btnClose.Name = "btnClose" + Me.btnClose.RightToLeft = System.Windows.Forms.RightToLeft.Yes + Me.btnClose.Size = New System.Drawing.Size(31, 20) + Me.btnClose.TabIndex = 5 + Me.btnClose.Text = "X" + Me.btnClose.UseVisualStyleBackColor = False + ' + 'btn + ' + Me.btn.DialogResult = System.Windows.Forms.DialogResult.Cancel + Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btn.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) + Me.btn.Location = New System.Drawing.Point(178, 52) + Me.btn.Margin = New System.Windows.Forms.Padding(0) + Me.btn.Name = "btn" + Me.btn.Size = New System.Drawing.Size(76, 22) + Me.btn.TabIndex = 2 + Me.btn.Text = "Abbrechen" + Me.btn.UseVisualStyleBackColor = True + ' + 'Label1 + ' + Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label1.ForeColor = System.Drawing.SystemColors.ControlText + Me.Label1.Location = New System.Drawing.Point(3, 2) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(222, 18) + Me.Label1.TabIndex = 6 + ' + 'frmTimasabfrage + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(264, 84) + Me.Controls.Add(Me.MyPanel1) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None + Me.Name = "frmTimasabfrage" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "frmDatumsabfrage" + Me.MyPanel1.ResumeLayout(False) + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents MyPanel1 As VERAG_PROG_ALLGEMEIN.MyPanel + Friend WithEvents btnClose As Button + Friend WithEvents btn As Button + Friend WithEvents Label1 As Label + Public WithEvents cboTyp As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents Button1 As Button +End Class diff --git a/VERAG_PROG_ALLGEMEIN/frmTimasabfrage.resx b/VERAG_PROG_ALLGEMEIN/frmTimasabfrage.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/VERAG_PROG_ALLGEMEIN/frmTimasabfrage.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + \ No newline at end of file diff --git a/VERAG_PROG_ALLGEMEIN/frmTimasabfrage.vb b/VERAG_PROG_ALLGEMEIN/frmTimasabfrage.vb new file mode 100644 index 00000000..7663d745 --- /dev/null +++ b/VERAG_PROG_ALLGEMEIN/frmTimasabfrage.vb @@ -0,0 +1,38 @@ +Public Class frmTimasabfrage + Dim mit As VERAG_PROG_ALLGEMEIN.cMitarbeiter + Public Datum As Date = CDate(Now.ToShortDateString) + + Sub New() + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + End Sub + + Sub New(mit_ As cMitarbeiter) + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + mit = mit_ + End Sub + + + + + Private Sub frmTimasabfrage(sender As Object, e As EventArgs) Handles Me.Load + + cboTyp.Items.Clear() + cboTyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Büro", "0")) + cboTyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Homeoffice", "3")) + + If mit IsNot Nothing Then + Label1.Text = "Zeit erfassen für: " & mit.mit_nname & " " & mit.mit_vname + If mit.mit_homeoffice Then + cboTyp.changeItem("Homeoffice") + Else + cboTyp.changeItem("Büro") + End If + End If + + + + End Sub + +End Class \ No newline at end of file From 8ac8a72e04358af6b160d0da679e9e201438b33c Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 26 Sep 2025 17:29:15 +0200 Subject: [PATCH 18/27] credits --- .../Schnittstellen/Creditsafe/cCreditSafeAPI.vb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb index 7d219a96..c13314d6 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb @@ -1633,10 +1633,9 @@ Public Class cCreditSafeAPI End If 'LIMITs DEFINIEREN - If newValue = 0 Then - createInfo = True - triggerMail = True - End If + If newValue = 0 Or changedInProzent > infoAbxProzentVerschlechertung Then createInfo = True + If newValue = 0 Or changedInProzent > infoAbxProzentVerschlechertungMailInfo Then triggerMail = True + Case "BANKRUPT_REGISTERED" createInfo = True From 334e277c942e1ba4bd5645470e459e6cdb6e4141 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 29 Sep 2025 15:10:56 +0200 Subject: [PATCH 19/27] Spedbucht, Fakt, cbam, bearbeiten, etc. --- SDL/Fakturierung/usrCntlFaktAbrechnung.vb | 42 +++++++++++- SDL/My Project/AssemblyInfo.vb | 4 +- .../usrCntlSpeditionsBuchSuche.vb | 23 ++++++- SDL/USTV/usrCntlUSTV.vb | 16 ++++- SDL/kunden/usrCntlCBAM.vb | 67 ++++++++++++++++++- SDL/kunden/usrcntlKundeBearbeitenFull.vb | 4 +- SDL/mdm/usrCntlMDMAuswertungen.vb | 23 ++++++- .../Creditsafe/cCreditSafeAPI.vb | 12 ++-- 8 files changed, 167 insertions(+), 24 deletions(-) diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb index c466fb2f..bb89a1aa 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb @@ -2765,7 +2765,7 @@ Public Class usrCntlFaktAbrechnung Else curBGebBetrag = curBGebMinBetrag 'Mindestbetrag verwenden summeFremdBearb += If(OFFERT_FREMD, curBGebErrBetrag, 0) - summeRMCBearb += If(OFFERT_FREMD, curBGebErrBetrag, 0) + summeRMCBearb += If(OFFERT_RMC, curBGebErrBetrag, 0) minBetragRMCUsed = IIf(OFFERT_FREMD OrElse OFFERT_RMC, True, False) End If @@ -2805,6 +2805,7 @@ Public Class usrCntlFaktAbrechnung preisInital = (summeRMCBearb + summeFremdBearb) * IIf(RECHNUNG.Vorzeichen = "-", -1, 1) row.Cells("Preis").Value = preisInital Exit For + Else row.Cells("Preis").Value = preisInital Exit For @@ -2843,7 +2844,43 @@ Public Class usrCntlFaktAbrechnung If (sumOffertRMC + sumOffertFremd) * IIf(RECHNUNG.Vorzeichen = "-", -1, 1) <> POS.Preis Then For Each row As DataGridViewRow In dgvOfferteDetailsUebersicht.Rows If row.Cells("LeistungsNr").Value = BGebLeistungsNr And row.Cells("BerechnungsartNr").Value = 9 Then - If row.Cells("Preis").Value <> (sumOffertRMC + sumOffertFremd) * IIf(RECHNUNG.Vorzeichen = "-", -1, 1) Then + + Dim preisecChanged = row.Cells("Preis").Value + + If preisecChanged <> (sumOffertRMC + sumOffertFremd) * IIf(RECHNUNG.Vorzeichen = "-", -1, 1) Then + + ' If row.Cells("Preis").Value = curBGebBetrag * 2 AndAlso minBetragRMCUsed Then 'wenn RMCPOS und MIND-BERTAG 2x verrechnet -> nur 1x berechnen v + + ' row.Cells("Preis").Value = preisecChanged / 2 + ' POS.Anzahl = 1 + ' initSteuerbetraege(RECHNUNG, POS) + ' POSChanged = True + ' Exit For + + ' ElseIf preisecChanged <> curBGebBetrag * 2 AndAlso (summeRMCBearb + summeFremdBearb) <> preisecChanged AndAlso (minBetragRMCUsed OrElse isRMC OrElse isFREMD) AndAlso (summeRMCBearb + summeFremdBearb) > curBGebMinBetrag Then 'wenn RMCPOS und Summe der berechneten Bearb > Mindestbetrag --> berechnetBearb verrechnet! + + ' preisecChanged = (summeRMCBearb + summeFremdBearb) * IIf(RECHNUNG.Vorzeichen = "-", -1, 1) + ' row.Cells("Preis").Value = preisecChanged + ' POS.Anzahl = 1 + ' initSteuerbetraege(RECHNUNG, POS) + ' POSChanged = True + + ' If FremdUndRMC AndAlso summeRMCBearb > 0 AndAlso summeFremdBearb > 0 Then Exit For + + ' ElseIf sumOffertRMC + sumOffertFremd > curBGebMinBetrag Then + + ' row.Cells("Preis").Value = (sumOffertRMC + sumOffertFremd) * IIf(RECHNUNG.Vorzeichen = "-", -1, 1) + ' POS.Anzahl = 1 + ' initSteuerbetraege(RECHNUNG, POS) + ' POSChanged = True + ' 'Exit For + + ' End If + + 'End if + + + row.Cells("Preis").Value = (sumOffertRMC + sumOffertFremd) * IIf(RECHNUNG.Vorzeichen = "-", -1, 1) POS.Anzahl = 1 initSteuerbetraege(RECHNUNG, POS) @@ -2853,6 +2890,7 @@ Public Class usrCntlFaktAbrechnung End If + Next diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index e0eb921b..3e0ce53e 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb index e482573b..11643e69 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb @@ -3041,13 +3041,30 @@ Public Class usrCntlSpeditionsBuchSuche Try Dim zS = If(r("Zollsystem_Land") IsNot DBNull.Value, r("Zollsystem_Land").ToString(), "") If ZOLLANMELDUNG.getDataByBezugsnummer(r("FilialenNr") & "/" & r("AbfertigungsNr"), r("Abfertigungsart"), "", False, zS) Then - Blatt.Range("E" & cnt).Value = ZOLLANMELDUNG.Handelsrechnung.Replace(", ", "," & vbNewLine) + + If ZOLLANMELDUNG.Handelsrechnung <> "" Then + + Dim RechnungsString = ZOLLANMELDUNG.Handelsrechnung.Replace(", ", "," & vbNewLine) + Dim rows() As String = RechnungsString.Split(New Char() {" "c}, StringSplitOptions.RemoveEmptyEntries) + + For Each row As String In rows + + If IsDate(row) AndAlso row.Length = 10 Then + RechnungsString = RechnungsString.Replace(row.ToString, "") + End If + + Next + + Blatt.Range("E" & cnt).Value = RechnungsString.Trim + End If + + Blatt.Range("F" & cnt).Value = ZOLLANMELDUNG.ABGABEN_EUST Blatt.Range("G" & cnt).Value = ZOLLANMELDUNG.ANZ_POS If If(ZOLLANMELDUNG.ATCMRN, "") <> "" Then - Blatt.Range("E" & cnt).Value = ZOLLANMELDUNG.ATCMRN + Blatt.Range("C" & cnt).Value = ZOLLANMELDUNG.ATCMRN + End If End If - End If Catch ex As Exception MsgBox(ex.Message & ex.StackTrace) diff --git a/SDL/USTV/usrCntlUSTV.vb b/SDL/USTV/usrCntlUSTV.vb index 1e28ab5e..9e8742d4 100644 --- a/SDL/USTV/usrCntlUSTV.vb +++ b/SDL/USTV/usrCntlUSTV.vb @@ -1441,11 +1441,14 @@ Public Class usrCntlUSTV If MyComboBox1._value <> "" Then whereStr &= " AND dbo.Adressen.LandKz='" & MyComboBox1._value & "' " + + + Dim sqlQery = "SELECT dbo.tblUStVAntrag.UStVAn_ID, dbo.tblUStVAntrag.UStVAn_KuNr, dbo.tblUStVAntrag.UStVAn_ReDatVon, dbo.tblUStVAntrag.UStVAn_ReDatBis, dbo.tblUStVAntrag.UStVAn_Ausstellungsdatum, - dbo.tblUStVAntrag.UStVAn_LandNr, - dbo.tblUStVAntrag.UStVAn_VZDatum, dbo.tblUStVAntrag.UStVAn_VZBetrag, dbo.tblUStVAntrag.UStVAn_RZBetragVZ, dbo.Adressen.Ordnungsbegriff, dbo.Adressen.LandKz, ISNULL + (SELECT LandKz from [Länderverzeichnis für die Außenhandelsstatistik] where LandNr = dbo.tblUStVAntrag.UStVAn_LandNr) as AntragsLand, + dbo.tblUStVAntrag.UStVAn_VZDatum, dbo.tblUStVAntrag.UStVAn_VZBetrag, dbo.tblUStVAntrag.UStVAn_RZBetragVZ, dbo.Adressen.Ordnungsbegriff, dbo.Adressen.LandKz, ISNULL ((SELECT SUM(UStVEr_USteuerbetragEUR) AS Expr1 FROM dbo.tblUStVErstattung WHERE (UStVAn_ID = dbo.tblUStVAntrag.UStVAn_ID)), 0) AS Erstattungsbetrag, CASE WHEN ([UStVAn_VZBetrag] - ISNULL([UStVAn_RZBetragVZ], 0) - ISNULL @@ -1466,6 +1469,15 @@ Public Class usrCntlUSTV If dtVorauszahlung.Rows.Count = 0 Then MsgBox("keine Daten!") Exit Sub + Else + For Each col In dtVorauszahlung.Columns + + Dim colName = col.ColumnName.Replace("UStVAn_", "") + + If Not col.ColumnName.Contains(colName) Then col.ColumnName = col.ColumnName.Replace("UStVAn_", "") + + Next + End If diff --git a/SDL/kunden/usrCntlCBAM.vb b/SDL/kunden/usrCntlCBAM.vb index ec626e52..bd911211 100644 --- a/SDL/kunden/usrCntlCBAM.vb +++ b/SDL/kunden/usrCntlCBAM.vb @@ -468,7 +468,9 @@ Public Class usrCntlCBAM ,isnull(max(Empfänger_CN_EORI),'') as EmpfängerEORI ,isnull(max(CN_Name), '') as Empfänger ,isnull(max(Versender_CZ_EORI),'') as AbsenderEORI - ,isnull(max(CZ_Name), '') as Absender" + ,isnull(max(CZ_Name), '') as Absender + ,'' as 'Rechnungsnummer' + ,'' as 'Rechnungsdatum'" Dim SQLSTR = " FROM [tbl_DY_Zollmeldungen_Import] where @@ -541,9 +543,39 @@ Public Class usrCntlCBAM inner join Kunden on Speditionsbuch.[VermittlerKundenNr] = Kunden.KundenNr OR Speditionsbuch.[EmpfängerKundenNr]= Kunden.KundenNr OR Speditionsbuch.[VermittlerKundenNr] = Kunden.KundenNr OR Speditionsbuch.[EmpfängerKundenNr] = Kunden.KundenNr where 1 = 1 AND Kunden.EORITIN = '" & EORI & "' AND BelegNr <> '' AND (Speditionsbuch.[Abfertigungsdatum] BETWEEN '" & txtVon._value & "' and '" & txtBis._value & "' )" & IIf(MRNNr <> "", SQLWhereMRN, "") + Dim ReDaten As New DataTable + + If MRNNr <> "" Then + ReDaten = SQL.loadDgvBySql("SELECT Positionsunterlagenart, Positionsunterlagennummer, Positionsunterlagendatum,Registriernummer_MRN FROM [tbl_DY_Zollmeldungen_Import] WHERE [Positionsunterlagenart] in ('N380','N325') and Registriernummer_MRN IN (" & MRNNr & ")", "AVISO", 600) + End If + + If ReDaten.Rows.Count > 0 Then + dt.Columns("Rechnungsdatum").ReadOnly = False + dt.Columns("Rechnungsnummer").ReadOnly = False + dt.Columns("Rechnungsdatum").MaxLength = -1 + dt.Columns("Rechnungsnummer").MaxLength = -1 + End If - ' MsgBox(SQLSTR) If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then + + For Each r As DataRow In dt.Rows + Dim MDN_NR As String = r("RegistriernummerATLAS") + + ' Look for matching row in dt2 + Dim found() As DataRow = ReDaten.Select("Registriernummer_MRN = '" & MDN_NR & "'") + + If found.Length > 0 Then + Dim rechnugnsdatum As String = found(0)("Positionsunterlagendatum") + If rechnugnsdatum <> "" Then rechnugnsdatum.Replace("00:00:00", "") + r("Rechnungsdatum") = rechnugnsdatum + r("Rechnungsnummer") = found(0)("Positionsunterlagennummer") + Else + r("Rechnungsdatum") = "-" + r("Rechnungsnummer") = "-" + End If + + Next + Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, False, EORI & "_Detailbericht_" & txtVon._value & "-" & txtBis._value) btnCBAM_DS_DAKOSY_Detail.Tag = path btnCBAM_DS_DAKOSY_Detail.Enabled = True @@ -551,8 +583,39 @@ Public Class usrCntlCBAM End If + + If dtGP IsNot Nothing AndAlso dt.Rows.Count > 0 Then + If ReDaten.Rows.Count > 0 Then + dtGP.Columns("invoice date").ReadOnly = False + dtGP.Columns("invoice numbers").ReadOnly = False + dtGP.Columns("invoice date").MaxLength = -1 + dtGP.Columns("invoice numbers").MaxLength = -1 + End If + + For Each r As DataRow In dtGP.Rows + Dim MDN_NR As String = r("declaration no") + + ' Look for matching row in dt2 + Dim found() As DataRow = ReDaten.Select("Registriernummer_MRN = '" & MDN_NR & "'") + + + + If found.Length > 0 Then + + Dim rechnugnsdatum As String = found(0)("Positionsunterlagendatum") + If rechnugnsdatum <> "" Then rechnugnsdatum.Replace("00:00:00", "") + + r("invoice date") = rechnugnsdatum + r("invoice numbers") = found(0)("Positionsunterlagennummer") + Else + r("invoice date") = "-" + r("invoice numbers") = "-" + End If + + Next + btnCBAM_DS_DAKOSY_GP.Tag = "" btnCBAM_DS_DAKOSY_GP.Tag = createExcelForGreenPulse(dtGP, EORI, IIf(AD.Ort <> "", AD.Ort, "")) btnCBAM_DS_DAKOSY_GP.Enabled = True diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index 85d879cd..625c1268 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -213,7 +213,7 @@ txtVorauszahlung.Text = loadValue(KUNDE_ERW.kde_AnmerkungVZ, "") cbxFR.Checked = loadValue(KUNDE_ERW.kde_FR, False) cbxCS_Added.Checked = loadValue(KUNDE_ERW.kde_CSPortfolioAdded, False) - cbxCSInsolvent.Checked = IIf(Not IsDBNull(KUNDE_ERW.kde_CSinsolventAm), True, False) + cbxCSInsolvent.Checked = IIf(Not IsDBNull(KUNDE_ERW.kde_CSinsolventAm) AndAlso KUNDE_ERW.kde_CSinsolventAm IsNot Nothing, True, False) txtFR.Text = loadValue(KUNDE_ERW.kde_AnmerkungFR, "") cbpKopfsammelrechnung.Checked = KUNDE_ERW.kde_Kopfsammelrechnung txtAnmerkungAntraege.Text = loadValue(KUNDE_ERW.kde_AnmerkungAntrag, "") @@ -2362,7 +2362,7 @@ cbxCSInsolvent.Checked = True End If - ElseIf KUNDE_ERW.kde_CSinsolventAm Is Nothing And cbxCSInsolvent.Checked Then + ElseIf KUNDE_ERW.kde_CSinsolventAm Is Nothing AndAlso cbxCSInsolvent.Checked Then MsgBox("Wert kann nicht manuell gesetzt werden!") cbxCSInsolvent.Checked = False End If diff --git a/SDL/mdm/usrCntlMDMAuswertungen.vb b/SDL/mdm/usrCntlMDMAuswertungen.vb index 4623b299..5efae8d3 100644 --- a/SDL/mdm/usrCntlMDMAuswertungen.vb +++ b/SDL/mdm/usrCntlMDMAuswertungen.vb @@ -85,10 +85,27 @@ Public Class usrCntlMDMAuswertungen Folder = NSpace.GetDefaultFolder(Microsoft.Office.Interop.Outlook.OlDefaultFolders.olFolderSentMail) EItem = Folder.Items.Add(Microsoft.Office.Interop.Outlook.OlItemType.olMailItem) - EItem.To = "a.rissbacher@woelfl-trans.at" - EItem.Subject = "Wölfl Rechnungen/Gutschriften" + EItem.To = "a.rissbacher@rmc-service.com" + EItem.CC = "juricevic@verag.ag" + EItem.Subject = "RMC Rechnungen/Gutschriften" - EItem.Attachments.Add(path, OlAttachmentType.olByValue, 1, "WOELFL.csv ") + + Dim accountToSent = "mmdabrechnung@verag.ag" 'bewusst falsch geschrieben!!!! + + + If accountToSent <> "" Then + If outApp.Session.Accounts.Count > 0 Then + For Each oAccount In outApp.Session.Accounts + If oAccount.SmtpAddress = accountToSent Then + EItem.SendUsingAccount = oAccount + Exit For + End If + Next + End If + End If + + + EItem.Attachments.Add(path, OlAttachmentType.olByValue, 1, "RMC.csv ") EItem.Display(False) 'öffnet das 'neue E-Mail-Form' von Outlook diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb index c13314d6..c6c424e6 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb @@ -639,7 +639,7 @@ Public Class cCreditSafeAPI If triggerMail AndAlso sendMail Then Dim ADR As New cAdressen(KUNDE.KundenNr) - Dim empfanegerMail As String = "as@verag.ag" + Dim empfanegerMail As String = "" Select Case firma Case "VERAG" : empfanegerMail = "as@verag.ag" @@ -650,16 +650,12 @@ Public Class cCreditSafeAPI If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then empfanegerMail = "d.breimaier@verag.ag" - VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfanegerMail, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & "CREDITSAFE " & KUNDE.KundenNr, "Änderungen der Creditsafe-Daten von Kunden " & KUNDE.KundenNr & " " & ADR.Ordnungsbegriff & Mailtext.ToString & "

" & "*Automatic generated e-mail*",,,,, "d.breimaier@verag.ag") + If empfanegerMail <> "" Then VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfanegerMail, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & "CREDITSAFE " & KUNDE.KundenNr, "Änderungen der Creditsafe-Daten von Kunden " & KUNDE.KundenNr & " " & ADR.Ordnungsbegriff & Mailtext.ToString & "

" & "*Automatic generated e-mail*",,,,, "d.breimaier@verag.ag") End If 'End if - - - - Return "Anzahl gefundener Datensätze: " & numCompanies End Function @@ -860,7 +856,7 @@ Public Class cCreditSafeAPI If company.kdNr <> 0 Then If triggerMail AndAlso sendMail AndAlso Mailtext <> "" Then Dim ADR As New cAdressen(company.kdNr) - Dim empfanegerMail = "as@verag.ag" + Dim empfanegerMail = "" For Each firmRowTemp As DataRow In dtFirmen.Rows Select Case firmRowTemp("Firma") @@ -871,7 +867,7 @@ Public Class cCreditSafeAPI End Select If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then empfanegerMail = "d.breimaier@verag.ag" - VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfanegerMail, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & "CREDITSAFE " & KUNDE.KundenNr & " (" & firmRowTemp("Firma") & ")", "Änderungen der Creditsafe-Daten von Kunden " & KUNDE.KundenNr & " " & ADR.Ordnungsbegriff & Mailtext.ToString & "

" & "*Automatic generated e-mail*",,,,, "d.breimaier@verag.ag") + If empfanegerMail <> "" Then VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfanegerMail, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & "CREDITSAFE " & KUNDE.KundenNr & " (" & firmRowTemp("Firma") & ")", "Änderungen der Creditsafe-Daten von Kunden " & KUNDE.KundenNr & " " & ADR.Ordnungsbegriff & Mailtext.ToString & "

" & "*Automatic generated e-mail*",,,,, "d.breimaier@verag.ag") Next Mailtext = "" End If From 0dbc85574e1e566331bc4287aba512c70fb7216f Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 29 Sep 2025 15:13:24 +0200 Subject: [PATCH 20/27] kundenuebersicht --- SDL/kunden/usrCntlKundenuebersicht.vb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index 66b8777e..964d3760 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -718,16 +718,10 @@ Public Class usrCntlKundenuebersicht Sub initInsolvent(insolvent) If insolvent IsNot Nothing Then - 'Me.BackColor = Color.Red lblInsolvent.Visible = True lblInsolvent.Text = "KUNDE INSOLVENT " & IIf(IsDate(insolvent), " SEIT " & CDate(insolvent).ToShortDateString, "") - rtbInfo.Visible = True - 'lblTARIFE.ForeColor = Color.White Else - 'Me.BackColor = Color.White lblInsolvent.Visible = False - rtbInfo.Visible = False - 'lblTARIFE.ForeColor = Color.FromArgb(0, 54, 128) End If End Sub From 9dca94b8e5a1a5e1d62580f85134fd5a072f0986 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 29 Sep 2025 15:31:54 +0200 Subject: [PATCH 21/27] Kunedbearbeiten, etc. --- .../frmTimasabfrage.Designer.vb | 42 ++++++++++++++++--- VERAG_PROG_ALLGEMEIN/frmTimasabfrage.vb | 29 +++++++++++-- 2 files changed, 62 insertions(+), 9 deletions(-) diff --git a/VERAG_PROG_ALLGEMEIN/frmTimasabfrage.Designer.vb b/VERAG_PROG_ALLGEMEIN/frmTimasabfrage.Designer.vb index d66262d8..5f1e795e 100644 --- a/VERAG_PROG_ALLGEMEIN/frmTimasabfrage.Designer.vb +++ b/VERAG_PROG_ALLGEMEIN/frmTimasabfrage.Designer.vb @@ -26,6 +26,8 @@ Partial Class frmTimasabfrage Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) + Me.rbHO = New System.Windows.Forms.RadioButton() + Me.rbBuero = New System.Windows.Forms.RadioButton() Me.Button1 = New System.Windows.Forms.Button() Me.cboTyp = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.btnClose = New System.Windows.Forms.Button() @@ -38,6 +40,8 @@ Partial Class frmTimasabfrage ' Me.MyPanel1.BackColor = System.Drawing.Color.White Me.MyPanel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.MyPanel1.Controls.Add(Me.rbHO) + Me.MyPanel1.Controls.Add(Me.rbBuero) Me.MyPanel1.Controls.Add(Me.Button1) Me.MyPanel1.Controls.Add(Me.cboTyp) Me.MyPanel1.Controls.Add(Me.btnClose) @@ -46,15 +50,37 @@ Partial Class frmTimasabfrage Me.MyPanel1.Dock = System.Windows.Forms.DockStyle.Fill Me.MyPanel1.Location = New System.Drawing.Point(0, 0) Me.MyPanel1.Name = "MyPanel1" - Me.MyPanel1.Size = New System.Drawing.Size(264, 84) + Me.MyPanel1.Size = New System.Drawing.Size(264, 103) Me.MyPanel1.TabIndex = 3 ' + 'rbHO + ' + Me.rbHO.AutoSize = True + Me.rbHO.Location = New System.Drawing.Point(76, 46) + Me.rbHO.Name = "rbHO" + Me.rbHO.Size = New System.Drawing.Size(79, 17) + Me.rbHO.TabIndex = 9 + Me.rbHO.TabStop = True + Me.rbHO.Text = "Homeoffice" + Me.rbHO.UseVisualStyleBackColor = True + ' + 'rbBuero + ' + Me.rbBuero.AutoSize = True + Me.rbBuero.Location = New System.Drawing.Point(76, 23) + Me.rbBuero.Name = "rbBuero" + Me.rbBuero.Size = New System.Drawing.Size(47, 17) + Me.rbBuero.TabIndex = 8 + Me.rbBuero.TabStop = True + Me.rbBuero.Text = "Büro" + Me.rbBuero.UseVisualStyleBackColor = True + ' 'Button1 ' Me.Button1.DialogResult = System.Windows.Forms.DialogResult.OK Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) - Me.Button1.Location = New System.Drawing.Point(6, 52) + Me.Button1.Location = New System.Drawing.Point(6, 71) Me.Button1.Margin = New System.Windows.Forms.Padding(0) Me.Button1.Name = "Button1" Me.Button1.Size = New System.Drawing.Size(57, 22) @@ -74,10 +100,11 @@ Partial Class frmTimasabfrage Me.cboTyp.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.cboTyp.FormattingEnabled = True Me.cboTyp.Items.AddRange(New Object() {"", "100000-199999: XXXXXX", "200000-299999: XXXXXX", "300000-399999: XXXXXX", "400000-499999: XXXXXX", "500000-599999: XXXXXX", "600000-699999: XXXXXX", "700000-799999: XXXXXX", "800000-899999: XXXXXX", "900000-999999: XXXXXX"}) - Me.cboTyp.Location = New System.Drawing.Point(79, 23) + Me.cboTyp.Location = New System.Drawing.Point(201, 33) Me.cboTyp.Name = "cboTyp" - Me.cboTyp.Size = New System.Drawing.Size(84, 28) + Me.cboTyp.Size = New System.Drawing.Size(58, 28) Me.cboTyp.TabIndex = 4 + Me.cboTyp.Visible = False ' 'btnClose ' @@ -101,7 +128,7 @@ Partial Class frmTimasabfrage Me.btn.DialogResult = System.Windows.Forms.DialogResult.Cancel Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btn.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) - Me.btn.Location = New System.Drawing.Point(178, 52) + Me.btn.Location = New System.Drawing.Point(178, 71) Me.btn.Margin = New System.Windows.Forms.Padding(0) Me.btn.Name = "btn" Me.btn.Size = New System.Drawing.Size(76, 22) @@ -122,13 +149,14 @@ Partial Class frmTimasabfrage ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(264, 84) + Me.ClientSize = New System.Drawing.Size(264, 103) Me.Controls.Add(Me.MyPanel1) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.Name = "frmTimasabfrage" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "frmDatumsabfrage" Me.MyPanel1.ResumeLayout(False) + Me.MyPanel1.PerformLayout() Me.ResumeLayout(False) End Sub @@ -139,4 +167,6 @@ Partial Class frmTimasabfrage Friend WithEvents Label1 As Label Public WithEvents cboTyp As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents Button1 As Button + Friend WithEvents rbHO As RadioButton + Friend WithEvents rbBuero As RadioButton End Class diff --git a/VERAG_PROG_ALLGEMEIN/frmTimasabfrage.vb b/VERAG_PROG_ALLGEMEIN/frmTimasabfrage.vb index 7663d745..a1500885 100644 --- a/VERAG_PROG_ALLGEMEIN/frmTimasabfrage.vb +++ b/VERAG_PROG_ALLGEMEIN/frmTimasabfrage.vb @@ -1,6 +1,7 @@ Public Class frmTimasabfrage Dim mit As VERAG_PROG_ALLGEMEIN.cMitarbeiter Public Datum As Date = CDate(Now.ToShortDateString) + Public typ As Integer = -1 Sub New() ' Dieser Aufruf ist für den Designer erforderlich. @@ -13,9 +14,6 @@ mit = mit_ End Sub - - - Private Sub frmTimasabfrage(sender As Object, e As EventArgs) Handles Me.Load cboTyp.Items.Clear() @@ -25,8 +23,10 @@ If mit IsNot Nothing Then Label1.Text = "Zeit erfassen für: " & mit.mit_nname & " " & mit.mit_vname If mit.mit_homeoffice Then + rbHO.Checked = True cboTyp.changeItem("Homeoffice") Else + rbHO.Checked = False cboTyp.changeItem("Büro") End If End If @@ -35,4 +35,27 @@ End Sub + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + + If typ = -1 Then + MsgBox("Bitte Typ auswählen") + DialogResult = Windows.Forms.DialogResult.None + Else + DialogResult = Windows.Forms.DialogResult.OK + End If + + End Sub + + Private Sub rbBuero_CheckedChanged(sender As Object, e As EventArgs) Handles rbBuero.CheckedChanged, rbHO.CheckedChanged + + If rbBuero.Checked Then + typ = 0 + ElseIf rbHO.Checked Then + typ = 3 + Else + typ = -1 + End If + + End Sub + End Class \ No newline at end of file From 71a846fc3d75a8f7795d5b042c681dbc2bee7f31 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 29 Sep 2025 15:37:49 +0200 Subject: [PATCH 22/27] Main --- SDL/My Project/AssemblyInfo.vb | 4 ++-- SDL/frmMain.vb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 3e0ce53e..79eb1a99 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/frmMain.vb b/SDL/frmMain.vb index 70a95bca..351cdea4 100644 --- a/SDL/frmMain.vb +++ b/SDL/frmMain.vb @@ -163,7 +163,7 @@ Public Class frmMain f.TopMost = True Else Dim info - timas.setTimeEntry(cAllgemein.MITARBEITER, Now, info, "in", frm.cboTyp._value) + timas.setTimeEntry(cAllgemein.MITARBEITER, Now, info, "in", frm.typ) MsgBox(info) End If From 76f020a09b74c15478e483349f414efe5ae2284a Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 29 Sep 2025 16:19:35 +0200 Subject: [PATCH 23/27] creditsafe --- .../Schnittstellen/Creditsafe/cCreditSafeAPI.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb index c6c424e6..ced129dc 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb @@ -487,7 +487,7 @@ Public Class cCreditSafeAPI Dim failureDesc As String Dim myUrl As String = API_STRING & "/v1/monitoring/companies/" & company.creditSafeId & "/events" & IIf(checklastChecked, "?startDate=" & checkDate, "") - Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token, failureDesc) + Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token, failureDesc, True) If failureDesc <> "" Then If showError Then MsgBox(failureDesc) @@ -679,7 +679,7 @@ Public Class cCreditSafeAPI Dim myUrl As String = API_STRING & "/v1/monitoring/portfolios/1662419/notificationEvents" - Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token, failureDesc, Not companyDetailEvents,,, Not companyDetailEvents, page) + Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token, failureDesc, True,,, True, page) If failureDesc <> "" Then If showError Then MsgBox(failureDesc) From 2cd1a9df808dd320e200c5a8566d8e1f4ee7071f Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 30 Sep 2025 09:03:15 +0200 Subject: [PATCH 24/27] kundenuebersicht, creditsafe-API --- SDL/kunden/usrCntlKundenuebersicht.vb | 2 +- .../Creditsafe/cCreditSafeAPI.vb | 253 ++++++++++-------- 2 files changed, 139 insertions(+), 116 deletions(-) diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index 964d3760..e8e3e473 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -3380,7 +3380,7 @@ Public Class usrCntlKundenuebersicht If currentBonID > 0 Then company.csBonID = currentBonID Dim dt As New DataTable() - If cs.getCompanyEvents(company, dt, True, 0, checklastDate, True) = "Error" Then + If cs.getCompanyEventsDetails(company, dt, checklastDate, True, False) = "Error" Then Exit Sub End If diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb index ced129dc..ab22d36b 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb @@ -5,6 +5,7 @@ Imports System.Net Imports System.Reflection Imports System.Text.RegularExpressions Imports System.Threading +Imports com.sun.source.tree Public Class cCreditSafeAPI @@ -97,7 +98,7 @@ Public Class cCreditSafeAPI - Shared Function SendGetRequestWithAuthHeader(url As String, company As Company, acceptContentType As String, method As String, authenticationToken As String, ByRef failureDesc As String, Optional isMonitoring As Boolean = False, Optional csvImport As Boolean = False, Optional csvFile As String = "", Optional notifEvents As Boolean = False, Optional page As Integer = 0) As String + Shared Function SendGetRequestWithAuthHeader(url As String, company As Company, acceptContentType As String, method As String, authenticationToken As String, ByRef failureDesc As String, Optional csvFile As String = "", Optional page As Integer = 0, Optional type As String = "") As String Try VERAG_PROG_ALLGEMEIN.cChilkat_Helper.UnlockCilkat() @@ -116,15 +117,25 @@ Public Class cCreditSafeAPI Return failureDesc End If - rest.ClearAllQueryParams() + '----------------------------------- + 'aktuelle aufrufe + '----------------------------------- + '"getCompanyEvents" + '"getCompanyEventsDetails" + '"addCompanyToPortfolio" + '"addCompanyToPortfolio_CSV" + '"getCompaniesFromPortfolio" + '"searchCompanies" + '"getReport" + '"getPDF" + '"checkDateOfLastRequest" + '"getSubscriptionCountries" + '----------------------------------- - If company IsNot Nothing Then - setSearchParam(rest, company, isMonitoring, notifEvents, page) + setSearchParam(rest, company, page, type) - End If - - If isMonitoring AndAlso csvFile <> "" Then + If type = "addCompanyToPortfolio_CSV" Then rest.PartSelector = "0" rest.AddHeader("Content-Type", "multipart/form-data") rest.AddHeader("Expect", "100-continue") @@ -135,84 +146,80 @@ Public Class cCreditSafeAPI rest.AddHeader("Authorization", "Bearer " & authenticationToken) - Dim responseJson As String Dim pdfData As New Chilkat.BinData - rest.VerboseLogging = 1 + If type = "addCompanyToPortfolio_CSV" Then - If isMonitoring Then + Dim fileInfo As New FileInfo(csvFile) - If csvImport Then + Dim content As String = File.ReadAllText(csvFile) + Dim fileStream As New Chilkat.Stream + fileStream.SourceFile = csvFile - Dim fileInfo As New FileInfo(csvFile) + rest.PartSelector = "1" + rest.AddHeader("Content-Disposition", "form-data; name=""importcsv""; filename=""importcsv.csv""") + rest.AddHeader("Content-Type", "text/csv") + rest.SetMultipartBodyString("d.breimaier@verag.ag") + rest.SetMultipartBodyStream(fileStream) - Dim content As String = File.ReadAllText(csvFile) - Dim fileStream As New Chilkat.Stream - fileStream.SourceFile = csvFile + rest.PartSelector = "0" - rest.PartSelector = "1" - rest.AddHeader("Content-Disposition", "form-data; name=""importcsv""; filename=""importcsv.csv""") - rest.AddHeader("Content-Type", "text/csv") - rest.SetMultipartBodyStream(fileStream) + Dim strResponseBody As String = rest.FullRequestMultipart(method, url.Replace(API_STRING, "")) + If (rest.LastMethodSuccess <> True) Then + Debug.WriteLine(rest.LastErrorText) + failureDesc = rest.LastErrorText + Return failureDesc + Else - rest.PartSelector = "0" - - Dim strResponseBody As String = rest.FullRequestMultipart(method, url.Replace(API_STRING, "")) - If (rest.LastMethodSuccess <> True) Then - Debug.WriteLine(rest.LastErrorText) - failureDesc = rest.LastErrorText + If (rest.ResponseStatusCode <> 200) Then + failureDesc = rest.ResponseStatusText & IIf(responseJson <> "", vbNewLine & responseJson, "") Return failureDesc Else - If (rest.ResponseStatusCode <> 200) Then - failureDesc = rest.ResponseStatusText & IIf(responseJson <> "", vbNewLine & responseJson, "") - Return failureDesc - Else - - Return responseJson - End If + Return responseJson End If + End If - ElseIf Not notifEvents Then + ElseIf type = "addCompanyToPortfolio" Then - Dim json As New Chilkat.JsonObject - success = json.UpdateString("id", company.creditSafeId) - success = json.UpdateString("personalReference", "VERAG AG") - success = json.UpdateString("freeText", "hinzugefügt am " & Today.ToShortDateString) - success = json.UpdateString("personalLimit", "") + Dim json As New Chilkat.JsonObject + success = json.UpdateString("id", company.creditSafeId) + success = json.UpdateString("personalReference", "VERAG AG") + success = json.UpdateString("freeText", "hinzugefügt am " & Today.ToShortDateString) + success = json.UpdateString("personalLimit", "") - Debug.WriteLine(json.Emit()) + Debug.WriteLine(json.Emit()) - Dim sbRequestBody As New Chilkat.StringBuilder - json.EmitSb(sbRequestBody) + Dim sbRequestBody As New Chilkat.StringBuilder + json.EmitSb(sbRequestBody) - Dim sbResponseBody As New Chilkat.StringBuilder - success = rest.FullRequestSb(method, url, sbRequestBody, sbResponseBody) - If (success <> True) Then - Debug.WriteLine(rest.LastErrorText) - failureDesc = rest.LastErrorText + Dim sbResponseBody As New Chilkat.StringBuilder + success = rest.FullRequestSb(method, url, sbRequestBody, sbResponseBody) + If (success <> True) Then + Debug.WriteLine(rest.LastErrorText) + failureDesc = rest.LastErrorText + Return failureDesc + + Else + + If (rest.ResponseStatusCode <> 200) Then + failureDesc = rest.ResponseStatusText & IIf(responseJson <> "", vbNewLine & responseJson, "") Return failureDesc - Else - If (rest.ResponseStatusCode <> 200) Then - failureDesc = rest.ResponseStatusText & IIf(responseJson <> "", vbNewLine & responseJson, "") - Return failureDesc - Else - - Return responseJson - End If - - + Return responseJson End If + End If + End If - If acceptContentType.Contains("application/pdf") Then + + If acceptContentType.Contains("application/pdf") AndAlso (type = "getReport" Or type = "getPDF") Then 'If acceptContentType.Contains("application/json+pdf") Or acceptContentType.Contains("application/json") Then responseJson = rest.FullRequestNoBodyBd(method, url, pdfData) @@ -313,9 +320,6 @@ Public Class cCreditSafeAPI End Sub - - - Shared Function authenticate(Optional username As String = "", Optional password As String = "") As String Dim myUri As String = API_STRING & "/v1/authenticate" @@ -328,14 +332,13 @@ Public Class cCreditSafeAPI Return response - End Function Shared Function AddCompanyToPortfolio(company As Company, Optional PortfolioID As String = "1662419") As String Dim myUri As String = API_STRING & "/v1/monitoring/portfolios/" & PortfolioID & "/companies" 'Default - Dim jsonRespString = SendGetRequestWithAuthHeader(myUri, company, "application/json", "POST", token, "", True) + Dim jsonRespString = SendGetRequestWithAuthHeader(myUri, company, "application/json", "POST", token, "",,, "addCompanyToPortfolio") Return jsonRespString @@ -345,7 +348,7 @@ Public Class cCreditSafeAPI Dim myUri As String = API_STRING & "/v1/monitoring/portfolios/" & PortfolioID & IIf(sync, "/sync", "/import") 'Default - Dim jsonRespString = SendGetRequestWithAuthHeader(myUri, Nothing, "application/json", "POST", token, "", True, True, csvFilePath) + Dim jsonRespString = SendGetRequestWithAuthHeader(myUri, Nothing, "application/json", "POST", token, "", csvFilePath,, "addCompanyToPortfolio_CSV") Return jsonRespString @@ -355,7 +358,7 @@ Public Class cCreditSafeAPI Dim myUri As String = API_STRING & "/v1/monitoring/portfolios/" & PortfolioID & "/companies" 'Default - Dim jsonRespString = SendGetRequestWithAuthHeader(myUri, Nothing, "application/json", "GET", token, "", False) + Dim jsonRespString = SendGetRequestWithAuthHeader(myUri, Nothing, "application/json", "GET", token, "",,, "getCompaniesFromPortfolio") Dim json As New Chilkat.JsonObject Dim success As Boolean = json.Load(jsonRespString) @@ -367,7 +370,6 @@ Public Class cCreditSafeAPI totalCount = -1 End If - Return jsonRespString End Function @@ -379,7 +381,7 @@ Public Class cCreditSafeAPI Dim failureDesc As String Dim myUrl As String = API_STRING & "/v1/companies" - Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token, failureDesc) + Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token, failureDesc,,, "searchCompanies") Dim json As New Chilkat.JsonObject @@ -487,7 +489,7 @@ Public Class cCreditSafeAPI Dim failureDesc As String Dim myUrl As String = API_STRING & "/v1/monitoring/companies/" & company.creditSafeId & "/events" & IIf(checklastChecked, "?startDate=" & checkDate, "") - Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token, failureDesc, True) + Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token, failureDesc, ,, "getCompanyEventsDetails") If failureDesc <> "" Then If showError Then MsgBox(failureDesc) @@ -679,7 +681,7 @@ Public Class cCreditSafeAPI Dim myUrl As String = API_STRING & "/v1/monitoring/portfolios/1662419/notificationEvents" - Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token, failureDesc, True,,, True, page) + Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token, failureDesc,, page, "getCompanyEvents") If failureDesc <> "" Then If showError Then MsgBox(failureDesc) @@ -915,45 +917,49 @@ Public Class cCreditSafeAPI Dim riskClassChanged As Boolean = False Dim KUNDE_ERW As New cKundenErweitert(KUNDE.KundenNr) + If company.kdNr = 762207 Then + MsgBox("Hier") + End If + If Not (ADR.LandKz = "AT" Or ADR.LandKz = "A") Then 'bei nicht österr. den Index nehmen, sonst den Score - Index = IIf(CR = defaultCL, -1, calculatedBonIndexFromBonScore(CR, riskClass)) - Else - If CR <> defaultCL Then calculatedBonIndexFromBonScore(CR, riskClass) - End If - - If Index <> -1 Then - If KUNDE_ERW.kde_CreditSaveBonitaetsIndex <> Index Then - createInfo("B-INDEX", KUNDE_ERW, KUNDE, Index, riskClass, MailText, triggerMail, setzeKundenbesonderheiten) - KUNDE_ERW.kde_CreditSaveBonitaetsIndex = Index - KUNDE_ERW.kde_CreditSaveBonitaetsklasse = riskClass - KUNDE.Bonitätsdatum = Today() + Index = IIf(CR = defaultCL, -1, calculatedBonIndexFromBonScore(CR, riskClass)) + Else + If CR <> defaultCL Then calculatedBonIndexFromBonScore(CR, riskClass) End If - Else - If KUNDE_ERW.kde_CreditSaveBonitaetsScore <> CR AndAlso CR <> defaultCR Then - createInfo("B-SCORE", KUNDE_ERW, KUNDE, CR, riskClass, MailText, triggerMail, setzeKundenbesonderheiten) - KUNDE_ERW.kde_CreditSaveBonitaetsScore = CR - KUNDE_ERW.kde_CreditSaveBonitaetsklasse = riskClass - KUNDE.Bonitätsdatum = Today() + + If Index <> -1 Then + If KUNDE_ERW.kde_CreditSaveBonitaetsIndex <> Index Then + createInfo("B-INDEX", KUNDE_ERW, KUNDE, Index, riskClass, MailText, triggerMail, setzeKundenbesonderheiten) + KUNDE_ERW.kde_CreditSaveBonitaetsIndex = Index + KUNDE_ERW.kde_CreditSaveBonitaetsklasse = riskClass + KUNDE.Bonitätsdatum = Today() + End If + Else + If KUNDE_ERW.kde_CreditSaveBonitaetsScore <> CR AndAlso CR <> defaultCR Then + createInfo("B-SCORE", KUNDE_ERW, KUNDE, CR, riskClass, MailText, triggerMail, setzeKundenbesonderheiten) + KUNDE_ERW.kde_CreditSaveBonitaetsScore = CR + KUNDE_ERW.kde_CreditSaveBonitaetsklasse = riskClass + KUNDE.Bonitätsdatum = Today() + End If End If - End If - If KUNDE.Höchstkredit <> CL AndAlso CL <> defaultCL Then - createInfo("KREDITLIMIT", KUNDE_ERW, KUNDE, CL, riskClass, MailText, triggerMail, setzeKundenbesonderheiten) - KUNDE.Höchstkredit = CL - If KUNDE.Bonitätsdatum <= CDate(CL_Datum) Then - KUNDE.Bonitätsdatum = Today() + If KUNDE.Höchstkredit <> CL AndAlso CL <> defaultCL Then + createInfo("KREDITLIMIT", KUNDE_ERW, KUNDE, CL, riskClass, MailText, triggerMail, setzeKundenbesonderheiten) + KUNDE.Höchstkredit = CL + If KUNDE.Bonitätsdatum <= CDate(CL_Datum) Then + KUNDE.Bonitätsdatum = Today() + End If End If + + If company.BANKRUPT_REGISTERED AndAlso Not MailText.Contains("FÜR INSOLVENT ERKLÄRT") Then + createInfo("BANKRUPT_REGISTERED", KUNDE_ERW, KUNDE, CL, riskClass, MailText, triggerMail, setzeKundenbesonderheiten, company) + KUNDE_ERW.kde_CSinsolventAm = company.BANKRUPT_REGISTERED_DATE + End If + + If updateKunden Then KUNDE_ERW.SAVE() End If - If company.BANKRUPT_REGISTERED AndAlso Not MailText.Contains("FÜR INSOLVENT ERKLÄRT") Then - createInfo("BANKRUPT_REGISTERED", KUNDE_ERW, KUNDE, CL, riskClass, MailText, triggerMail, setzeKundenbesonderheiten, company) - KUNDE_ERW.kde_CSinsolventAm = company.BANKRUPT_REGISTERED_DATE - End If - - If updateKunden Then KUNDE_ERW.SAVE() - End If - - If updateKunden Then KUNDE.SAVE() + If updateKunden Then KUNDE.SAVE() End If @@ -1120,7 +1126,7 @@ Public Class cCreditSafeAPI - Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, Nothing, acceptContentType, "GET", token, failureDesc) + Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, Nothing, acceptContentType, "GET", token, failureDesc,,, "getReport") If failureDesc <> "" Then Return failureDesc Dim json As New Chilkat.JsonObject @@ -1294,7 +1300,7 @@ Public Class cCreditSafeAPI Dim acceptContentType = "application/pdf" Dim pdfData2 As New Chilkat.BinData Dim failureDesc As String = "" - Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, Nothing, acceptContentType, "GET", token, failureDesc) + Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, Nothing, acceptContentType, "GET", token, failureDesc,,, "getPDF") If failureDesc <> "" Then Dim jsonFailure As New Chilkat.JsonObject @@ -1329,7 +1335,7 @@ Public Class cCreditSafeAPI Dim company Dim failureDesc As String Dim myUrl As String = API_STRING & "/v1/access" - Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token, failureDesc) + Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token, failureDesc,,, "getSubscriptionCountries") Dim json As New Chilkat.JsonObject success = json.Load(jsonRespString) @@ -1375,34 +1381,45 @@ Public Class cCreditSafeAPI End Function - Shared Sub setSearchParam(ByRef rest As Chilkat.Rest, ByRef company As Company, ByRef isMonitoring As Boolean, isNotEvent As Boolean, Optional page As Integer = 0) + Shared Sub setSearchParam(ByRef rest As Chilkat.Rest, ByRef company As Company, Optional page As Integer = 0, Optional type As String = "") + + + Dim setCompanyQueryParam As Boolean = False + + rest.ClearAllQueryParams() If company IsNot Nothing Then - If isMonitoring Then - - If isNotEvent Then - + Select Case type + Case "getCompanyEvents" rest.AddQueryParam("sortBy", "companyName") rest.AddQueryParam("sortDir", "asc") If company.lastChecked >= Today.AddYears(-50) Then - rest.AddQueryParam("startDate", company.lastChecked.ToString("yyyy-MM-ddTHH:mm:ss")) rest.AddQueryParam("endDate", Now().ToString("yyyy-MM-ddTHH:mm:ss")) rest.AddQueryParam("filterByCreatedDate", "true") rest.AddQueryParam("pageSize", "1000") 'maximum rest.AddQueryParam("page", page) End If + Case "getCompanyEventsDetails" + 'Start and Enddate in URL! + Case "addCompanyToPortfolio" + 'NIX + Case "addCompanyToPortfolio_CSV" + 'NIX + Case "getCompaniesFromPortfolio" : setCompanyQueryParam = True + Case "searchCompanies" : setCompanyQueryParam = True + Case "getReport" : setCompanyQueryParam = True + Case "getPDF" : setCompanyQueryParam = True + Case "checkDateOfLastRequest" : setCompanyQueryParam = True + Case "getSubscriptionCountries" : setCompanyQueryParam = True + End Select - End If - - - Else + If setCompanyQueryParam Then rest.AddQueryParam("countries", company.country) - If company.creditsafeNo <> "" Then 'Eindeutiger Schlüssel rest.AddQueryParam("safeNo", company.creditsafeNo) @@ -1424,16 +1441,18 @@ Public Class cCreditSafeAPI End If + End If + End Sub Shared Function checkDateOfLastRequest(company As Company) As Date Dim failureDesc As String Dim myUrl As String = API_STRING & "/v1/companies" - Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token, failureDesc) + Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token, failureDesc,,, "checkDateOfLastRequest") Dim json As New Chilkat.JsonObject Dim success As Boolean = json.Load(jsonRespString) @@ -1485,6 +1504,8 @@ Public Class cCreditSafeAPI riskClass = "D" Case 1 To 14 riskClass = "D" + Case -10000000 + riskClass = "" Case Else riskClass = "E" End Select @@ -1575,6 +1596,8 @@ Public Class cCreditSafeAPI Return 1.1 Case 99 To 100 Return 1 + Case -10000000 + Return -1 Case Else Return 6 End Select From 3ab0138792271e15229d343f4264e56d16c6f632 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 30 Sep 2025 15:07:34 +0200 Subject: [PATCH 25/27] creditsafe, IDS, etc. --- SDL/kunden/usrCntlIDSPreise.Designer.vb | 59 +++-- SDL/kunden/usrCntlIDSPreise.vb | 246 ++++++++++-------- SDL/kunden/usrCntlKundenuebersicht.vb | 8 +- .../Creditsafe/cCreditSafeAPI.vb | 106 ++++---- 4 files changed, 240 insertions(+), 179 deletions(-) diff --git a/SDL/kunden/usrCntlIDSPreise.Designer.vb b/SDL/kunden/usrCntlIDSPreise.Designer.vb index cdbbc84c..f869c568 100644 --- a/SDL/kunden/usrCntlIDSPreise.Designer.vb +++ b/SDL/kunden/usrCntlIDSPreise.Designer.vb @@ -25,7 +25,7 @@ Partial Class usrCntlIDSPreise Me.components = New System.ComponentModel.Container() Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.lblIDS = New System.Windows.Forms.TextBox() - Me.dgvOfferteDetails = New System.Windows.Forms.DataGridView() + Me.dgvIDSData = New System.Windows.Forms.DataGridView() Me.cntxtAddSdl = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.btnOfferteSpeichern = New System.Windows.Forms.Button() @@ -38,7 +38,8 @@ Partial Class usrCntlIDSPreise Me.dgvFILTER = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Label1 = New System.Windows.Forms.Label() Me.btnRW = New System.Windows.Forms.Button() - CType(Me.dgvOfferteDetails, System.ComponentModel.ISupportInitialize).BeginInit() + Me.btnAdd = New System.Windows.Forms.Button() + CType(Me.dgvIDSData, System.ComponentModel.ISupportInitialize).BeginInit() Me.cntxtAddSdl.SuspendLayout() CType(Me.dgvIDS, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvFILTER, System.ComponentModel.ISupportInitialize).BeginInit() @@ -57,26 +58,26 @@ Partial Class usrCntlIDSPreise Me.lblIDS.TabIndex = 0 Me.lblIDS.Text = "IDS" ' - 'dgvOfferteDetails + 'dgvIDSData ' - Me.dgvOfferteDetails.AllowUserToAddRows = False - Me.dgvOfferteDetails.AllowUserToDeleteRows = False - Me.dgvOfferteDetails.AllowUserToOrderColumns = True - Me.dgvOfferteDetails.AllowUserToResizeRows = False + Me.dgvIDSData.AllowUserToAddRows = False + Me.dgvIDSData.AllowUserToDeleteRows = False + Me.dgvIDSData.AllowUserToOrderColumns = True + Me.dgvIDSData.AllowUserToResizeRows = False DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOfferteDetails.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 - Me.dgvOfferteDetails.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Me.dgvIDSData.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + Me.dgvIDSData.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.dgvOfferteDetails.BackgroundColor = System.Drawing.Color.White - Me.dgvOfferteDetails.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - Me.dgvOfferteDetails.Location = New System.Drawing.Point(182, 63) - Me.dgvOfferteDetails.MultiSelect = False - Me.dgvOfferteDetails.Name = "dgvOfferteDetails" - Me.dgvOfferteDetails.RowHeadersVisible = False - Me.dgvOfferteDetails.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvOfferteDetails.Size = New System.Drawing.Size(981, 444) - Me.dgvOfferteDetails.TabIndex = 5 + Me.dgvIDSData.BackgroundColor = System.Drawing.Color.White + Me.dgvIDSData.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing + Me.dgvIDSData.Location = New System.Drawing.Point(182, 63) + Me.dgvIDSData.MultiSelect = False + Me.dgvIDSData.Name = "dgvIDSData" + Me.dgvIDSData.RowHeadersVisible = False + Me.dgvIDSData.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvIDSData.Size = New System.Drawing.Size(981, 444) + Me.dgvIDSData.TabIndex = 5 ' 'cntxtAddSdl ' @@ -238,11 +239,26 @@ Partial Class usrCntlIDSPreise Me.btnRW.UseVisualStyleBackColor = True Me.btnRW.Visible = False ' + 'btnAdd + ' + Me.btnAdd.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnAdd.BackgroundImage = Global.SDL.My.Resources.Resources.plus + Me.btnAdd.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnAdd.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnAdd.ForeColor = System.Drawing.Color.Black + Me.btnAdd.Location = New System.Drawing.Point(869, 3) + Me.btnAdd.Name = "btnAdd" + Me.btnAdd.Size = New System.Drawing.Size(36, 28) + Me.btnAdd.TabIndex = 37 + Me.btnAdd.Tag = "" + Me.btnAdd.UseVisualStyleBackColor = True + ' 'usrCntlIDSPreise ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White + Me.Controls.Add(Me.btnAdd) Me.Controls.Add(Me.btnRW) Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.dgvFILTER) @@ -254,11 +270,11 @@ Partial Class usrCntlIDSPreise Me.Controls.Add(Me.btnOfferteSpeichern) Me.Controls.Add(Me.btnEditIDS) Me.Controls.Add(Me.lblIDS) - Me.Controls.Add(Me.dgvOfferteDetails) + Me.Controls.Add(Me.dgvIDSData) Me.Margin = New System.Windows.Forms.Padding(2) Me.Name = "usrCntlIDSPreise" Me.Size = New System.Drawing.Size(1173, 576) - CType(Me.dgvOfferteDetails, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.dgvIDSData, System.ComponentModel.ISupportInitialize).EndInit() Me.cntxtAddSdl.ResumeLayout(False) CType(Me.dgvIDS, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.dgvFILTER, System.ComponentModel.ISupportInitialize).EndInit() @@ -267,7 +283,7 @@ Partial Class usrCntlIDSPreise End Sub Friend WithEvents lblIDS As System.Windows.Forms.TextBox - Friend WithEvents dgvOfferteDetails As System.Windows.Forms.DataGridView + Friend WithEvents dgvIDSData As System.Windows.Forms.DataGridView Friend WithEvents btnEditIDS As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents cntxtAddSdl As ContextMenuStrip Friend WithEvents DToolStripMenuItem As ToolStripMenuItem @@ -280,4 +296,5 @@ Partial Class usrCntlIDSPreise Friend WithEvents dgvFILTER As VERAG_PROG_ALLGEMEIN.MyDatagridview Friend WithEvents Label1 As Label Friend WithEvents btnRW As Button + Friend WithEvents btnAdd As Button End Class diff --git a/SDL/kunden/usrCntlIDSPreise.vb b/SDL/kunden/usrCntlIDSPreise.vb index e883df91..b255b93b 100644 --- a/SDL/kunden/usrCntlIDSPreise.vb +++ b/SDL/kunden/usrCntlIDSPreise.vb @@ -38,13 +38,31 @@ Public Class usrCntlIDSPreise Sub initfilterColumnsWidth() - If dgvFILTER.ColumnCount > 0 AndAlso dgvFILTER.ColumnCount = dgvOfferteDetails.ColumnCount Then + If dgvFILTER.ColumnCount > 0 AndAlso dgvFILTER.ColumnCount = dgvIDSData.ColumnCount Then - dgvFILTER.Width = dgvOfferteDetails.Width - For Each c As DataGridViewColumn In dgvOfferteDetails.Columns + dgvFILTER.Width = dgvIDSData.Width + For Each c As DataGridViewColumn In dgvIDSData.Columns dgvFILTER.Columns(c.Index).Width = c.Width Next + If Not dgvInitWait Then + + If dgvIDS.SelectedCells.Count > 0 Then + + Select Case cbxTypes._value + Case "LK", "L", "LS", "LSK" + If dgvIDS.SelectedCells(0).RowIndex > -1 AndAlso dgvIDS.Rows(dgvIDS.SelectedCells(0).RowIndex).Cells("OutletCountryCode").Value > 0 Then + Dim row As DataGridViewRow = dgvFILTER.Rows(0) + row.Cells("OutletCountryCode").Value = dgvIDS.Rows(dgvIDS.SelectedCells(0).RowIndex).Cells("OutletCountryCode").Value + Else + dgvFILTER.Rows(0).Cells("OutletCountryCode").Value = Nothing + End If + End Select + End If + End If + + + If kdNr_filter Then Select Case cbxTypes._value Case "LSK", "LK" : initKDFilter() @@ -56,6 +74,8 @@ Public Class usrCntlIDSPreise End Sub + + Sub initFilter() dgvInitWait = True @@ -68,7 +88,7 @@ Public Class usrCntlIDSPreise End Try - Dim sortedCols = dgvOfferteDetails.Columns.Cast(Of DataGridViewColumn)() _ + Dim sortedCols = dgvIDSData.Columns.Cast(Of DataGridViewColumn)() _ .OrderBy(Function(c) c.DisplayIndex) For Each c As DataGridViewColumn In sortedCols @@ -102,7 +122,7 @@ Public Class usrCntlIDSPreise ' pnlTest.Controls.Add(dgv) ' dgv.Top = 0 ' dgv.Left = 0 - dgvFILTER.Width = dgvOfferteDetails.Width + dgvFILTER.Width = dgvIDSData.Width If kdNr_filter Then initKDFilter() End If @@ -119,7 +139,7 @@ Public Class usrCntlIDSPreise If cbxTypes._value = "" Then Exit Sub - With dgvOfferteDetails + With dgvIDSData Dim SQL_ = "" Dim SQL_WHERE = "" @@ -135,7 +155,7 @@ Public Class usrCntlIDSPreise ' clearFilter() End If - dgvOfferteDetails.Columns.Clear() + dgvIDSData.Columns.Clear() Select Case cbxTypes._value Case "L" @@ -195,57 +215,58 @@ Public Class usrCntlIDSPreise Next .DataSource = IDSDIESEL_Bind.bindingdataTable + .AllowUserToAddRows = False Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try - If edit Then + 'If edit Then - Select Case cbxTypes._value - Case "L" - SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID, tbl_IDS_Rechenwerte.OutletCountryCode,tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.ProductTypeCode,tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter - FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN tbl_IDS_Rechenwerte ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode - WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode & ") ", ") ") & SQL_WHERE & " - ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" + ' Select Case cbxTypes._value + ' Case "L" + ' SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID, tbl_IDS_Rechenwerte.OutletCountryCode,tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.ProductTypeCode,tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter + ' FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN tbl_IDS_Rechenwerte ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode + ' WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode & ") ", ") ") & SQL_WHERE & " + ' ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" - Case "LS" - SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID,tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Stationen.OutletName,tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter - FROM tbl_IDS_Produkte - INNER JOIN (tbl_IDS_Länder - INNER JOIN (tbl_IDS_Stationen - INNER JOIN tbl_IDS_Rechenwerte ON (tbl_IDS_Stationen.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) AND (tbl_IDS_Stationen.OutletCode = tbl_IDS_Rechenwerte.OutletCode)) ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) - ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode - WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode & ") ", ") ") & SQL_WHERE & " - ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" + ' Case "LS" + ' SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID,tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Stationen.OutletName,tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter + ' FROM tbl_IDS_Produkte + ' INNER JOIN (tbl_IDS_Länder + ' INNER JOIN (tbl_IDS_Stationen + ' INNER JOIN tbl_IDS_Rechenwerte ON (tbl_IDS_Stationen.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) AND (tbl_IDS_Stationen.OutletCode = tbl_IDS_Rechenwerte.OutletCode)) ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) + ' ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode + ' WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode & ") ", ") ") & SQL_WHERE & " + ' ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" - Case "LK" + ' Case "LK" - FUNC.dgvCellToCbo(dgvOfferteDetails, 1, "OutletCountryCode", "OutletCountryCode", " SELECT [OutletCountryCode], OutletCountry FROM [tbl_IDS_Länder] ORDER BY OutletCountry ", "FMZOLL", 150) - 'FUNC.dgvCellToCbo(dgvOfferteDetails, 5, "BGebLeist.", "BGebLeistungsNr", " SELECT [LeistungsNr], CAST(LeistungsNr as varchar(3)) + ' - ' + [LeistungsBez] as LeistungsBez FROM [Leistungen] ORDER BY [LeistungsNr] ", "FMZOLL", 250) + ' FUNC.dgvCellToCbo(dgvIDSData, 1, "OutletCountryCode", "OutletCountryCode", " SELECT [OutletCountryCode], OutletCountry FROM [tbl_IDS_Länder] ORDER BY OutletCountry ", "FMZOLL", 150) + ' 'FUNC.dgvCellToCbo(dgvOfferteDetails, 5, "BGebLeist.", "BGebLeistungsNr", " SELECT [LeistungsNr], CAST(LeistungsNr as varchar(3)) + ' - ' + [LeistungsBez] as LeistungsBez FROM [Leistungen] ORDER BY [LeistungsNr] ", "FMZOLL", 250) - Case "LSK" - SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID,tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Länder.OutletCountry,tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.CustomerCode,Adressen.Ordnungsbegriff AS CustomerName, tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter - FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN (Adressen INNER JOIN (tbl_IDS_Stationen INNER JOIN tbl_IDS_Rechenwerte ON (tbl_IDS_Stationen.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) AND (tbl_IDS_Stationen.OutletCode = tbl_IDS_Rechenwerte.OutletCode)) ON Adressen.AdressenNr = tbl_IDS_Rechenwerte.CustomerCode) ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode - WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Not Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode & ") ", ") ") & SQL_WHERE & " - ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, Adressen.Ordnungsbegriff, tbl_IDS_Rechenwerte.CustomerCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" + ' Case "LSK" + ' SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID,tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Länder.OutletCountry,tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.CustomerCode,Adressen.Ordnungsbegriff AS CustomerName, tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter + ' FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN (Adressen INNER JOIN (tbl_IDS_Stationen INNER JOIN tbl_IDS_Rechenwerte ON (tbl_IDS_Stationen.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) AND (tbl_IDS_Stationen.OutletCode = tbl_IDS_Rechenwerte.OutletCode)) ON Adressen.AdressenNr = tbl_IDS_Rechenwerte.CustomerCode) ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode + ' WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Not Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode & ") ", ") ") & SQL_WHERE & " + ' ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, Adressen.Ordnungsbegriff, tbl_IDS_Rechenwerte.CustomerCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" - Case "KRW" - SQL_ = "SELECT tbl_IDS_Kategorien_Rechenwerte.ID as ID, tbl_IDS_Kategorien_Rechenwerte.KategorieNr, tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Kategorien_Rechenwerte.Rechenwert, tbl_IDS_Kategorien_Rechenwerte.Zeitstempel, tbl_IDS_Kategorien_Rechenwerte.Sachbearbeiter - FROM tbl_IDS_Produkte INNER JOIN tbl_IDS_Kategorien_Rechenwerte ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode - WHERE 1 = 1 " & SQL_WHERE & " - ORDER BY tbl_IDS_Kategorien_Rechenwerte.KategorieNr, tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode;" + ' Case "KRW" + ' SQL_ = "SELECT tbl_IDS_Kategorien_Rechenwerte.ID as ID, tbl_IDS_Kategorien_Rechenwerte.KategorieNr, tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Kategorien_Rechenwerte.Rechenwert, tbl_IDS_Kategorien_Rechenwerte.Zeitstempel, tbl_IDS_Kategorien_Rechenwerte.Sachbearbeiter + ' FROM tbl_IDS_Produkte INNER JOIN tbl_IDS_Kategorien_Rechenwerte ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode + ' WHERE 1 = 1 " & SQL_WHERE & " + ' ORDER BY tbl_IDS_Kategorien_Rechenwerte.KategorieNr, tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode;" - Case "KOR" - SQL_ = "SELECT tbl_IDS_Kunden_ohne_Rabatt.CustomerCode, tbl_IDS_Kunden_ohne_Rabatt.Zeitstempel, tbl_IDS_Kunden_ohne_Rabatt.Sachbearbeiter - FROM tbl_IDS_Kunden_ohne_Rabatt - WHERE 1 = 1 " & SQL_WHERE & " - ORDER BY tbl_IDS_Kunden_ohne_Rabatt.CustomerCode;" + ' Case "KOR" + ' SQL_ = "SELECT tbl_IDS_Kunden_ohne_Rabatt.CustomerCode, tbl_IDS_Kunden_ohne_Rabatt.Zeitstempel, tbl_IDS_Kunden_ohne_Rabatt.Sachbearbeiter + ' FROM tbl_IDS_Kunden_ohne_Rabatt + ' WHERE 1 = 1 " & SQL_WHERE & " + ' ORDER BY tbl_IDS_Kunden_ohne_Rabatt.CustomerCode;" - End Select - End If + ' End Select + 'End If '.DataSource = SQL.loadDgvBySql(" SELECT [LeistungsNr],[LeistungsBez],[BerechnungsartNr],[Preis],[Anzahl],[BGebLeistungsNr],[BGebProzent],[BGebMinBetrag],[Eingegeben am],[Geändert am],[Sachbearbeiter],[PreisänderungProzent],[PreisAlt],[Preisänderung] " & @@ -302,7 +323,7 @@ Public Class usrCntlIDSPreise 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 + If c.Value IsNot Nothing Then Dim srchstr = getSqlText(c.Value.ToString.Trim) 'MsgBox(c.OwningColumn.DataPropertyName) If c.OwningColumn.Name.Contains("ProductTypeCode") Then @@ -344,6 +365,7 @@ Public Class usrCntlIDSPreise 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 @@ -371,9 +393,9 @@ Public Class usrCntlIDSPreise If dgvIDS.SelectedCells.Count > 0 Then If dgvIDS.SelectedCells(0).RowIndex > -1 AndAlso dgvIDS.Rows(dgvIDS.SelectedCells(0).RowIndex).Cells("OutletCountryCode").Value > 0 Then - initDGVDieselpreiseDetails(dgvIDS.Rows(dgvIDS.SelectedCells(0).RowIndex).Cells("OutletCountryCode").Value) + initDGVDieselpreiseDetails(dgvIDS.Rows(dgvIDS.SelectedCells(0).RowIndex).Cells("OutletCountryCode").Value, True) Else - initDGVDieselpreiseDetails() + initDGVDieselpreiseDetails(, True) End If End If @@ -442,7 +464,7 @@ Public Class usrCntlIDSPreise .Columns("OutletCountryCode").Visible = False End With 'EnableDoubleBuffered(dgvOfferteDetails) - dgvOfferteDetails.Columns.Clear() + dgvIDSData.Columns.Clear() dgvIDS.ClearSelection() initDGVDieselpreiseDetails() @@ -464,11 +486,11 @@ Public Class usrCntlIDSPreise Sub initDGVWidth() Dim DGVwidth = 0 Dim reduceWidth = 0 - For Each c As DataGridViewColumn In dgvOfferteDetails.Columns + For Each c As DataGridViewColumn In dgvIDSData.Columns DGVwidth += c.Width Next Dim DGVheight = 0 - For Each r As DataGridViewRow In dgvOfferteDetails.Rows + For Each r As DataGridViewRow In dgvIDSData.Rows DGVheight += r.Height Next DGVheight += 50 @@ -488,7 +510,7 @@ Public Class usrCntlIDSPreise End Sub - Private Sub dgvOfferteDetails_CellValueChanged(sender As Object, e As DataGridViewCellEventArgs) Handles dgvOfferteDetails.CellValueChanged + Private Sub dgvOfferteDetails_CellValueChanged(sender As Object, e As DataGridViewCellEventArgs) Handles dgvIDSData.CellValueChanged Try Select Case cbxTypes._value Case "L", "LS", "LSK", "KRW", "LSK", "LK" @@ -496,34 +518,6 @@ Public Class usrCntlIDSPreise If currentIDS IsNot Nothing Then currentIDS.Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME currentIDS.Zeitstempel = Now - - Select Case cbxTypes._value - Case "L" - Select Case dgvOfferteDetails.CurrentCell.ColumnIndex - ' Case 0 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso IsNumeric(dgvOfferteDetails.CurrentCell.Value) Then currentIDS.OutletCode = CInt(dgvOfferteDetails.CurrentCell.Value) - Case 5 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso IsNumeric(dgvOfferteDetails.CurrentCell.Value) Then currentIDS.Rechenwert = CDbl(dgvOfferteDetails.CurrentCell.Value) - Case 6 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso dgvOfferteDetails.CurrentCell.Value <> "" AndAlso (dgvOfferteDetails.CurrentCell.Value = "R" Or dgvOfferteDetails.CurrentCell.Value = "P") Then currentIDS.Kz = dgvOfferteDetails.CurrentCell.Value.ToString - End Select - - Case "LS" - - Select Case dgvOfferteDetails.CurrentCell.ColumnIndex - Case 5 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso IsNumeric(dgvOfferteDetails.CurrentCell.Value) Then currentIDS.Rechenwert = CDbl(dgvOfferteDetails.CurrentCell.Value) - Case 6 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso dgvOfferteDetails.CurrentCell.Value <> "" AndAlso (dgvOfferteDetails.CurrentCell.Value = "R" Or dgvOfferteDetails.CurrentCell.Value = "P") Then currentIDS.Kz = dgvOfferteDetails.CurrentCell.Value.ToString - End Select - - Case "LK" - - Select Case dgvOfferteDetails.CurrentCell.ColumnIndex - Case 1 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso IsNumeric(dgvOfferteDetails.CurrentCell.Value) Then currentIDS.OutletCode = CInt(dgvOfferteDetails.CurrentCell.Value) - 'Case 2 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso dgvOfferteDetails.CurrentCell.Value <> "" Then dgvOfferteDetails.CurrentRow.Cells("").Value = - Case 5 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso IsNumeric(dgvOfferteDetails.CurrentCell.Value) Then currentIDS.Rechenwert = CDbl(dgvOfferteDetails.CurrentCell.Value) - Case 6 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso dgvOfferteDetails.CurrentCell.Value <> "" AndAlso (dgvOfferteDetails.CurrentCell.Value = "R" Or dgvOfferteDetails.CurrentCell.Value = "P") Then currentIDS.Kz = dgvOfferteDetails.CurrentCell.Value.ToString - End Select - - - End Select - DGVHasChaged = True If currentIDS.SAVE() Then @@ -578,14 +572,14 @@ Public Class usrCntlIDSPreise Private Sub checkPerimissionsDGVDetails() Try - With dgvOfferteDetails + With dgvIDSData If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("DIESELPREISE_BEARBEITEN", "SDL") Then For Each c As DataGridViewColumn In .Columns c.ReadOnly = True handleEditMode(False) Next - dgvOfferteDetails.AllowUserToDeleteRows = False + dgvIDSData.AllowUserToDeleteRows = False Else For Each c As DataGridViewColumn In .Columns @@ -607,7 +601,7 @@ Public Class usrCntlIDSPreise End If Next - dgvOfferteDetails.AllowUserToDeleteRows = False + dgvIDSData.AllowUserToDeleteRows = False End If End With @@ -624,7 +618,7 @@ Public Class usrCntlIDSPreise dgvIDS.Enabled = False 'currentOffert = New VERAG_PROG_ALLGEMEIN.cOfferte(dgvIDS.SelectedRows(0).Cells("OffertenNr").Value, False) - Dim orgDataTable As DataTable = dgvOfferteDetails.DataSource + Dim orgDataTable As DataTable = dgvIDSData.DataSource tmpDataTable = orgDataTable.Copy Catch ex As Exception @@ -642,9 +636,9 @@ Public Class usrCntlIDSPreise dgvIDS.ReadOnly = True Else - dgvOfferteDetails.AllowUserToAddRows = True - dgvOfferteDetails.AllowUserToDeleteRows = True - dgvOfferteDetails.RowHeadersVisible = True + dgvIDSData.AllowUserToAddRows = True + dgvIDSData.AllowUserToDeleteRows = True + dgvIDSData.RowHeadersVisible = True End If @@ -661,7 +655,7 @@ Public Class usrCntlIDSPreise If isInEditMode Then dgvIDS.Enabled = False - dgvOfferteDetails.ReadOnly = False + dgvIDSData.ReadOnly = False btnOfferteSpeichern.Enabled = True btnCloseEditMode.Visible = True cbxTypes.Enabled = False @@ -669,7 +663,7 @@ Public Class usrCntlIDSPreise Else dgvIDS.Enabled = True - dgvOfferteDetails.ReadOnly = True + dgvIDSData.ReadOnly = True btnOfferteSpeichern.Enabled = False btnCloseEditMode.Visible = False cbxTypes.Enabled = True @@ -679,14 +673,14 @@ Public Class usrCntlIDSPreise End Sub - Private Sub dgvOfferteDetails_UserDeletingRow(sender As Object, e As DataGridViewRowCancelEventArgs) Handles dgvOfferteDetails.UserDeletingRow + Private Sub dgvOfferteDetails_UserDeletingRow(sender As Object, e As DataGridViewRowCancelEventArgs) Handles dgvIDSData.UserDeletingRow DGVHasChaged = True End Sub - Private Sub dgvOfferteDetails_KeyUp(sender As Object, e As KeyEventArgs) Handles dgvOfferteDetails.KeyUp + Private Sub dgvOfferteDetails_KeyUp(sender As Object, e As KeyEventArgs) Handles dgvIDSData.KeyUp If e.KeyCode = Keys.Tab Then - dgvOfferteDetails.CurrentCell = GetNextCell(dgvOfferteDetails.CurrentCell) + dgvIDSData.CurrentCell = GetNextCell(dgvIDSData.CurrentCell) e.Handled = True End If @@ -699,13 +693,13 @@ Public Class usrCntlIDSPreise Dim nextCell As DataGridViewCell = currentCell Dim j = 0 Do - Dim nextCellIndex As Integer = (nextCell.ColumnIndex + j) Mod dgvOfferteDetails.ColumnCount - Dim nextRowIndex As Integer = If(nextCellIndex = 0, (nextCell.RowIndex + 1) Mod dgvOfferteDetails.RowCount, nextCell.RowIndex) + Dim nextCellIndex As Integer = (nextCell.ColumnIndex + j) Mod dgvIDSData.ColumnCount + Dim nextRowIndex As Integer = If(nextCellIndex = 0, (nextCell.RowIndex + 1) Mod dgvIDSData.RowCount, nextCell.RowIndex) 'lblIDS.Text = "C" & nextCellIndex & "R" & nextRowIndex & "RO" & IIf(nextCell.[ReadOnly], "1", "0") & "H" & IIf(Not nextCell.Visible, "1", "0") - nextCell = dgvOfferteDetails.Rows(nextRowIndex).Cells(nextCellIndex) + nextCell = dgvIDSData.Rows(nextRowIndex).Cells(nextCellIndex) i += 1 j = 1 - Loop While (i < (dgvOfferteDetails.RowCount * dgvOfferteDetails.ColumnCount) AndAlso (nextCell.[ReadOnly]) Or i < (dgvOfferteDetails.RowCount * dgvOfferteDetails.ColumnCount) AndAlso Not nextCell.Visible) + Loop While (i < (dgvIDSData.RowCount * dgvIDSData.ColumnCount) AndAlso (nextCell.[ReadOnly]) Or i < (dgvIDSData.RowCount * dgvIDSData.ColumnCount) AndAlso Not nextCell.Visible) Return nextCell @@ -749,14 +743,14 @@ Public Class usrCntlIDSPreise checkPerimissionsDGVDetails() End Sub - Private Sub dgvOfferteDetails_SelectionChanged(sender As Object, e As EventArgs) Handles dgvOfferteDetails.SelectionChanged + Private Sub dgvOfferteDetails_SelectionChanged(sender As Object, e As EventArgs) Handles dgvIDSData.SelectionChanged - If dgvOfferteDetails.Columns.Contains("ID") Then + If dgvIDSData.Columns.Contains("ID") Then - If dgvOfferteDetails.SelectedCells.Count > 0 Then + If dgvIDSData.SelectedCells.Count > 0 Then - If dgvOfferteDetails.SelectedCells(0).RowIndex > -1 Then - currentIDS = New cIDSDieselpreisRW(dgvOfferteDetails.Rows(dgvOfferteDetails.SelectedCells(0).RowIndex).Cells("ID").Value) + If dgvIDSData.SelectedCells(0).RowIndex > -1 Then + currentIDS = New cIDSDieselpreisRW(dgvIDSData.Rows(dgvIDSData.SelectedCells(0).RowIndex).Cells("ID").Value) End If End If @@ -775,7 +769,7 @@ Public Class usrCntlIDSPreise '2. Check ob der Quellkunde Einträge besitzt! -> nein -> abbrechen '3. alle Einträge durchlaufen und insert_into - If dgvOfferteDetails.Rows.Count > 0 Then + If dgvIDSData.Rows.Count > 0 Then Dim newRWKunde As Integer = 0 @@ -834,7 +828,7 @@ Public Class usrCntlIDSPreise End Sub - Private Sub dgvOfferteDetails_ColumnWidthChanged(sender As Object, e As DataGridViewColumnEventArgs) Handles dgvOfferteDetails.ColumnWidthChanged + Private Sub dgvOfferteDetails_ColumnWidthChanged(sender As Object, e As DataGridViewColumnEventArgs) Handles dgvIDSData.ColumnWidthChanged initfilterColumnsWidth() End Sub @@ -866,7 +860,21 @@ Public Class usrCntlIDSPreise End If + Dim enableButtonAdd As Boolean = True + For Each col As DataGridViewColumn In dgvFILTER.Columns + Dim colName As String = dgvFILTER.Columns(col.Index).Name + Dim value As String = dgvFILTER.Rows(0).Cells(col.Index).Value + Dim isVisible As Boolean = dgvFILTER.Rows(0).Cells(col.Index).Visible + + 'Prüfung ob alle Pflichtfelder ausgefüllt sind. + If (colName.Contains("Code") Or colName.Contains("Kz") Or colName.Contains("Rechenwert")) AndAlso (value Is Nothing Or value = "") AndAlso isVisible Then + enableButtonAdd = False + Exit For + End If + + Next + btnAdd.Visible = enableButtonAdd If dgvIDS.SelectedCells.Count > 0 Then @@ -896,7 +904,7 @@ Public Class usrCntlIDSPreise Private Sub btnRW_Click(sender As Object, e As EventArgs) Handles btnRW.Click - If dgvOfferteDetails.Rows.Count > 0 Then + If dgvIDSData.Rows.Count > 0 Then Dim newRW As Double = 0 @@ -910,7 +918,7 @@ Public Class usrCntlIDSPreise If vbYes = MsgBox("Möchten Sie den Rechenwert von " & RW & " auf " & s & " setzen?", vbYesNoCancel) Then Dim counter As Integer = 0 - For Each r As DataGridViewRow In dgvOfferteDetails.Rows + For Each r As DataGridViewRow In dgvIDSData.Rows If r.Cells("ID").Value IsNot Nothing AndAlso IsNumeric(r.Cells("ID").Value) Then @@ -955,5 +963,37 @@ Public Class usrCntlIDSPreise + End Sub + + Private Sub btnAdd_Click(sender As Object, e As EventArgs) Handles btnAdd.Click + + If dgvIDSData.Rows.Count = 0 Then + If vbYes = MsgBox("Möchten Sie den die oben angegebenen Werte in die Datenbank eintragen?", vbYesNoCancel) Then + + Dim newIDS As New VERAG_PROG_ALLGEMEIN.cIDSDieselpreisRW() + Dim OutletCountryCode As Integer = -1 + If dgvFILTER.Columns.Contains("CustomerCode") AndAlso dgvFILTER.Rows(0).Cells("CustomerCode").Value IsNot Nothing AndAlso IsNumeric(dgvFILTER.Rows(0).Cells("CustomerCode").Value) Then newIDS.CustomerCode = dgvFILTER.Rows(0).Cells("CustomerCode").Value + If dgvFILTER.Columns.Contains("OutletCode") AndAlso dgvFILTER.Rows(0).Cells("OutletCode").Value IsNot Nothing AndAlso IsNumeric(dgvFILTER.Rows(0).Cells("OutletCode").Value) Then newIDS.OutletCode = dgvFILTER.Rows(0).Cells("OutletCode").Value + If dgvFILTER.Columns.Contains("OutletCountryCode") AndAlso dgvFILTER.Rows(0).Cells("OutletCountryCode").Value IsNot Nothing AndAlso IsNumeric(dgvFILTER.Rows(0).Cells("OutletCountryCode").Value) Then + newIDS.OutletCountryCode = dgvFILTER.Rows(0).Cells("OutletCountryCode").Value + OutletCountryCode = dgvFILTER.Rows(0).Cells("OutletCountryCode").Value + End If + If dgvFILTER.Columns.Contains("ProductTypeCode") AndAlso dgvFILTER.Rows(0).Cells("ProductTypeCode").Value IsNot Nothing AndAlso IsNumeric(dgvFILTER.Rows(0).Cells("ProductTypeCode").Value) Then newIDS.ProductTypeCode = dgvFILTER.Rows(0).Cells("ProductTypeCode").Value + If dgvFILTER.Columns.Contains("Rechenwert") AndAlso dgvFILTER.Rows(0).Cells("Rechenwert").Value IsNot Nothing AndAlso IsNumeric(dgvFILTER.Rows(0).Cells("Rechenwert").Value) Then newIDS.Rechenwert = dgvFILTER.Rows(0).Cells("Rechenwert").Value + If dgvFILTER.Columns.Contains("KategorieNr") AndAlso dgvFILTER.Rows(0).Cells("KategorieNr").Value IsNot Nothing AndAlso IsNumeric(dgvFILTER.Rows(0).Cells("KategorieNr").Value) Then newIDS.KategorieNr = dgvFILTER.Rows(0).Cells("KategorieNr").Value + If dgvFILTER.Columns.Contains("Kz") AndAlso dgvFILTER.Rows(0).Cells("Kz").Value IsNot Nothing AndAlso dgvFILTER.Rows(0).Cells("Kz").Value <> "" Then newIDS.Kz = dgvFILTER.Rows(0).Cells("Kz").Value + + newIDS.Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME + newIDS.Zeitstempel = Now + + If newIDS.SAVE() Then + MsgBox("Eintrag wurde gespeichert!") + initDGVDieselpreiseDetails(OutletCountryCode, True) + + End If + + End If + End If + End Sub End Class diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index e8e3e473..d456cae6 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -3410,10 +3410,10 @@ Public Class usrCntlKundenuebersicht frm.Controls.Add(dgv) frm.StartPosition = FormStartPosition.CenterScreen - If frm.ShowDialog().Cancel Then - initCreditsave() - setKD(kdNr) - End If + 'If frm.ShowDialog() = DialogResult.Cancel Then + initCreditsave() + setKD(kdNr) + 'End If diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb index ab22d36b..125ecc6e 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb @@ -571,7 +571,7 @@ Public Class cCreditSafeAPI dtEvents.Rows.Add(R) - createEvents(R, company.kdNr, company, CL, CR, CL_Datum, CR_Datum) + createEvents(R, company.kdNr, company, CL, CR, CL_Datum, CR_Datum, "ED") j = j + 1 End While @@ -668,7 +668,6 @@ Public Class cCreditSafeAPI '------------------------------- ALLE KUNDEN - Dim checkDate As String = "" If company IsNot Nothing AndAlso IsDate(company.lastChecked) Then @@ -833,7 +832,7 @@ Public Class cCreditSafeAPI company.csBonID = currentBonID End If - createEvents(R, company.kdNr, company, CL, CR, CL_Datum, CR_Datum) + createEvents(R, company.kdNr, company, CL, CR, CL_Datum, CR_Datum, "E") Next @@ -917,55 +916,51 @@ Public Class cCreditSafeAPI Dim riskClassChanged As Boolean = False Dim KUNDE_ERW As New cKundenErweitert(KUNDE.KundenNr) - If company.kdNr = 762207 Then - MsgBox("Hier") - End If - If Not (ADR.LandKz = "AT" Or ADR.LandKz = "A") Then 'bei nicht österr. den Index nehmen, sonst den Score - Index = IIf(CR = defaultCL, -1, calculatedBonIndexFromBonScore(CR, riskClass)) - Else - If CR <> defaultCL Then calculatedBonIndexFromBonScore(CR, riskClass) - End If - - If Index <> -1 Then - If KUNDE_ERW.kde_CreditSaveBonitaetsIndex <> Index Then - createInfo("B-INDEX", KUNDE_ERW, KUNDE, Index, riskClass, MailText, triggerMail, setzeKundenbesonderheiten) - KUNDE_ERW.kde_CreditSaveBonitaetsIndex = Index - KUNDE_ERW.kde_CreditSaveBonitaetsklasse = riskClass - KUNDE.Bonitätsdatum = Today() - End If - Else - If KUNDE_ERW.kde_CreditSaveBonitaetsScore <> CR AndAlso CR <> defaultCR Then - createInfo("B-SCORE", KUNDE_ERW, KUNDE, CR, riskClass, MailText, triggerMail, setzeKundenbesonderheiten) - KUNDE_ERW.kde_CreditSaveBonitaetsScore = CR - KUNDE_ERW.kde_CreditSaveBonitaetsklasse = riskClass - KUNDE.Bonitätsdatum = Today() - End If - End If - - If KUNDE.Höchstkredit <> CL AndAlso CL <> defaultCL Then - createInfo("KREDITLIMIT", KUNDE_ERW, KUNDE, CL, riskClass, MailText, triggerMail, setzeKundenbesonderheiten) - KUNDE.Höchstkredit = CL - If KUNDE.Bonitätsdatum <= CDate(CL_Datum) Then - KUNDE.Bonitätsdatum = Today() - End If - End If - - If company.BANKRUPT_REGISTERED AndAlso Not MailText.Contains("FÜR INSOLVENT ERKLÄRT") Then - createInfo("BANKRUPT_REGISTERED", KUNDE_ERW, KUNDE, CL, riskClass, MailText, triggerMail, setzeKundenbesonderheiten, company) - KUNDE_ERW.kde_CSinsolventAm = company.BANKRUPT_REGISTERED_DATE - End If - - If updateKunden Then KUNDE_ERW.SAVE() + Index = IIf(CR = defaultCL, -1, calculatedBonIndexFromBonScore(CR, riskClass)) + Else + If CR <> defaultCL Then calculatedBonIndexFromBonScore(CR, riskClass) End If - If updateKunden Then KUNDE.SAVE() + If Index <> -1 Then + If KUNDE_ERW.kde_CreditSaveBonitaetsIndex <> Index Then + createInfo("B-INDEX", KUNDE_ERW, KUNDE, Index, riskClass, MailText, triggerMail, setzeKundenbesonderheiten) + KUNDE_ERW.kde_CreditSaveBonitaetsIndex = Index + KUNDE_ERW.kde_CreditSaveBonitaetsklasse = riskClass + KUNDE.Bonitätsdatum = Today() + End If + Else + If KUNDE_ERW.kde_CreditSaveBonitaetsScore <> CR AndAlso CR <> defaultCR Then + createInfo("B-SCORE", KUNDE_ERW, KUNDE, CR, riskClass, MailText, triggerMail, setzeKundenbesonderheiten) + KUNDE_ERW.kde_CreditSaveBonitaetsScore = CR + KUNDE_ERW.kde_CreditSaveBonitaetsklasse = riskClass + KUNDE.Bonitätsdatum = Today() + End If + End If + + If KUNDE.Höchstkredit <> CL AndAlso CL <> defaultCL Then + createInfo("KREDITLIMIT", KUNDE_ERW, KUNDE, CL, riskClass, MailText, triggerMail, setzeKundenbesonderheiten) + KUNDE.Höchstkredit = CL + If KUNDE.Bonitätsdatum <= CDate(CL_Datum) Then + KUNDE.Bonitätsdatum = Today() + End If + End If + + If company.BANKRUPT_REGISTERED AndAlso Not MailText.Contains("FÜR INSOLVENT ERKLÄRT") Then + createInfo("BANKRUPT_REGISTERED", KUNDE_ERW, KUNDE, CL, riskClass, MailText, triggerMail, setzeKundenbesonderheiten, company) + KUNDE_ERW.kde_CSinsolventAm = company.BANKRUPT_REGISTERED_DATE + End If + + If updateKunden Then KUNDE_ERW.SAVE() + End If + + If updateKunden Then KUNDE.SAVE() End If End Sub - Private Shared Sub createEvents(R As DataRow, KundeNr As Integer, company As Company, ByRef CL As Integer, ByRef CR As Integer, ByRef CL_Datum As Date, ByRef CR_Datum As Date) + Private Shared Sub createEvents(R As DataRow, KundeNr As Integer, company As Company, ByRef CL As Integer, ByRef CR As Integer, ByRef CL_Datum As Date, ByRef CR_Datum As Date, ByRef Importtype As String) Dim cEvent As New cCreditsafeEvent(CLng(R("eventId")), KundeNr) @@ -975,13 +970,18 @@ Public Class cCreditSafeAPI globaleventcode = R("globalEventCode").trim() ElseIf Not IsDBNull(R("localEventCode")) Then Select Case R("localEventCode").trim() - Case "DECREASE_LIMIT", "INCREASE_LIMIT" : globaleventcode = "CL" - Case "DECREASE_RATING", "INCREASE_RATING" : globaleventcode = "CR" + Case "DECREASE_LIMIT", "INCREASE_LIMIT", "CL" : globaleventcode = "CL" + Case "DECREASE_RATING", "INCREASE_RATING", "CR" : globaleventcode = "CR" Case "55" : If R("companyId").ToString.StartsWith("NL") Then globaleventcode = "CR" 'nur Holland! Case "56" : If R("companyId").ToString.StartsWith("NL") Then globaleventcode = "CL" 'nur Holland! End Select End If + If globaleventcode = "" Then + If Not IsDBNull(R("ruleName")) AndAlso R("ruleName").ToString.Contains("Limit") Then globaleventcode = "CL" + If Not IsDBNull(R("ruleName")) AndAlso R("ruleName").ToString.Contains("International Score") Then globaleventcode = "CR" + End If + cEvent.eventId = R("eventId") cEvent.companyId = R("companyId") @@ -1057,8 +1057,12 @@ Public Class cCreditSafeAPI cEvent.bonId = company.csBonID End If - cEvent.kundenNr = company.kdNr - cEvent.SAVE() + 'cEvent.kundenNr = company.kdNr + + 'die Events sind besser strukturiert als die EventDetails, somit soll ein bereits bestehender Eintrag der über die Events importiert werden nicht von einem Eventdetail überschrieben werden!!! + If Not (cEvent.hasEntry AndAlso Importtype = "ED") Then + cEvent.SAVE() + End If End Sub @@ -1822,9 +1826,9 @@ Public Class cCreditSafeAPI LOAD() End Sub - Sub New(eventId, kundenNr) 'zwei unterschiedliche KundenNr können dieselbe eventID besitzen (weil bei uns alles tlw. doppelt angelegt ist!!!!!) - Me.eventId = eventId - kundenNr = kundenNr + Sub New(eventId_, kundenNr_) 'zwei unterschiedliche KundenNr können dieselbe eventID besitzen (weil bei uns alles tlw. doppelt angelegt ist!!!!!) + Me.eventId = eventId_ + kundenNr = kundenNr_ LOADKDNR() End Sub Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) From e0b075e479ac0a23822d12be5070e54301f77671 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 30 Sep 2025 15:25:31 +0200 Subject: [PATCH 26/27] CBAM --- SDL/My Project/AssemblyInfo.vb | 4 ++-- SDL/kunden/usrCntlCBAM.vb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 79eb1a99..eafc890a 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/kunden/usrCntlCBAM.vb b/SDL/kunden/usrCntlCBAM.vb index bd911211..95e1c018 100644 --- a/SDL/kunden/usrCntlCBAM.vb +++ b/SDL/kunden/usrCntlCBAM.vb @@ -1699,7 +1699,7 @@ Public Class usrCntlCBAM Blatt.Range("F" & cnt).Value = row("origin country code") Blatt.Range("G" & cnt).Value = row("requested procedure") Blatt.Range("H" & cnt).Value = row("previous procedure") - Blatt.Range("J" & cnt).Value = row("net mass") + Blatt.Range("I" & cnt).Value = row("net mass") Blatt.Range("J" & cnt).Value = row("type of measurement unit") Blatt.Range("K" & cnt).Value = row("invoice numbers") Blatt.Range("L" & cnt).Value = row("invoice date") From 6a03240f7e5a85167ddeef7a050cc1b75834e56c Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 1 Oct 2025 09:59:09 +0200 Subject: [PATCH 27/27] IDS, Kundebearbeiten, Creditsafe, MDMAuswertung, etc. --- SDL/My Project/AssemblyInfo.vb | 4 +- SDL/kunden/frmKundenblatt.Designer.vb | 4 +- SDL/kunden/usrCntlIDSPreise.vb | 215 ++++++----- SDL/kunden/usrCntlKundenuebersicht.vb | 2 +- .../usrcntlKundeBearbeitenFull.Designer.vb | 363 +++++++++--------- SDL/kunden/usrcntlKundeBearbeitenFull.vb | 17 +- SDL/mdm/usrCntlMDMAuswertungen.vb | 1 + .../Creditsafe/cCreditSafeAPI.vb | 2 +- 8 files changed, 338 insertions(+), 270 deletions(-) diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index eafc890a..3bfd776e 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index faafd0b1..33849ca1 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -2446,7 +2446,7 @@ Partial Class frmKundenblatt ' Me.btnFirmendatenFormularSpeichern.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnFirmendatenFormularSpeichern.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnFirmendatenFormularSpeichern.Location = New System.Drawing.Point(-2813, 18) + Me.btnFirmendatenFormularSpeichern.Location = New System.Drawing.Point(568, 3) Me.btnFirmendatenFormularSpeichern.Name = "btnFirmendatenFormularSpeichern" Me.btnFirmendatenFormularSpeichern.Size = New System.Drawing.Size(71, 52) Me.btnFirmendatenFormularSpeichern.TabIndex = 17 @@ -2724,7 +2724,7 @@ Partial Class frmKundenblatt ' Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24) Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM" - Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4 + Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8 Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4) Me.cntxtCntxtMDM.Text = "cntxtMDM" ' diff --git a/SDL/kunden/usrCntlIDSPreise.vb b/SDL/kunden/usrCntlIDSPreise.vb index b255b93b..cce98771 100644 --- a/SDL/kunden/usrCntlIDSPreise.vb +++ b/SDL/kunden/usrCntlIDSPreise.vb @@ -195,11 +195,17 @@ Public Class usrCntlIDSPreise Case "KOR" + If SQL_WHERE <> "" Then + SQL_WHERE = SQL_WHERE.Replace("tbl_IDS_Rechenwerte.", "") + End If + SQL_ = "SELECT tbl_IDS_Kunden_ohne_Rabatt.CustomerCode, tbl_IDS_Kunden_ohne_Rabatt.Zeitstempel, tbl_IDS_Kunden_ohne_Rabatt.Sachbearbeiter FROM tbl_IDS_Kunden_ohne_Rabatt WHERE 1 = 1 " & SQL_WHERE & " ORDER BY tbl_IDS_Kunden_ohne_Rabatt.CustomerCode;" + + End Select If SQL_ = "" Then Exit Sub @@ -222,59 +228,6 @@ Public Class usrCntlIDSPreise VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try - 'If edit Then - - ' Select Case cbxTypes._value - ' Case "L" - ' SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID, tbl_IDS_Rechenwerte.OutletCountryCode,tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.ProductTypeCode,tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter - ' FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN tbl_IDS_Rechenwerte ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode - ' WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode & ") ", ") ") & SQL_WHERE & " - ' ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" - - ' Case "LS" - ' SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID,tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Stationen.OutletName,tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter - ' FROM tbl_IDS_Produkte - ' INNER JOIN (tbl_IDS_Länder - ' INNER JOIN (tbl_IDS_Stationen - ' INNER JOIN tbl_IDS_Rechenwerte ON (tbl_IDS_Stationen.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) AND (tbl_IDS_Stationen.OutletCode = tbl_IDS_Rechenwerte.OutletCode)) ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) - ' ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode - ' WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode & ") ", ") ") & SQL_WHERE & " - ' ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" - - ' Case "LK" - - ' FUNC.dgvCellToCbo(dgvIDSData, 1, "OutletCountryCode", "OutletCountryCode", " SELECT [OutletCountryCode], OutletCountry FROM [tbl_IDS_Länder] ORDER BY OutletCountry ", "FMZOLL", 150) - ' 'FUNC.dgvCellToCbo(dgvOfferteDetails, 5, "BGebLeist.", "BGebLeistungsNr", " SELECT [LeistungsNr], CAST(LeistungsNr as varchar(3)) + ' - ' + [LeistungsBez] as LeistungsBez FROM [Leistungen] ORDER BY [LeistungsNr] ", "FMZOLL", 250) - - ' Case "LSK" - ' SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID,tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Länder.OutletCountry,tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.CustomerCode,Adressen.Ordnungsbegriff AS CustomerName, tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter - ' FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN (Adressen INNER JOIN (tbl_IDS_Stationen INNER JOIN tbl_IDS_Rechenwerte ON (tbl_IDS_Stationen.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) AND (tbl_IDS_Stationen.OutletCode = tbl_IDS_Rechenwerte.OutletCode)) ON Adressen.AdressenNr = tbl_IDS_Rechenwerte.CustomerCode) ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode - ' WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Not Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode & ") ", ") ") & SQL_WHERE & " - ' ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, Adressen.Ordnungsbegriff, tbl_IDS_Rechenwerte.CustomerCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" - - ' Case "KRW" - ' SQL_ = "SELECT tbl_IDS_Kategorien_Rechenwerte.ID as ID, tbl_IDS_Kategorien_Rechenwerte.KategorieNr, tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Kategorien_Rechenwerte.Rechenwert, tbl_IDS_Kategorien_Rechenwerte.Zeitstempel, tbl_IDS_Kategorien_Rechenwerte.Sachbearbeiter - ' FROM tbl_IDS_Produkte INNER JOIN tbl_IDS_Kategorien_Rechenwerte ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode - ' WHERE 1 = 1 " & SQL_WHERE & " - ' ORDER BY tbl_IDS_Kategorien_Rechenwerte.KategorieNr, tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode;" - - - ' Case "KOR" - ' SQL_ = "SELECT tbl_IDS_Kunden_ohne_Rabatt.CustomerCode, tbl_IDS_Kunden_ohne_Rabatt.Zeitstempel, tbl_IDS_Kunden_ohne_Rabatt.Sachbearbeiter - ' FROM tbl_IDS_Kunden_ohne_Rabatt - ' WHERE 1 = 1 " & SQL_WHERE & " - ' ORDER BY tbl_IDS_Kunden_ohne_Rabatt.CustomerCode;" - - ' End Select - 'End If - - - '.DataSource = SQL.loadDgvBySql(" SELECT [LeistungsNr],[LeistungsBez],[BerechnungsartNr],[Preis],[Anzahl],[BGebLeistungsNr],[BGebProzent],[BGebMinBetrag],[Eingegeben am],[Geändert am],[Sachbearbeiter],[PreisänderungProzent],[PreisAlt],[Preisänderung] " & - ' " FROM [Offertenpositionen] " & - ' " WHERE KundenNr='" & kdNr & "' and OffertenNr='" & OffertenNr & "' ORDER BY LeistungsNr ", "FMZOLL") - - - If .Columns.Contains("ID") Then .Columns("ID").Visible = False If .Columns.Contains("Kz") Then .Columns("Kz").Width = 25 @@ -313,12 +266,6 @@ Public Class usrCntlIDSPreise Dim filter As String = "" Dim andstr As String = "" - 'fehler bei: - 'OutletCountryCode - - - - If dgvFILTER.RowCount > 0 Then For Each c As DataGridViewCell In dgvFILTER.Rows(0).Cells If c.Value IsNot DBNull.Value Then @@ -518,20 +465,96 @@ Public Class usrCntlIDSPreise If currentIDS IsNot Nothing Then currentIDS.Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME currentIDS.Zeitstempel = Now - DGVHasChaged = True - If currentIDS.SAVE() Then - If dgvIDS.SelectedCells.Count > 0 Then + Select Case cbxTypes._value + Case "L" + Select Case dgvIDSData.CurrentCell.ColumnIndex + Case 5 : If dgvIDSData.CurrentCell.Value IsNot Nothing AndAlso IsNumeric(dgvIDSData.CurrentCell.Value) Then + currentIDS.Rechenwert = CDbl(dgvIDSData.CurrentCell.Value) + DGVHasChaged = True + End If + Case 6 : If dgvIDSData.CurrentCell.Value IsNot Nothing AndAlso dgvIDSData.CurrentCell.Value <> "" AndAlso (dgvIDSData.CurrentCell.Value = "R" Or dgvIDSData.CurrentCell.Value = "P") Then + currentIDS.Kz = dgvIDSData.CurrentCell.Value.ToString + DGVHasChaged = True + End If + Case 7 : If dgvIDSData.CurrentCell.Value IsNot Nothing AndAlso IsNumeric(dgvIDSData.CurrentCell.Value) Then + currentIDS.KategorieNr = dgvIDSData.CurrentCell.Value.ToString + DGVHasChaged = True + Else + currentIDS.KategorieNr = Nothing + DGVHasChaged = True + End If + End Select + + Case "LK", "LS" + + Select Case dgvIDSData.CurrentCell.ColumnIndex + Case 7 : If dgvIDSData.CurrentCell.Value IsNot Nothing AndAlso IsNumeric(dgvIDSData.CurrentCell.Value) Then + currentIDS.Rechenwert = CDbl(dgvIDSData.CurrentCell.Value) + DGVHasChaged = True + End If + Case 8 : If dgvIDSData.CurrentCell.Value IsNot Nothing AndAlso dgvIDSData.CurrentCell.Value <> "" AndAlso (dgvIDSData.CurrentCell.Value = "R" Or dgvIDSData.CurrentCell.Value = "P") Then + currentIDS.Kz = dgvIDSData.CurrentCell.Value.ToString + DGVHasChaged = True + End If + Case 9 : If dgvIDSData.CurrentCell.Value IsNot Nothing AndAlso IsNumeric(dgvIDSData.CurrentCell.Value) Then + currentIDS.KategorieNr = dgvIDSData.CurrentCell.Value.ToString + DGVHasChaged = True + Else + currentIDS.KategorieNr = Nothing + DGVHasChaged = True + End If + End Select + + Case "LSK" + + Select Case dgvIDSData.CurrentCell.ColumnIndex + Case 9 : If dgvIDSData.CurrentCell.Value IsNot Nothing AndAlso IsNumeric(dgvIDSData.CurrentCell.Value) Then + currentIDS.Rechenwert = CDbl(dgvIDSData.CurrentCell.Value) + DGVHasChaged = True + End If + Case 10 : If dgvIDSData.CurrentCell.Value IsNot Nothing AndAlso dgvIDSData.CurrentCell.Value <> "" AndAlso (dgvIDSData.CurrentCell.Value = "R" Or dgvIDSData.CurrentCell.Value = "P") Then + currentIDS.Kz = dgvIDSData.CurrentCell.Value.ToString + DGVHasChaged = True + End If + + Case 11 : If dgvIDSData.CurrentCell.Value IsNot Nothing AndAlso IsNumeric(dgvIDSData.CurrentCell.Value) Then + currentIDS.KategorieNr = dgvIDSData.CurrentCell.Value.ToString + DGVHasChaged = True + Else + currentIDS.KategorieNr = Nothing + DGVHasChaged = True + End If + End Select + + Case "KRW" + + Select Case dgvIDSData.CurrentCell.ColumnIndex + Case 4 : If dgvIDSData.CurrentCell.Value IsNot Nothing AndAlso dgvIDSData.CurrentCell.Value <> "" AndAlso (dgvIDSData.CurrentCell.Value = "R" Or dgvIDSData.CurrentCell.Value = "P") Then + currentIDS.Kz = dgvIDSData.CurrentCell.Value.ToString + DGVHasChaged = True + End If + End Select + + + End Select + + If DGVHasChaged Then + + If currentIDS.SAVE() Then + + If dgvIDS.SelectedCells.Count > 0 Then + + If dgvIDS.SelectedCells(0).RowIndex > -1 AndAlso dgvIDS.Rows(dgvIDS.SelectedCells(0).RowIndex).Cells("OutletCountryCode").Value > 0 Then + initDGVDieselpreiseDetails(dgvIDS.Rows(dgvIDS.SelectedCells(0).RowIndex).Cells("OutletCountryCode").Value) + End If + + Else + initDGVDieselpreiseDetails() - If dgvIDS.SelectedCells(0).RowIndex > -1 AndAlso dgvIDS.Rows(dgvIDS.SelectedCells(0).RowIndex).Cells("OutletCountryCode").Value > 0 Then - initDGVDieselpreiseDetails(dgvIDS.Rows(dgvIDS.SelectedCells(0).RowIndex).Cells("OutletCountryCode").Value) End If - Else - initDGVDieselpreiseDetails() - End If - End If End If End If @@ -968,29 +991,47 @@ Public Class usrCntlIDSPreise Private Sub btnAdd_Click(sender As Object, e As EventArgs) Handles btnAdd.Click If dgvIDSData.Rows.Count = 0 Then - If vbYes = MsgBox("Möchten Sie den die oben angegebenen Werte in die Datenbank eintragen?", vbYesNoCancel) Then + If vbYes = MsgBox("Möchten Sie den die oben angegebenen Werte für " & cbxTypes.SelectedItem.ToString & " in die Datenbank eintragen?", vbYesNoCancel) Then - Dim newIDS As New VERAG_PROG_ALLGEMEIN.cIDSDieselpreisRW() - Dim OutletCountryCode As Integer = -1 - If dgvFILTER.Columns.Contains("CustomerCode") AndAlso dgvFILTER.Rows(0).Cells("CustomerCode").Value IsNot Nothing AndAlso IsNumeric(dgvFILTER.Rows(0).Cells("CustomerCode").Value) Then newIDS.CustomerCode = dgvFILTER.Rows(0).Cells("CustomerCode").Value - If dgvFILTER.Columns.Contains("OutletCode") AndAlso dgvFILTER.Rows(0).Cells("OutletCode").Value IsNot Nothing AndAlso IsNumeric(dgvFILTER.Rows(0).Cells("OutletCode").Value) Then newIDS.OutletCode = dgvFILTER.Rows(0).Cells("OutletCode").Value - If dgvFILTER.Columns.Contains("OutletCountryCode") AndAlso dgvFILTER.Rows(0).Cells("OutletCountryCode").Value IsNot Nothing AndAlso IsNumeric(dgvFILTER.Rows(0).Cells("OutletCountryCode").Value) Then - newIDS.OutletCountryCode = dgvFILTER.Rows(0).Cells("OutletCountryCode").Value - OutletCountryCode = dgvFILTER.Rows(0).Cells("OutletCountryCode").Value - End If - If dgvFILTER.Columns.Contains("ProductTypeCode") AndAlso dgvFILTER.Rows(0).Cells("ProductTypeCode").Value IsNot Nothing AndAlso IsNumeric(dgvFILTER.Rows(0).Cells("ProductTypeCode").Value) Then newIDS.ProductTypeCode = dgvFILTER.Rows(0).Cells("ProductTypeCode").Value - If dgvFILTER.Columns.Contains("Rechenwert") AndAlso dgvFILTER.Rows(0).Cells("Rechenwert").Value IsNot Nothing AndAlso IsNumeric(dgvFILTER.Rows(0).Cells("Rechenwert").Value) Then newIDS.Rechenwert = dgvFILTER.Rows(0).Cells("Rechenwert").Value - If dgvFILTER.Columns.Contains("KategorieNr") AndAlso dgvFILTER.Rows(0).Cells("KategorieNr").Value IsNot Nothing AndAlso IsNumeric(dgvFILTER.Rows(0).Cells("KategorieNr").Value) Then newIDS.KategorieNr = dgvFILTER.Rows(0).Cells("KategorieNr").Value - If dgvFILTER.Columns.Contains("Kz") AndAlso dgvFILTER.Rows(0).Cells("Kz").Value IsNot Nothing AndAlso dgvFILTER.Rows(0).Cells("Kz").Value <> "" Then newIDS.Kz = dgvFILTER.Rows(0).Cells("Kz").Value + Select Case cbxTypes._value - newIDS.Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME - newIDS.Zeitstempel = Now + Case "KOR" + If dgvFILTER.Columns.Contains("CustomerCode") AndAlso dgvFILTER.Rows(0).Cells("CustomerCode").Value IsNot Nothing AndAlso IsNumeric(dgvFILTER.Rows(0).Cells("CustomerCode").Value) Then + Dim CustomerCode As Integer = dgvFILTER.Rows(0).Cells("CustomerCode").Value - If newIDS.SAVE() Then - MsgBox("Eintrag wurde gespeichert!") - initDGVDieselpreiseDetails(OutletCountryCode, True) - End If + If SQL.doSQL("INSERT INTO [tbl_IDS_Kunden_ohne_Rabatt] ([CustomerCode],[Zeitstempel],[Sachbearbeiter]) + VALUES ('" & CustomerCode & "','" & Now() & "','" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & "')", "FMZOLL") Then + MsgBox("Eintrag wurde gespeichert!") + initDGVDieselpreiseDetails(-1, True) + End If + End If + Case Else + + + Dim newIDS As New VERAG_PROG_ALLGEMEIN.cIDSDieselpreisRW() + Dim OutletCountryCode As Integer = -1 + If dgvFILTER.Columns.Contains("CustomerCode") AndAlso dgvFILTER.Rows(0).Cells("CustomerCode").Value IsNot Nothing AndAlso IsNumeric(dgvFILTER.Rows(0).Cells("CustomerCode").Value) Then newIDS.CustomerCode = dgvFILTER.Rows(0).Cells("CustomerCode").Value + If dgvFILTER.Columns.Contains("OutletCode") AndAlso dgvFILTER.Rows(0).Cells("OutletCode").Value IsNot Nothing AndAlso IsNumeric(dgvFILTER.Rows(0).Cells("OutletCode").Value) Then newIDS.OutletCode = dgvFILTER.Rows(0).Cells("OutletCode").Value + If dgvFILTER.Columns.Contains("OutletCountryCode") AndAlso dgvFILTER.Rows(0).Cells("OutletCountryCode").Value IsNot Nothing AndAlso IsNumeric(dgvFILTER.Rows(0).Cells("OutletCountryCode").Value) Then + newIDS.OutletCountryCode = dgvFILTER.Rows(0).Cells("OutletCountryCode").Value + OutletCountryCode = dgvFILTER.Rows(0).Cells("OutletCountryCode").Value + End If + If dgvFILTER.Columns.Contains("ProductTypeCode") AndAlso dgvFILTER.Rows(0).Cells("ProductTypeCode").Value IsNot Nothing AndAlso IsNumeric(dgvFILTER.Rows(0).Cells("ProductTypeCode").Value) Then newIDS.ProductTypeCode = dgvFILTER.Rows(0).Cells("ProductTypeCode").Value + If dgvFILTER.Columns.Contains("Rechenwert") AndAlso dgvFILTER.Rows(0).Cells("Rechenwert").Value IsNot Nothing AndAlso IsNumeric(dgvFILTER.Rows(0).Cells("Rechenwert").Value) Then newIDS.Rechenwert = dgvFILTER.Rows(0).Cells("Rechenwert").Value + If dgvFILTER.Columns.Contains("KategorieNr") AndAlso dgvFILTER.Rows(0).Cells("KategorieNr").Value IsNot Nothing AndAlso IsNumeric(dgvFILTER.Rows(0).Cells("KategorieNr").Value) Then newIDS.KategorieNr = dgvFILTER.Rows(0).Cells("KategorieNr").Value + If dgvFILTER.Columns.Contains("Kz") AndAlso dgvFILTER.Rows(0).Cells("Kz").Value IsNot Nothing AndAlso dgvFILTER.Rows(0).Cells("Kz").Value <> "" Then newIDS.Kz = dgvFILTER.Rows(0).Cells("Kz").Value + + newIDS.Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME + newIDS.Zeitstempel = Now + + If newIDS.SAVE() Then + MsgBox("Eintrag wurde gespeichert!") + initDGVDieselpreiseDetails(OutletCountryCode, True) + + End If + + End Select End If End If diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index d456cae6..b4eb9bdf 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -3373,7 +3373,7 @@ Public Class usrCntlKundenuebersicht End If - company.lastChecked = IIf(IsDate(lastChecked), lastChecked, Today().AddDays(-30)) + company.lastChecked = IIf(IsDate(lastChecked), lastChecked, Today().AddDays(-365)) Dim currentBonID As Integer = SQL.getValueTxtBySql("Select Top(1) isnull(ba_id, -1) FROM [tblBonitaetsauskunft] where ba_KundenNr = " & KUNDE.KundenNr & " AND [ba_Pruefungstool] = 'creditsafe API' ORDER BY ba_Datum DESC", "FMZOLL") diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb index b9854ee8..d7fc2258 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb @@ -23,31 +23,31 @@ Partial Class usrcntlKundeBearbeitenFull Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle32 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle33 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle34 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle35 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle36 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle37 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle38 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle39 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle40 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle41 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle42 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle43 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle44 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle31 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle45 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle46 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle47 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle48 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle49 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle50 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.tbcntrDetails = New System.Windows.Forms.TabControl() Me.tbAbfertigung = New System.Windows.Forms.TabPage() Me.cbxVerzolltBeiExport = New System.Windows.Forms.CheckBox() @@ -265,6 +265,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtUSt_GVAusgestelltAm = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtUSt_GVAngefordertAm = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.tbSonstiges = New System.Windows.Forms.TabPage() + Me.cbxCSInsolvent = New System.Windows.Forms.CheckBox() Me.cbxCS_Added = New System.Windows.Forms.CheckBox() Me.Label113 = New System.Windows.Forms.Label() Me.Label112 = New System.Windows.Forms.Label() @@ -406,7 +407,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cboAuswahl = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.cbxCSInsolvent = New System.Windows.Forms.CheckBox() + Me.btnBnkExcel = New System.Windows.Forms.Button() Me.tbcntrDetails.SuspendLayout() Me.tbAbfertigung.SuspendLayout() Me.tbcntrAbf.SuspendLayout() @@ -3111,8 +3112,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvUmsatzbericht.AllowUserToDeleteRows = False Me.dgvUmsatzbericht.AllowUserToOrderColumns = True Me.dgvUmsatzbericht.AllowUserToResizeRows = False - DataGridViewCellStyle32.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle32 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.dgvUmsatzbericht.BackgroundColor = System.Drawing.Color.White Me.dgvUmsatzbericht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvUmsatzbericht.Location = New System.Drawing.Point(6, 25) @@ -3211,8 +3212,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvOffenePosten.AllowUserToDeleteRows = False Me.dgvOffenePosten.AllowUserToOrderColumns = True Me.dgvOffenePosten.AllowUserToResizeRows = False - DataGridViewCellStyle33.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle33 + DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvOffenePosten.Location = New System.Drawing.Point(6, 38) @@ -3373,41 +3374,41 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvKreditkarten.AllowUserToDeleteRows = False Me.dgvKreditkarten.AllowUserToOrderColumns = True Me.dgvKreditkarten.AllowUserToResizeRows = False - DataGridViewCellStyle34.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle34 + DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3 Me.dgvKreditkarten.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle35.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle35.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle35.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle35.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle35.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle35 + DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4 Me.dgvKreditkarten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle36.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle36.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle36.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle36.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle36 + DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle5 Me.dgvKreditkarten.Location = New System.Drawing.Point(9, 20) Me.dgvKreditkarten.MultiSelect = False Me.dgvKreditkarten.Name = "dgvKreditkarten" Me.dgvKreditkarten.ReadOnly = True - DataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle37.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle37.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle37.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle37.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle37.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle37.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle37 + DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle6 Me.dgvKreditkarten.RowHeadersVisible = False - DataGridViewCellStyle38.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle38 + DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle7 Me.dgvKreditkarten.RowTemplate.DefaultCellStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.dgvKreditkarten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvKreditkarten.Size = New System.Drawing.Size(642, 312) @@ -3487,26 +3488,26 @@ Partial Class usrcntlKundeBearbeitenFull ' 'dgvMWST ' - DataGridViewCellStyle39.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvMWST.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle39 + DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvMWST.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8 Me.dgvMWST.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle40.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle40.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle40.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle40.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle40.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle40.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvMWST.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle40 + DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvMWST.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle9 Me.dgvMWST.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle41.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle41.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle41.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle41.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle41.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle41.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvMWST.DefaultCellStyle = DataGridViewCellStyle41 + DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvMWST.DefaultCellStyle = DataGridViewCellStyle10 Me.dgvMWST.Location = New System.Drawing.Point(9, 359) Me.dgvMWST.Name = "dgvMWST" Me.dgvMWST.Size = New System.Drawing.Size(171, 125) @@ -3591,26 +3592,26 @@ Partial Class usrcntlKundeBearbeitenFull ' 'dgvUstv_LaenderUndSteuernummern ' - DataGridViewCellStyle42.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle42 + DataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11 Me.dgvUstv_LaenderUndSteuernummern.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle43.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle43.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle43.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle43.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle43.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle43.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle43 + DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle12 Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle44.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle44.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle44.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle44.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle44.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle44.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle44.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvUstv_LaenderUndSteuernummern.DefaultCellStyle = DataGridViewCellStyle44 + DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvUstv_LaenderUndSteuernummern.DefaultCellStyle = DataGridViewCellStyle13 Me.dgvUstv_LaenderUndSteuernummern.Location = New System.Drawing.Point(9, 94) Me.dgvUstv_LaenderUndSteuernummern.Name = "dgvUstv_LaenderUndSteuernummern" Me.dgvUstv_LaenderUndSteuernummern.Size = New System.Drawing.Size(657, 259) @@ -3793,6 +3794,16 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbSonstiges.Text = "Sonstiges" Me.tbSonstiges.UseVisualStyleBackColor = True ' + 'cbxCSInsolvent + ' + Me.cbxCSInsolvent.AutoSize = True + Me.cbxCSInsolvent.Location = New System.Drawing.Point(406, 26) + Me.cbxCSInsolvent.Name = "cbxCSInsolvent" + Me.cbxCSInsolvent.Size = New System.Drawing.Size(102, 17) + Me.cbxCSInsolvent.TabIndex = 39 + Me.cbxCSInsolvent.Text = "Kunde insolvent" + Me.cbxCSInsolvent.UseVisualStyleBackColor = True + ' 'cbxCS_Added ' Me.cbxCS_Added.AutoSize = True @@ -3829,26 +3840,26 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvIDS_Rabatte.AllowUserToAddRows = False Me.dgvIDS_Rabatte.AllowUserToDeleteRows = False Me.dgvIDS_Rabatte.AllowUserToResizeRows = False - DataGridViewCellStyle26.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvIDS_Rabatte.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle26 + DataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvIDS_Rabatte.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14 Me.dgvIDS_Rabatte.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvIDS_Rabatte.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle27 + DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvIDS_Rabatte.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle15 Me.dgvIDS_Rabatte.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle28.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvIDS_Rabatte.DefaultCellStyle = DataGridViewCellStyle28 + DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvIDS_Rabatte.DefaultCellStyle = DataGridViewCellStyle16 Me.dgvIDS_Rabatte.Location = New System.Drawing.Point(9, 317) Me.dgvIDS_Rabatte.MultiSelect = False Me.dgvIDS_Rabatte.Name = "dgvIDS_Rabatte" @@ -3989,26 +4000,26 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvSonst_IDSKunden.AllowUserToAddRows = False Me.dgvSonst_IDSKunden.AllowUserToDeleteRows = False Me.dgvSonst_IDSKunden.AllowUserToResizeRows = False - DataGridViewCellStyle29.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle29 + DataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17 Me.dgvSonst_IDSKunden.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle30.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle30.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle30.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle30.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle30.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSonst_IDSKunden.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle30 + DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSonst_IDSKunden.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle18 Me.dgvSonst_IDSKunden.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle31.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle31.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle31.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle31.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvSonst_IDSKunden.DefaultCellStyle = DataGridViewCellStyle31 + DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvSonst_IDSKunden.DefaultCellStyle = DataGridViewCellStyle19 Me.dgvSonst_IDSKunden.Location = New System.Drawing.Point(9, 214) Me.dgvSonst_IDSKunden.MultiSelect = False Me.dgvSonst_IDSKunden.Name = "dgvSonst_IDSKunden" @@ -4319,26 +4330,26 @@ Partial Class usrcntlKundeBearbeitenFull 'DataGridView1 ' Me.DataGridView1.AllowUserToResizeRows = False - DataGridViewCellStyle45.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle45 + DataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle20 Me.DataGridView1.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle46.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle46.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle46.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle46.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle46.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle46.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle46.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.DataGridView1.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle46 + DataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.DataGridView1.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle21 Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle47.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle47.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle47.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle47.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle47.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle47.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle47.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.DataGridView1.DefaultCellStyle = DataGridViewCellStyle47 + DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.DataGridView1.DefaultCellStyle = DataGridViewCellStyle22 Me.DataGridView1.Enabled = False Me.DataGridView1.Location = New System.Drawing.Point(6, 111) Me.DataGridView1.MultiSelect = False @@ -4377,6 +4388,7 @@ Partial Class usrcntlKundeBearbeitenFull ' 'tbBankverbindungen ' + Me.tbBankverbindungen.Controls.Add(Me.btnBnkExcel) Me.tbBankverbindungen.Controls.Add(Me.dgvBankverbindungen) Me.tbBankverbindungen.Controls.Add(Me.cbxAlleBVanzeigen) Me.tbBankverbindungen.Controls.Add(Me.Label108) @@ -4392,26 +4404,26 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.dgvBankverbindungen.AllowUserToDeleteRows = False Me.dgvBankverbindungen.AllowUserToResizeRows = False - DataGridViewCellStyle48.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvBankverbindungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle48 + DataGridViewCellStyle23.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvBankverbindungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle23 Me.dgvBankverbindungen.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle49.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle49.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle49.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle49.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle49.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle49.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle49.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvBankverbindungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle49 + DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvBankverbindungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle24 Me.dgvBankverbindungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle50.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle50.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle50.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle50.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle50.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle50.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle50.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvBankverbindungen.DefaultCellStyle = DataGridViewCellStyle50 + DataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvBankverbindungen.DefaultCellStyle = DataGridViewCellStyle25 Me.dgvBankverbindungen.Location = New System.Drawing.Point(3, 40) Me.dgvBankverbindungen.MultiSelect = False Me.dgvBankverbindungen.Name = "dgvBankverbindungen" @@ -5540,15 +5552,17 @@ Partial Class usrcntlKundeBearbeitenFull Me.DataGridViewTextBoxColumn2.HeaderText = "E-Mail" Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" ' - 'cbxCSInsolvent + 'btnBnkExcel ' - Me.cbxCSInsolvent.AutoSize = True - Me.cbxCSInsolvent.Location = New System.Drawing.Point(406, 26) - Me.cbxCSInsolvent.Name = "cbxCSInsolvent" - Me.cbxCSInsolvent.Size = New System.Drawing.Size(102, 17) - Me.cbxCSInsolvent.TabIndex = 39 - Me.cbxCSInsolvent.Text = "Kunde insolvent" - Me.cbxCSInsolvent.UseVisualStyleBackColor = True + Me.btnBnkExcel.BackgroundImage = Global.SDL.My.Resources.Resources.Excel_logo + Me.btnBnkExcel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnBnkExcel.FlatAppearance.BorderSize = 0 + Me.btnBnkExcel.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnBnkExcel.Location = New System.Drawing.Point(15, 290) + Me.btnBnkExcel.Name = "btnBnkExcel" + Me.btnBnkExcel.Size = New System.Drawing.Size(25, 20) + Me.btnBnkExcel.TabIndex = 137 + Me.btnBnkExcel.UseVisualStyleBackColor = True ' 'usrcntlKundeBearbeitenFull ' @@ -6010,4 +6024,5 @@ Partial Class usrcntlKundeBearbeitenFull Friend WithEvents cbpKopfsammelrechnung As CheckBox Friend WithEvents cbxCS_Added As CheckBox Friend WithEvents cbxCSInsolvent As CheckBox + Friend WithEvents btnBnkExcel As Button End Class diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index 625c1268..b37a8b73 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -1,4 +1,6 @@ -Public Class usrcntlKundeBearbeitenFull +Imports com.sun.xml.internal.rngom + +Public Class usrcntlKundeBearbeitenFull Dim KUNDE As VERAG_PROG_ALLGEMEIN.cKunde = Nothing Dim KUNDE_ERW As VERAG_PROG_ALLGEMEIN.cKundenErweitert = Nothing @@ -1270,7 +1272,7 @@ If isVerag360 Then cbxFiBu.Checked = True : cboFirma.changeItem("19") : cboFiliale.changeItem("8001") : cbxErstattungsart.changeItem("1") Else - cbxFiBu.Checked = False : cboFirma.changeItem("1") : cboFiliale.changeItem("4803") :: cbxErstattungsart.changeItem("0") + cbxFiBu.Checked = False : cboFirma.changeItem("1") : cboFiliale.changeItem("4803") : cbxErstattungsart.changeItem("0") End If End Select @@ -1819,7 +1821,7 @@ cBinding_dgvBankverbindungen.initBinding(" SELECT [bnk_id],[bnk_KundenNr],[bnk_iban],[bnk_bic],[bnk_anschrift],[bnk_daid],[bnk_hauptkonto],[bnk_archiv],cast([bnk_Datum] as Date) as bnk_Datum " & " FROM tblBankverbindungen " & - " WHERE bnk_KundenNr = '" & KUNDE.KundenNr & "'" & IIf(Not archivierteDSAnzeigen, " AND ISNULL(bnk_archiv,0) = 0", ""), "tbl_IDS_Kunden") + " WHERE bnk_KundenNr = '" & KUNDE.KundenNr & "'" & IIf(Not archivierteDSAnzeigen, " AND ISNULL(bnk_archiv,0) = 0", ""), "tblBankverbindungen") AddHandler btnBankspeichern.Click, Sub(send As Object, evnt As EventArgs) @@ -2368,4 +2370,13 @@ End If End Sub + + Private Sub btnBnkExcel_Click(sender As Object, e As EventArgs) Handles btnBnkExcel.Click + Dim SQL As String = "SELECT [bnk_KundenNr] as KdNr,[bnk_iban] as IBAN,[bnk_bic] as BIC,[bnk_anschrift] as Name,isnull([bnk_hauptkonto],0) as HK,isnull([bnk_archiv],0) as geschlossen ,cast([bnk_Datum] as Date) as Datum + FROM tblBankverbindungen order by bnk_KundenNr" + + Dim dt_Bank As DataTable = (New SQL).loadDgvBySql(SQL, "FMZOLL") + VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt_Bank,,,,,,,, True) + + End Sub End Class diff --git a/SDL/mdm/usrCntlMDMAuswertungen.vb b/SDL/mdm/usrCntlMDMAuswertungen.vb index 5efae8d3..a696607e 100644 --- a/SDL/mdm/usrCntlMDMAuswertungen.vb +++ b/SDL/mdm/usrCntlMDMAuswertungen.vb @@ -1523,6 +1523,7 @@ Public Class usrCntlMDMAuswertungen Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim frm As New Form + frm.Icon = My.Resources.sdl_ico frm.Size = New Size(1600, 1000) uscCntl.Size = New Size(frm.Size.Width - 50, frm.Size.Height - 50) diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb index 125ecc6e..9f37ecaa 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb @@ -484,7 +484,7 @@ Public Class cCreditSafeAPI If company IsNot Nothing AndAlso IsDate(company.lastChecked) Then checkDate = company.lastChecked.ToString("yyyy-MM-ddTHH:mm:ss") Else - checkDate = Today().AddDays(-30).ToString("yyyy-MM-ddTHH:mm:ss") + checkDate = Today().AddDays(-365).ToString("yyyy-MM-ddTHH:mm:ss") End If Dim failureDesc As String