diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index c8d50159..08297513 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -1878,7 +1878,7 @@ Public Class cFakturierung Dim Paramslist As New cParameterList(VERAG_PROG_ALLGEMEIN.cAllgemein.PROGID) Dim enableZugpferd = Paramslist.GET_PARAMETER_VALUE_BOOL("ZUGFeRD") If enableZugpferd Then - tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.addAttachementToPDF(tmpPath, createZUGFeRD(True, RECHNUNG)) + tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.addAttachementToPDF(tmpPath, createZUGFeRD(True, RECHNUNG,), "ZUGFeRD-invoice.xml") Else Dim Zugferdpath = createZUGFeRD(True, RECHNUNG) @@ -2088,10 +2088,13 @@ Public Class cFakturierung '--------------------------------EINZELRECHNUNG----------------------------------- '--------------------------------------------------------------------------------- + Dim RECHNUNG_AD As cAdressen + Dim RECHNUNG_KD As cKunde + If RECHNUNG.RechnungsKundenNr > 0 Then - Dim RECHNUNG_AD As New VERAG_PROG_ALLGEMEIN.cAdressen(RECHNUNG.RechnungsKundenNr) - Dim RECHNUNG_KD As New VERAG_PROG_ALLGEMEIN.cKunde(RECHNUNG.RechnungsKundenNr) + RECHNUNG_AD = New VERAG_PROG_ALLGEMEIN.cAdressen(RECHNUNG.RechnungsKundenNr) + RECHNUNG_KD = New VERAG_PROG_ALLGEMEIN.cKunde(RECHNUNG.RechnungsKundenNr) If RECHNUNG_KD.Zahlungsziel IsNot Nothing AndAlso IsNumeric(RECHNUNG_KD.Zahlungsziel) Then ZZTage = RECHNUNG_KD.Zahlungsziel @@ -2115,9 +2118,21 @@ Public Class cFakturierung If RECHNUNG.Text IsNot Nothing Then desc.AddNote(RECHNUNG.Text.ToString, SubjectCodes.AAI) desc.AddNote("Es bestehen Rabatt- und Bonusvereinbarungen.", SubjectCodes.AAK) - desc.SetBuyer(RECHNUNG.RechnungsName_1, RECHNUNG.RechnungsOrt, RECHNUNG.RechnungsOrt, RECHNUNG.RechnungsStraße, GetCountryCodeFromLandKZ(RECHNUNG.RechnungsLandKz, vatBuyer), IIf(Not IsDBNull(RECHNUNG.KundenNrZentrale), RECHNUNG.KundenNrZentrale, "")) - desc.SetSeller(FIRMA.Firma_Bez, FIRMA.Firma_Ort, FIRMA.Firma_Ort, FIRMA.Firma_Straße, GetCountryCodeFromLandKZ(FIRMA.Firma_LandKz, vatSeller)) + Dim KundePLZ As String = "" + Dim KundeOrt As String = "" + + If RECHNUNG_AD IsNot Nothing AndAlso RECHNUNG_AD.Postfach IsNot Nothing AndAlso RECHNUNG_AD IsNot Nothing Then + KundePLZ = RECHNUNG_AD.Postfach + KundeOrt = RECHNUNG_AD.PLZ + End If + + desc.SetBuyer(RECHNUNG.RechnungsName_1, IIf(KundePLZ <> "", KundePLZ, RECHNUNG.RechnungsOrt), IIf(KundeOrt <> "", KundeOrt, RECHNUNG.RechnungsOrt), RECHNUNG.RechnungsStraße, GetCountryCodeFromLandKZ(RECHNUNG.RechnungsLandKz, vatBuyer), IIf(Not IsDBNull(RECHNUNG.KundenNrZentrale), RECHNUNG.KundenNrZentrale, "")) + + Dim FirmaOrt = FIRMA.Firma_Ort + FirmaOrt = FirmaOrt.Replace(FIRMA.Firma_LandKz & "-" & FIRMA.Firma_PLZ & " ", "") + + desc.SetSeller(FIRMA.Firma_Bez, FIRMA.Firma_PLZ, FirmaOrt, FIRMA.Firma_Straße, GetCountryCodeFromLandKZ(FIRMA.Firma_LandKz, vatSeller)) desc.AddSellerTaxRegistration(FIRMA.Firma_UID.ToString.Replace("UID: ", ""), TaxRegistrationSchemeID.VA) ' Optionally, to support Peppol----------------------------- @@ -2354,9 +2369,25 @@ Public Class cFakturierung End If + Dim FirmaOrt = FIRMA.Firma_Ort + FirmaOrt = FirmaOrt.Replace(FIRMA.Firma_LandKz & "-" & FIRMA.Firma_PLZ & " ", "") - desc.SetBuyer(ROW("RechnungsName 1") & " " & Rechnugnsname2, RechnungsOrt, RechnungsOrt, RechnungsStraße, GetCountryCodeFromLandKZ(RechnungsLandKz, vatBuyer), IIf(Not IsDBNull(ROW("RechnungsKundenNr")), ROW("RechnungsKundenNr"), "")) - desc.SetSeller(FIRMA.Firma_Bez, FIRMA.Firma_Ort, FIRMA.Firma_Ort, FIRMA.Firma_Straße, GetCountryCodeFromLandKZ(FIRMA.Firma_LandKz, vatSeller)) + + Dim KundePLZ As String = "" + Dim KundeOrt As String = "" + + If RECHNUNG_AD IsNot Nothing AndAlso RECHNUNG_AD.Postfach IsNot Nothing AndAlso RECHNUNG_AD.PLZ IsNot Nothing AndAlso RECHNUNG_AD.Postfach <> "" AndAlso RECHNUNG_AD.PLZ <> "" Then + KundePLZ = RECHNUNG_AD.Postfach + KundeOrt = RECHNUNG_AD.PLZ + Else + KundePLZ = RechnungsOrt + KundeOrt = RechnungsOrt + + End If + + desc.SetBuyer(ROW("RechnungsName 1") & " " & Rechnugnsname2, KundePLZ, KundeOrt, RechnungsStraße, GetCountryCodeFromLandKZ(RechnungsLandKz, vatBuyer), IIf(Not IsDBNull(ROW("RechnungsKundenNr")), ROW("RechnungsKundenNr"), "")) + + desc.SetSeller(FIRMA.Firma_Bez, FIRMA.Firma_PLZ, FirmaOrt, FIRMA.Firma_Straße, GetCountryCodeFromLandKZ(FIRMA.Firma_LandKz, vatSeller)) If FIRMA.Firma_Steuernummer IsNot Nothing Then desc.AddSellerTaxRegistration(FIRMA.Firma_Steuernummer, TaxRegistrationSchemeID.FC) desc.AddSellerTaxRegistration(FIRMA.Firma_UID.ToString.Replace("UID: ", ""), TaxRegistrationSchemeID.VA) @@ -4213,7 +4244,7 @@ Public Class cFakturierung Dim Paramslist As New cParameterList(VERAG_PROG_ALLGEMEIN.cAllgemein.PROGID) Dim enableZugpferd = Paramslist.GET_PARAMETER_VALUE_BOOL("ZUGFeRD") If enableZugpferd Then - tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.addAttachementToPDF(tmpPath, createZUGFeRD(False, Nothing, SammelrechnungsDT, , rpt)) + tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.addAttachementToPDF(tmpPath, createZUGFeRD(False, Nothing, SammelrechnungsDT, , rpt), "ZUGFeRD-invoice.xml") Else Dim Zugferdpath = createZUGFeRD(False, Nothing, SammelrechnungsDT,, rpt) If Zugferdpath IsNot Nothing AndAlso Zugferdpath <> "" Then @@ -4883,7 +4914,7 @@ Public Class cFakturierung Dim Paramslist As New cParameterList(VERAG_PROG_ALLGEMEIN.cAllgemein.PROGID) Dim enableZugpferd = Paramslist.GET_PARAMETER_VALUE_BOOL("ZUGFeRD") If enableZugpferd Then - tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.addAttachementToPDF(tmpPath, createZUGFeRD(False, Nothing, dt, rpt)) + tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.addAttachementToPDF(tmpPath, createZUGFeRD(False, Nothing, dt, rpt), "ZUGFeRD-invoice.xml") Else Dim Zugferdpath = createZUGFeRD(False, Nothing, dt, rpt) If Zugferdpath IsNot Nothing AndAlso Zugferdpath <> "" Then diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index e7958e6e..495729e5 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/My Project/Resources.Designer.vb b/SDL/My Project/Resources.Designer.vb index c77695a0..4b234d07 100644 --- a/SDL/My Project/Resources.Designer.vb +++ b/SDL/My Project/Resources.Designer.vb @@ -449,6 +449,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Byte[]. + ''' + Friend ReadOnly Property CBAM_Auswertung_GP() As Byte() + Get + Dim obj As Object = ResourceManager.GetObject("CBAM_Auswertung_GP", resourceCulture) + Return CType(obj,Byte()) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/SDL/My Project/Resources.resx b/SDL/My Project/Resources.resx index b6fe8715..98fba931 100644 --- a/SDL/My Project/Resources.resx +++ b/SDL/My Project/Resources.resx @@ -958,4 +958,7 @@ ..\Resources\Detailauswertung_divers.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\CBAM_Auswertung_GP.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/SDL/Resources/CBAM_Auswertung_GP.xlsx b/SDL/Resources/CBAM_Auswertung_GP.xlsx new file mode 100644 index 00000000..a9b1fce5 Binary files /dev/null and b/SDL/Resources/CBAM_Auswertung_GP.xlsx differ diff --git a/SDL/Resources/CBAM_GP.xlsx b/SDL/Resources/CBAM_GP.xlsx new file mode 100644 index 00000000..2d1249c6 Binary files /dev/null and b/SDL/Resources/CBAM_GP.xlsx differ diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index 8a491d17..923adcd0 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -4661,6 +4661,8 @@ + + Always diff --git a/SDL/kunden/frmBonitätsverlauf.vb b/SDL/kunden/frmBonitätsverlauf.vb index 61cd80d6..55115008 100644 --- a/SDL/kunden/frmBonitätsverlauf.vb +++ b/SDL/kunden/frmBonitätsverlauf.vb @@ -43,9 +43,10 @@ Public Class frmBonitätsverlauf If KdSearchBox1.KdNr_value > 0 Then With MyDatagridview1 Dim sqlstr As String = "" + Dim KD_ERW As New cKundenErweitert(KdSearchBox1.KdNr_value) - If KD_ERW.kde_CreditSaveId IsNot Nothing AndAlso KD_ERW.kde_CreditSaveId <> "" AndAlso newView Then + If KD_ERW.kde_CreditSaveId IsNot Nothing AndAlso KD_ERW.kde_CreditSaveId <> "" Then Dim sqlIndex As String = "" @@ -55,23 +56,18 @@ Public Class frmBonitätsverlauf sqlIndex = "ba_CreditSaveBonitaetsIndex" End If - sqlstr &= "SELECT * - FROM ( - SELECT ba_Datum," & sqlIndex & " ,ba_GruendundsDatum,ba_Umsatz,ba_Mitarbeiter,ba_Hoechstkredit,ba_Sachbearbeiter,ba_Zahlungsweise,ba_GFName,ba_Risikostufe,ba_CreditSaveRisikoklasse,ba_Pruefungstool,ba_GSName,ba_Geschaeftszweck,ba_datenarchivId - FROM tblBonitaetsauskunft - WHERE ba_KundenNr = " & KdSearchBox1.KdNr_value & " - - UNION ALL + Dim sqlNewViewAdd As String = " UNION ALL SELECT - CAST(e.eventDate AS DATE) AS ba_Datum,MAX(e.crValue) AS " & sqlIndex & ",NULL AS ba_GruendundsDatum,NULL AS ba_Umsatz,NULL AS ba_Mitarbeiter,MAX(e.clValue) AS ba_Hoechstkredit,MAX(e.sachbearbeiter) AS ba_Sachbearbeiter,NULL AS ba_Zahlungsweise,NULL AS ba_GFName,NULL AS ba_Risikostufe,NULL AS ba_CreditSaveRisikoklasse,Source AS ba_Pruefungstool,NULL AS ba_GSName,NULL AS ba_Geschaeftszweck,NULL AS ba_datenarchivId + CAST(e.eventDate AS DATE) AS ba_Datum,MAX(e.crValue) AS " & sqlIndex & ",NULL AS ba_GruendundsDatum,NULL AS ba_Umsatz,NULL AS ba_Mitarbeiter,MAX(e.clValue) AS ba_Hoechstkredit,MAX(e.sachbearbeiter) AS ba_Sachbearbeiter,NULL AS ba_Zahlungsweise,NULL AS ba_GFName,NULL AS ba_Risikostufe,MAX(e.newRiskClass) AS ba_CreditSaveRisikoklasse,Source AS ba_Pruefungstool,NULL AS ba_GSName,NULL AS ba_Geschaeftszweck,NULL AS ba_datenarchivId FROM ( SELECT e.companyId, e.portfolioId, e.eventDate, e.sachbearbeiter, - CASE WHEN e.localEventCode = 'CR' OR e.globalEventCode = 'CR' THEN e.newValueCR ELSE 0 END AS crValue, + e.newRiskClass, + CASE WHEN e.localEventCode = 'CR' OR e.globalEventCode = 'CR' THEN " & IIf(Not KD_ERW.kde_CreditSaveId.ToLower.Contains("at"), "e.newValueCRIndex", "e.newValueCR") & " ELSE 0 END AS crValue, CASE WHEN e.localEventCode = 'CL' OR e.globalEventCode = 'CL' THEN e.newValueCL ELSE 0 END AS clValue, 'creditsafe API' AS Source FROM [VERAG].[dbo].[tblCreditsafeEvents] e @@ -81,10 +77,20 @@ Public Class frmBonitätsverlauf AND b.ba_Pruefungstool = 'creditsafe API' AND (e.localEventCode IN ('CL','CR') OR e.globalEventCode IN ('CL','CR')) ) e - GROUP BY e.companyId, e.portfolioId, CAST(e.eventDate AS DATE), Source - ) AS Temp + GROUP BY e.companyId, e.portfolioId, CAST(e.eventDate AS DATE), Source" + + + sqlstr &= "SELECT * + FROM ( + SELECT ba_Datum," & sqlIndex & " ,ba_GruendundsDatum,ba_Umsatz,ba_Mitarbeiter,ba_Hoechstkredit,ba_Sachbearbeiter,ba_Zahlungsweise,ba_GFName,ba_Risikostufe,ba_CreditSaveRisikoklasse,ba_Pruefungstool,ba_GSName,ba_Geschaeftszweck,ba_datenarchivId + FROM tblBonitaetsauskunft + WHERE ba_KundenNr = " & KdSearchBox1.KdNr_value & IIf(newView, sqlNewViewAdd, "") & ") AS Temp ORDER BY Temp.ba_Datum DESC;" + Else + + sqlstr = "SELECT * FROM [tblBonitaetsauskunft] where ba_KundenNr=" & KdSearchBox1.KdNr_value & " ORDER BY ba_Datum DESC" + End If diff --git a/SDL/kunden/usrCntlCBAM.Designer.vb b/SDL/kunden/usrCntlCBAM.Designer.vb index 579dd3af..c9a6c6ab 100644 --- a/SDL/kunden/usrCntlCBAM.Designer.vb +++ b/SDL/kunden/usrCntlCBAM.Designer.vb @@ -44,12 +44,12 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_DHF_VERAG = New System.Windows.Forms.Button() Me.btnCBAM_DS_DAKOSY = New System.Windows.Forms.Button() Me.Label3 = New System.Windows.Forms.Label() - Me.btnCBAM_DS_DAKOSY_Deteil = New System.Windows.Forms.Button() + Me.btnCBAM_DS_DAKOSY_Detail = New System.Windows.Forms.Button() Me.btnCBAM_DS_DAKOSY_Summe = New System.Windows.Forms.Button() Me.btnCBAM_DS_DHF_VERAG_Summe = New System.Windows.Forms.Button() - Me.btnCBAM_DS_DHF_VERAG_Deteil = New System.Windows.Forms.Button() + Me.btnCBAM_DS_DHF_VERAG_Detail = New System.Windows.Forms.Button() Me.btnCBAM_DS_DHF_UNISPED_Summe = New System.Windows.Forms.Button() - Me.btnCBAM_DS_DHF_UNISPED_Deteil = New System.Windows.Forms.Button() + Me.btnCBAM_DS_DHF_UNISPED_Detail = New System.Windows.Forms.Button() Me.btnCBAM_DS_TELOTEC_Summe = New System.Windows.Forms.Button() Me.btnCBAM_DS_TELOTEC_Detail = New System.Windows.Forms.Button() Me.Label6 = New System.Windows.Forms.Label() @@ -70,6 +70,10 @@ Partial Class usrCntlCBAM Me.txtEori = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Button1 = New System.Windows.Forms.Button() Me.btnCBAM_DS_DAKOSY_Spedb = New System.Windows.Forms.Button() + Me.btnCBAM_DS_DAKOSY_GP = New System.Windows.Forms.Button() + Me.btnCBAM_DS_DHF_VERAG_GP = New System.Windows.Forms.Button() + Me.btnCBAM_DS_DHF_UNISPED_GP = New System.Windows.Forms.Button() + Me.btnCBAM_DS_TELOTEC_GP = New System.Windows.Forms.Button() Me.cntxtAddSdl.SuspendLayout() Me.MyPanel1.SuspendLayout() Me.SuspendLayout() @@ -244,7 +248,7 @@ Partial Class usrCntlCBAM 'btnCBAM_DS_DHF_UNISPED ' Me.btnCBAM_DS_DHF_UNISPED.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnCBAM_DS_DHF_UNISPED.Location = New System.Drawing.Point(454, 168) + Me.btnCBAM_DS_DHF_UNISPED.Location = New System.Drawing.Point(454, 167) Me.btnCBAM_DS_DHF_UNISPED.Name = "btnCBAM_DS_DHF_UNISPED" Me.btnCBAM_DS_DHF_UNISPED.Size = New System.Drawing.Size(168, 42) Me.btnCBAM_DS_DHF_UNISPED.TabIndex = 24 @@ -254,7 +258,7 @@ Partial Class usrCntlCBAM 'btnCBAM_DS_TELOTEC ' Me.btnCBAM_DS_TELOTEC.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnCBAM_DS_TELOTEC.Location = New System.Drawing.Point(628, 168) + Me.btnCBAM_DS_TELOTEC.Location = New System.Drawing.Point(628, 167) Me.btnCBAM_DS_TELOTEC.Name = "btnCBAM_DS_TELOTEC" Me.btnCBAM_DS_TELOTEC.Size = New System.Drawing.Size(168, 42) Me.btnCBAM_DS_TELOTEC.TabIndex = 23 @@ -264,7 +268,7 @@ Partial Class usrCntlCBAM 'btnCBAM_DS_DHF_VERAG ' Me.btnCBAM_DS_DHF_VERAG.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnCBAM_DS_DHF_VERAG.Location = New System.Drawing.Point(280, 168) + Me.btnCBAM_DS_DHF_VERAG.Location = New System.Drawing.Point(280, 167) Me.btnCBAM_DS_DHF_VERAG.Name = "btnCBAM_DS_DHF_VERAG" Me.btnCBAM_DS_DHF_VERAG.Size = New System.Drawing.Size(168, 42) Me.btnCBAM_DS_DHF_VERAG.TabIndex = 22 @@ -274,7 +278,7 @@ Partial Class usrCntlCBAM 'btnCBAM_DS_DAKOSY ' Me.btnCBAM_DS_DAKOSY.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnCBAM_DS_DAKOSY.Location = New System.Drawing.Point(106, 168) + Me.btnCBAM_DS_DAKOSY.Location = New System.Drawing.Point(106, 167) Me.btnCBAM_DS_DAKOSY.Name = "btnCBAM_DS_DAKOSY" Me.btnCBAM_DS_DAKOSY.Size = New System.Drawing.Size(168, 42) Me.btnCBAM_DS_DAKOSY.TabIndex = 21 @@ -284,25 +288,25 @@ Partial Class usrCntlCBAM 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(5, 183) + Me.Label3.Location = New System.Drawing.Point(5, 182) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(64, 13) Me.Label3.TabIndex = 25 Me.Label3.Text = "Datensätze:" ' - 'btnCBAM_DS_DAKOSY_Deteil + 'btnCBAM_DS_DAKOSY_Detail ' - Me.btnCBAM_DS_DAKOSY_Deteil.Enabled = False - Me.btnCBAM_DS_DAKOSY_Deteil.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnCBAM_DS_DAKOSY_Deteil.Image = Global.SDL.My.Resources.Resources.Excel_logo - Me.btnCBAM_DS_DAKOSY_Deteil.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_DAKOSY_Deteil.Location = New System.Drawing.Point(144, 216) - Me.btnCBAM_DS_DAKOSY_Deteil.Name = "btnCBAM_DS_DAKOSY_Deteil" - Me.btnCBAM_DS_DAKOSY_Deteil.Size = New System.Drawing.Size(130, 42) - Me.btnCBAM_DS_DAKOSY_Deteil.TabIndex = 26 - Me.btnCBAM_DS_DAKOSY_Deteil.Text = "Detailbericht" - Me.btnCBAM_DS_DAKOSY_Deteil.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnCBAM_DS_DAKOSY_Deteil.UseVisualStyleBackColor = True + Me.btnCBAM_DS_DAKOSY_Detail.Enabled = False + Me.btnCBAM_DS_DAKOSY_Detail.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnCBAM_DS_DAKOSY_Detail.Image = Global.SDL.My.Resources.Resources.Excel_logo + Me.btnCBAM_DS_DAKOSY_Detail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnCBAM_DS_DAKOSY_Detail.Location = New System.Drawing.Point(144, 215) + Me.btnCBAM_DS_DAKOSY_Detail.Name = "btnCBAM_DS_DAKOSY_Detail" + Me.btnCBAM_DS_DAKOSY_Detail.Size = New System.Drawing.Size(130, 42) + Me.btnCBAM_DS_DAKOSY_Detail.TabIndex = 26 + Me.btnCBAM_DS_DAKOSY_Detail.Text = "Detailbericht" + Me.btnCBAM_DS_DAKOSY_Detail.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnCBAM_DS_DAKOSY_Detail.UseVisualStyleBackColor = True ' 'btnCBAM_DS_DAKOSY_Summe ' @@ -310,7 +314,7 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_DAKOSY_Summe.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCBAM_DS_DAKOSY_Summe.Image = Global.SDL.My.Resources.Resources.Excel_logo Me.btnCBAM_DS_DAKOSY_Summe.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_DAKOSY_Summe.Location = New System.Drawing.Point(144, 264) + Me.btnCBAM_DS_DAKOSY_Summe.Location = New System.Drawing.Point(144, 301) Me.btnCBAM_DS_DAKOSY_Summe.Name = "btnCBAM_DS_DAKOSY_Summe" Me.btnCBAM_DS_DAKOSY_Summe.Size = New System.Drawing.Size(130, 42) Me.btnCBAM_DS_DAKOSY_Summe.TabIndex = 27 @@ -324,7 +328,7 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_DHF_VERAG_Summe.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCBAM_DS_DHF_VERAG_Summe.Image = Global.SDL.My.Resources.Resources.Excel_logo Me.btnCBAM_DS_DHF_VERAG_Summe.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_DHF_VERAG_Summe.Location = New System.Drawing.Point(318, 264) + Me.btnCBAM_DS_DHF_VERAG_Summe.Location = New System.Drawing.Point(318, 301) Me.btnCBAM_DS_DHF_VERAG_Summe.Name = "btnCBAM_DS_DHF_VERAG_Summe" Me.btnCBAM_DS_DHF_VERAG_Summe.Size = New System.Drawing.Size(130, 42) Me.btnCBAM_DS_DHF_VERAG_Summe.TabIndex = 29 @@ -332,19 +336,19 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_DHF_VERAG_Summe.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.btnCBAM_DS_DHF_VERAG_Summe.UseVisualStyleBackColor = True ' - 'btnCBAM_DS_DHF_VERAG_Deteil + 'btnCBAM_DS_DHF_VERAG_Detail ' - Me.btnCBAM_DS_DHF_VERAG_Deteil.Enabled = False - Me.btnCBAM_DS_DHF_VERAG_Deteil.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnCBAM_DS_DHF_VERAG_Deteil.Image = Global.SDL.My.Resources.Resources.Excel_logo - Me.btnCBAM_DS_DHF_VERAG_Deteil.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_DHF_VERAG_Deteil.Location = New System.Drawing.Point(318, 216) - Me.btnCBAM_DS_DHF_VERAG_Deteil.Name = "btnCBAM_DS_DHF_VERAG_Deteil" - Me.btnCBAM_DS_DHF_VERAG_Deteil.Size = New System.Drawing.Size(130, 42) - Me.btnCBAM_DS_DHF_VERAG_Deteil.TabIndex = 28 - Me.btnCBAM_DS_DHF_VERAG_Deteil.Text = "Detailbericht" - Me.btnCBAM_DS_DHF_VERAG_Deteil.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnCBAM_DS_DHF_VERAG_Deteil.UseVisualStyleBackColor = True + Me.btnCBAM_DS_DHF_VERAG_Detail.Enabled = False + Me.btnCBAM_DS_DHF_VERAG_Detail.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnCBAM_DS_DHF_VERAG_Detail.Image = Global.SDL.My.Resources.Resources.Excel_logo + Me.btnCBAM_DS_DHF_VERAG_Detail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnCBAM_DS_DHF_VERAG_Detail.Location = New System.Drawing.Point(318, 215) + Me.btnCBAM_DS_DHF_VERAG_Detail.Name = "btnCBAM_DS_DHF_VERAG_Detail" + Me.btnCBAM_DS_DHF_VERAG_Detail.Size = New System.Drawing.Size(130, 42) + Me.btnCBAM_DS_DHF_VERAG_Detail.TabIndex = 28 + Me.btnCBAM_DS_DHF_VERAG_Detail.Text = "Detailbericht" + Me.btnCBAM_DS_DHF_VERAG_Detail.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnCBAM_DS_DHF_VERAG_Detail.UseVisualStyleBackColor = True ' 'btnCBAM_DS_DHF_UNISPED_Summe ' @@ -352,7 +356,7 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_DHF_UNISPED_Summe.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCBAM_DS_DHF_UNISPED_Summe.Image = Global.SDL.My.Resources.Resources.Excel_logo Me.btnCBAM_DS_DHF_UNISPED_Summe.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_DHF_UNISPED_Summe.Location = New System.Drawing.Point(492, 264) + Me.btnCBAM_DS_DHF_UNISPED_Summe.Location = New System.Drawing.Point(492, 301) Me.btnCBAM_DS_DHF_UNISPED_Summe.Name = "btnCBAM_DS_DHF_UNISPED_Summe" Me.btnCBAM_DS_DHF_UNISPED_Summe.Size = New System.Drawing.Size(130, 42) Me.btnCBAM_DS_DHF_UNISPED_Summe.TabIndex = 31 @@ -360,19 +364,19 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_DHF_UNISPED_Summe.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.btnCBAM_DS_DHF_UNISPED_Summe.UseVisualStyleBackColor = True ' - 'btnCBAM_DS_DHF_UNISPED_Deteil + 'btnCBAM_DS_DHF_UNISPED_Detail ' - Me.btnCBAM_DS_DHF_UNISPED_Deteil.Enabled = False - Me.btnCBAM_DS_DHF_UNISPED_Deteil.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnCBAM_DS_DHF_UNISPED_Deteil.Image = Global.SDL.My.Resources.Resources.Excel_logo - Me.btnCBAM_DS_DHF_UNISPED_Deteil.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_DHF_UNISPED_Deteil.Location = New System.Drawing.Point(492, 216) - Me.btnCBAM_DS_DHF_UNISPED_Deteil.Name = "btnCBAM_DS_DHF_UNISPED_Deteil" - Me.btnCBAM_DS_DHF_UNISPED_Deteil.Size = New System.Drawing.Size(130, 42) - Me.btnCBAM_DS_DHF_UNISPED_Deteil.TabIndex = 30 - Me.btnCBAM_DS_DHF_UNISPED_Deteil.Text = "Detailbericht" - Me.btnCBAM_DS_DHF_UNISPED_Deteil.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnCBAM_DS_DHF_UNISPED_Deteil.UseVisualStyleBackColor = True + Me.btnCBAM_DS_DHF_UNISPED_Detail.Enabled = False + Me.btnCBAM_DS_DHF_UNISPED_Detail.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnCBAM_DS_DHF_UNISPED_Detail.Image = Global.SDL.My.Resources.Resources.Excel_logo + Me.btnCBAM_DS_DHF_UNISPED_Detail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnCBAM_DS_DHF_UNISPED_Detail.Location = New System.Drawing.Point(492, 215) + Me.btnCBAM_DS_DHF_UNISPED_Detail.Name = "btnCBAM_DS_DHF_UNISPED_Detail" + Me.btnCBAM_DS_DHF_UNISPED_Detail.Size = New System.Drawing.Size(130, 42) + Me.btnCBAM_DS_DHF_UNISPED_Detail.TabIndex = 30 + Me.btnCBAM_DS_DHF_UNISPED_Detail.Text = "Detailbericht" + Me.btnCBAM_DS_DHF_UNISPED_Detail.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnCBAM_DS_DHF_UNISPED_Detail.UseVisualStyleBackColor = True ' 'btnCBAM_DS_TELOTEC_Summe ' @@ -380,7 +384,7 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_TELOTEC_Summe.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCBAM_DS_TELOTEC_Summe.Image = Global.SDL.My.Resources.Resources.Excel_logo Me.btnCBAM_DS_TELOTEC_Summe.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_TELOTEC_Summe.Location = New System.Drawing.Point(666, 264) + Me.btnCBAM_DS_TELOTEC_Summe.Location = New System.Drawing.Point(666, 301) Me.btnCBAM_DS_TELOTEC_Summe.Name = "btnCBAM_DS_TELOTEC_Summe" Me.btnCBAM_DS_TELOTEC_Summe.Size = New System.Drawing.Size(130, 42) Me.btnCBAM_DS_TELOTEC_Summe.TabIndex = 33 @@ -394,7 +398,7 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_TELOTEC_Detail.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCBAM_DS_TELOTEC_Detail.Image = Global.SDL.My.Resources.Resources.Excel_logo Me.btnCBAM_DS_TELOTEC_Detail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_TELOTEC_Detail.Location = New System.Drawing.Point(666, 216) + Me.btnCBAM_DS_TELOTEC_Detail.Location = New System.Drawing.Point(666, 215) Me.btnCBAM_DS_TELOTEC_Detail.Name = "btnCBAM_DS_TELOTEC_Detail" Me.btnCBAM_DS_TELOTEC_Detail.Size = New System.Drawing.Size(130, 42) Me.btnCBAM_DS_TELOTEC_Detail.TabIndex = 32 @@ -416,7 +420,7 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_DAKOSY_Copy.Enabled = False Me.btnCBAM_DS_DAKOSY_Copy.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCBAM_DS_DAKOSY_Copy.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_DAKOSY_Copy.Location = New System.Drawing.Point(144, 360) + Me.btnCBAM_DS_DAKOSY_Copy.Location = New System.Drawing.Point(144, 394) Me.btnCBAM_DS_DAKOSY_Copy.Name = "btnCBAM_DS_DAKOSY_Copy" Me.btnCBAM_DS_DAKOSY_Copy.Size = New System.Drawing.Size(130, 42) Me.btnCBAM_DS_DAKOSY_Copy.TabIndex = 35 @@ -428,7 +432,7 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_DHF_VERAG_Copy.Enabled = False Me.btnCBAM_DS_DHF_VERAG_Copy.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCBAM_DS_DHF_VERAG_Copy.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_DHF_VERAG_Copy.Location = New System.Drawing.Point(318, 312) + Me.btnCBAM_DS_DHF_VERAG_Copy.Location = New System.Drawing.Point(318, 347) Me.btnCBAM_DS_DHF_VERAG_Copy.Name = "btnCBAM_DS_DHF_VERAG_Copy" Me.btnCBAM_DS_DHF_VERAG_Copy.Size = New System.Drawing.Size(130, 42) Me.btnCBAM_DS_DHF_VERAG_Copy.TabIndex = 36 @@ -440,7 +444,7 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_DHF_UNISPED_Copy.Enabled = False Me.btnCBAM_DS_DHF_UNISPED_Copy.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCBAM_DS_DHF_UNISPED_Copy.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_DHF_UNISPED_Copy.Location = New System.Drawing.Point(492, 312) + Me.btnCBAM_DS_DHF_UNISPED_Copy.Location = New System.Drawing.Point(492, 347) Me.btnCBAM_DS_DHF_UNISPED_Copy.Name = "btnCBAM_DS_DHF_UNISPED_Copy" Me.btnCBAM_DS_DHF_UNISPED_Copy.Size = New System.Drawing.Size(130, 42) Me.btnCBAM_DS_DHF_UNISPED_Copy.TabIndex = 37 @@ -452,7 +456,7 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_TELOTEC_Copy.Enabled = False Me.btnCBAM_DS_TELOTEC_Copy.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCBAM_DS_TELOTEC_Copy.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_TELOTEC_Copy.Location = New System.Drawing.Point(666, 312) + Me.btnCBAM_DS_TELOTEC_Copy.Location = New System.Drawing.Point(666, 347) Me.btnCBAM_DS_TELOTEC_Copy.Name = "btnCBAM_DS_TELOTEC_Copy" Me.btnCBAM_DS_TELOTEC_Copy.Size = New System.Drawing.Size(130, 42) Me.btnCBAM_DS_TELOTEC_Copy.TabIndex = 38 @@ -465,7 +469,7 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_DAKOSY_XML.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCBAM_DS_DAKOSY_XML.Image = Global.SDL.My.Resources.Resources.xml Me.btnCBAM_DS_DAKOSY_XML.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_DAKOSY_XML.Location = New System.Drawing.Point(144, 477) + Me.btnCBAM_DS_DAKOSY_XML.Location = New System.Drawing.Point(144, 485) Me.btnCBAM_DS_DAKOSY_XML.Name = "btnCBAM_DS_DAKOSY_XML" Me.btnCBAM_DS_DAKOSY_XML.Size = New System.Drawing.Size(130, 42) Me.btnCBAM_DS_DAKOSY_XML.TabIndex = 40 @@ -477,7 +481,7 @@ Partial Class usrCntlCBAM Me.Button2.Enabled = False Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button2.Location = New System.Drawing.Point(144, 525) + Me.Button2.Location = New System.Drawing.Point(144, 532) Me.Button2.Name = "Button2" Me.Button2.Size = New System.Drawing.Size(130, 42) Me.Button2.TabIndex = 42 @@ -631,7 +635,7 @@ Partial Class usrCntlCBAM 'Button1 ' Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button1.Location = New System.Drawing.Point(106, 429) + Me.Button1.Location = New System.Drawing.Point(106, 438) Me.Button1.Name = "Button1" Me.Button1.Size = New System.Drawing.Size(168, 42) Me.Button1.TabIndex = 44 @@ -644,7 +648,7 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_DAKOSY_Spedb.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCBAM_DS_DAKOSY_Spedb.Image = Global.SDL.My.Resources.Resources.Excel_logo Me.btnCBAM_DS_DAKOSY_Spedb.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_DAKOSY_Spedb.Location = New System.Drawing.Point(144, 312) + Me.btnCBAM_DS_DAKOSY_Spedb.Location = New System.Drawing.Point(144, 347) Me.btnCBAM_DS_DAKOSY_Spedb.Name = "btnCBAM_DS_DAKOSY_Spedb" Me.btnCBAM_DS_DAKOSY_Spedb.Size = New System.Drawing.Size(130, 42) Me.btnCBAM_DS_DAKOSY_Spedb.TabIndex = 45 @@ -652,11 +656,71 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_DAKOSY_Spedb.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.btnCBAM_DS_DAKOSY_Spedb.UseVisualStyleBackColor = True ' + 'btnCBAM_DS_DAKOSY_GP + ' + Me.btnCBAM_DS_DAKOSY_GP.Enabled = False + Me.btnCBAM_DS_DAKOSY_GP.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnCBAM_DS_DAKOSY_GP.Image = Global.SDL.My.Resources.Resources.Excel_logo + Me.btnCBAM_DS_DAKOSY_GP.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnCBAM_DS_DAKOSY_GP.Location = New System.Drawing.Point(144, 258) + Me.btnCBAM_DS_DAKOSY_GP.Name = "btnCBAM_DS_DAKOSY_GP" + Me.btnCBAM_DS_DAKOSY_GP.Size = New System.Drawing.Size(130, 42) + Me.btnCBAM_DS_DAKOSY_GP.TabIndex = 46 + Me.btnCBAM_DS_DAKOSY_GP.Text = "GP Detailbericht" + Me.btnCBAM_DS_DAKOSY_GP.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnCBAM_DS_DAKOSY_GP.UseVisualStyleBackColor = True + ' + 'btnCBAM_DS_DHF_VERAG_GP + ' + Me.btnCBAM_DS_DHF_VERAG_GP.Enabled = False + Me.btnCBAM_DS_DHF_VERAG_GP.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnCBAM_DS_DHF_VERAG_GP.Image = Global.SDL.My.Resources.Resources.Excel_logo + Me.btnCBAM_DS_DHF_VERAG_GP.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnCBAM_DS_DHF_VERAG_GP.Location = New System.Drawing.Point(318, 258) + Me.btnCBAM_DS_DHF_VERAG_GP.Name = "btnCBAM_DS_DHF_VERAG_GP" + Me.btnCBAM_DS_DHF_VERAG_GP.Size = New System.Drawing.Size(130, 42) + Me.btnCBAM_DS_DHF_VERAG_GP.TabIndex = 47 + Me.btnCBAM_DS_DHF_VERAG_GP.Text = "GP Detailbericht" + Me.btnCBAM_DS_DHF_VERAG_GP.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnCBAM_DS_DHF_VERAG_GP.UseVisualStyleBackColor = True + ' + 'btnCBAM_DS_DHF_UNISPED_GP + ' + Me.btnCBAM_DS_DHF_UNISPED_GP.Enabled = False + Me.btnCBAM_DS_DHF_UNISPED_GP.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnCBAM_DS_DHF_UNISPED_GP.Image = Global.SDL.My.Resources.Resources.Excel_logo + Me.btnCBAM_DS_DHF_UNISPED_GP.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnCBAM_DS_DHF_UNISPED_GP.Location = New System.Drawing.Point(492, 258) + Me.btnCBAM_DS_DHF_UNISPED_GP.Name = "btnCBAM_DS_DHF_UNISPED_GP" + Me.btnCBAM_DS_DHF_UNISPED_GP.Size = New System.Drawing.Size(130, 42) + Me.btnCBAM_DS_DHF_UNISPED_GP.TabIndex = 48 + Me.btnCBAM_DS_DHF_UNISPED_GP.Text = "GP Detailbericht" + Me.btnCBAM_DS_DHF_UNISPED_GP.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnCBAM_DS_DHF_UNISPED_GP.UseVisualStyleBackColor = True + ' + 'btnCBAM_DS_TELOTEC_GP + ' + Me.btnCBAM_DS_TELOTEC_GP.Enabled = False + Me.btnCBAM_DS_TELOTEC_GP.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnCBAM_DS_TELOTEC_GP.Image = Global.SDL.My.Resources.Resources.Excel_logo + Me.btnCBAM_DS_TELOTEC_GP.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnCBAM_DS_TELOTEC_GP.Location = New System.Drawing.Point(666, 258) + Me.btnCBAM_DS_TELOTEC_GP.Name = "btnCBAM_DS_TELOTEC_GP" + Me.btnCBAM_DS_TELOTEC_GP.Size = New System.Drawing.Size(130, 42) + Me.btnCBAM_DS_TELOTEC_GP.TabIndex = 49 + Me.btnCBAM_DS_TELOTEC_GP.Text = "GP Detailbericht" + Me.btnCBAM_DS_TELOTEC_GP.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnCBAM_DS_TELOTEC_GP.UseVisualStyleBackColor = True + ' 'usrCntlCBAM ' 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.btnCBAM_DS_TELOTEC_GP) + Me.Controls.Add(Me.btnCBAM_DS_DHF_UNISPED_GP) + Me.Controls.Add(Me.btnCBAM_DS_DHF_VERAG_GP) + Me.Controls.Add(Me.btnCBAM_DS_DAKOSY_GP) Me.Controls.Add(Me.btnCBAM_DS_DAKOSY_Spedb) Me.Controls.Add(Me.Button1) Me.Controls.Add(Me.Button2) @@ -670,11 +734,11 @@ Partial Class usrCntlCBAM Me.Controls.Add(Me.btnCBAM_DS_TELOTEC_Summe) Me.Controls.Add(Me.btnCBAM_DS_TELOTEC_Detail) Me.Controls.Add(Me.btnCBAM_DS_DHF_UNISPED_Summe) - Me.Controls.Add(Me.btnCBAM_DS_DHF_UNISPED_Deteil) + Me.Controls.Add(Me.btnCBAM_DS_DHF_UNISPED_Detail) Me.Controls.Add(Me.btnCBAM_DS_DHF_VERAG_Summe) - Me.Controls.Add(Me.btnCBAM_DS_DHF_VERAG_Deteil) + Me.Controls.Add(Me.btnCBAM_DS_DHF_VERAG_Detail) Me.Controls.Add(Me.btnCBAM_DS_DAKOSY_Summe) - Me.Controls.Add(Me.btnCBAM_DS_DAKOSY_Deteil) + Me.Controls.Add(Me.btnCBAM_DS_DAKOSY_Detail) Me.Controls.Add(Me.Label3) Me.Controls.Add(Me.btnCBAM_DS_DHF_UNISPED) Me.Controls.Add(Me.btnCBAM_DS_TELOTEC) @@ -735,12 +799,12 @@ Partial Class usrCntlCBAM Friend WithEvents btnCBAM_DS_DHF_VERAG As Button Friend WithEvents btnCBAM_DS_DAKOSY As Button Friend WithEvents Label3 As Label - Friend WithEvents btnCBAM_DS_DAKOSY_Deteil As Button + Friend WithEvents btnCBAM_DS_DAKOSY_Detail As Button Friend WithEvents btnCBAM_DS_DAKOSY_Summe As Button Friend WithEvents btnCBAM_DS_DHF_VERAG_Summe As Button - Friend WithEvents btnCBAM_DS_DHF_VERAG_Deteil As Button + Friend WithEvents btnCBAM_DS_DHF_VERAG_Detail As Button Friend WithEvents btnCBAM_DS_DHF_UNISPED_Summe As Button - Friend WithEvents btnCBAM_DS_DHF_UNISPED_Deteil As Button + Friend WithEvents btnCBAM_DS_DHF_UNISPED_Detail As Button Friend WithEvents btnCBAM_DS_TELOTEC_Summe As Button Friend WithEvents btnCBAM_DS_TELOTEC_Detail As Button Friend WithEvents Label6 As Label @@ -756,4 +820,8 @@ Partial Class usrCntlCBAM Friend WithEvents cbxIMEX As CheckBox Friend WithEvents cbxUNISPED As CheckBox Friend WithEvents btnCBAM_DS_DAKOSY_Spedb As Button + Friend WithEvents btnCBAM_DS_DAKOSY_GP As Button + Friend WithEvents btnCBAM_DS_DHF_VERAG_GP As Button + Friend WithEvents btnCBAM_DS_DHF_UNISPED_GP As Button + Friend WithEvents btnCBAM_DS_TELOTEC_GP As Button End Class diff --git a/SDL/kunden/usrCntlCBAM.vb b/SDL/kunden/usrCntlCBAM.vb index e6d0072b..ec626e52 100644 --- a/SDL/kunden/usrCntlCBAM.vb +++ b/SDL/kunden/usrCntlCBAM.vb @@ -1,7 +1,9 @@ -Public Class usrCntlCBAM +Imports DocumentFormat.OpenXml.Spreadsheet + +Public Class usrCntlCBAM Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL - Public kdnr = -1 + Public kdnr As Integer = -1 Dim AD As VERAG_PROG_ALLGEMEIN.cAdressen = Nothing Dim KD As VERAG_PROG_ALLGEMEIN.cKunde = Nothing @@ -396,11 +398,13 @@ End Sub Private Sub btnCBAM_DS_DAKOSY_Click(sender As Object, e As EventArgs) Handles btnCBAM_DS_DAKOSY.Click - btnCBAM_DS_DAKOSY_Deteil.Enabled = False + btnCBAM_DS_DAKOSY_Detail.Enabled = False btnCBAM_DS_DAKOSY_Copy.Enabled = False btnCBAM_DS_DAKOSY_Spedb.Enabled = False - btnCBAM_DS_DAKOSY_Deteil.Tag = "" + btnCBAM_DS_DAKOSY_GP.Enabled = False + btnCBAM_DS_DAKOSY_Detail.Tag = "" btnCBAM_DS_DAKOSY_Spedb.Tag = "" + btnCBAM_DS_DAKOSY_GP.Tag = "" Dim SQLSTR_WHERE_FIRMEN = "" @@ -416,9 +420,40 @@ If txtBis._value = "" Then MsgBox("Datum bis eingeben!") : Exit Sub Me.Cursor = Cursors.WaitCursor - - Dim SQLSTR = " - SELECT + Dim SQL_GP As String = "SELECT [Registriernummer_MRN] as 'declaration no' + ,max(Überlassungsdatum) as 'declaration date' + ,isnull(max(Empfänger_CN_EORI),'') as 'importer identification number' + ,'' as 'exporter identification number' + , max(Warentarifnummer) as 'commodity code' + ,max([VersendungsLand]) as 'origin country code' + ,Left(max(Verfahren2),2) as 'requested procedure' + ,'' as 'previous procedure' + ,(max(Eigenmasse) / 1000) as 'net mass' + ,'TONNES' as 'type of measurement unit' + ,'' as 'invoice numbers' + ,'' as 'invoice date' + ,'' as 'member state auth' + ,'' as 'discharge bill waiver' + ,'' as 'authorisation' + ,'' as 'start time' + ,'' as 'end time' + ,'' as 'deadline' + ,isnull(max(Empfänger_CN_EORI),'') as 'reporting declarant EORI number' + ,'' as 'type of representation' + ,isnull(max(CN_Name), '') as 'importer title' + ,'' as 'importer email' + ,'' as 'importer phone' + ,isnull(max(CN_Ländercode), '') as 'importer country code or member state' + ,'' as 'importer subdivision' + ,'' as 'importer city' + ,'' as 'importer street' + ,'' as 'importer street additional' + ,'' as 'importer address number' + ,'' as 'importer post code' + ,'' as 'importer po box' + ,'' as 'importer coordinate longitude (x)' + ,'' as 'importer coordinate latitude (y)'" + Dim SQL_DAKOSY As String = "SELECT [Registriernummer_MRN] RegistriernummerATLAS ,PositionNo PositionsNummer ,max(Überlassungsdatum) Anmeldedatum @@ -433,9 +468,9 @@ ,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 - - FROM [tbl_DY_Zollmeldungen_Import] + ,isnull(max(CZ_Name), '') as Absender" + + Dim SQLSTR = " FROM [tbl_DY_Zollmeldungen_Import] where Überlassungsdatum between '" & txtVon._value & "' and '" & txtBis._value & "' and @@ -458,8 +493,6 @@ " - - If SQLSTR_WHERE_FIRMEN <> "" Then SQLSTR &= " and Teilnehmer in ( " & SQLSTR_WHERE_FIRMEN & ")" SQLSTR &= " @@ -479,10 +512,12 @@ SQLSTR &= " group by Registriernummer_MRN,PositionNo" - SQLSTR &= " order by Absender,Registriernummer_MRN, PositionNo" + SQLSTR &= " order by isnull(max(CZ_Name), ''), Registriernummer_MRN, PositionNo" - Dim dt = SQL.loadDgvBySql(SQLSTR, "AVISO", 600) + Dim dt = SQL.loadDgvBySql(SQL_DAKOSY & SQLSTR, "AVISO", 600) + + Dim dtGP = SQL.loadDgvBySql(SQL_GP & SQLSTR, "AVISO", 600) @@ -509,21 +544,30 @@ ' MsgBox(SQLSTR) If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then - Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, False, EORI & "_Detailbericht_" & txtVon._value & "-" & txtBis._value) - btnCBAM_DS_DAKOSY_Deteil.Tag = path - btnCBAM_DS_DAKOSY_Deteil.Enabled = True - btnCBAM_DS_DAKOSY_Copy.Enabled = True + 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 + btnCBAM_DS_DAKOSY_Copy.Enabled = True - End If + End If - Dim dtNew = SQL.loadDgvBySql(sqlNew, "FMZOLL", 600) - If dtNew IsNot Nothing AndAlso dtNew.Rows.Count > 0 Then - If dtNew.Columns.Contains("Packstücke") Then dtNew.Columns.Remove("Packstücke") - Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtNew,,,,, False, EORI & "_Unterschiede zum Sped-Buch_" & txtVon._value & "-" & txtBis._value) - btnCBAM_DS_DAKOSY_Spedb.Enabled = True - btnCBAM_DS_DAKOSY_Spedb.Tag = path - Me.Cursor = Cursors.Default - End If + If dtGP IsNot Nothing AndAlso dt.Rows.Count > 0 Then + + btnCBAM_DS_DAKOSY_GP.Tag = "" + btnCBAM_DS_DAKOSY_GP.Tag = createExcelForGreenPulse(dtGP, EORI, IIf(AD.Ort <> "", AD.Ort, "")) + btnCBAM_DS_DAKOSY_GP.Enabled = True + + End If + + + Dim dtNew = SQL.loadDgvBySql(sqlNew, "FMZOLL", 600) + If dtNew IsNot Nothing AndAlso dtNew.Rows.Count > 0 Then + If dtNew.Columns.Contains("Packstücke") Then dtNew.Columns.Remove("Packstücke") + Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtNew,,,,, False, EORI & "_Unterschiede zum Sped-Buch_" & txtVon._value & "-" & txtBis._value) + btnCBAM_DS_DAKOSY_Spedb.Enabled = True + btnCBAM_DS_DAKOSY_Spedb.Tag = path + Me.Cursor = Cursors.Default + End If @@ -1057,9 +1101,9 @@ End Sub - Private Sub btnCBAM_DS_DAKOSY_Deteil_Click(sender As Object, e As EventArgs) Handles btnCBAM_DS_DAKOSY_Deteil.Click, btnCBAM_DS_DAKOSY_Summe.Click, btnCBAM_DS_DHF_VERAG_Deteil.Click, - btnCBAM_DS_DHF_VERAG_Summe.Click, btnCBAM_DS_DHF_UNISPED_Deteil.Click, btnCBAM_DS_DHF_UNISPED_Summe.Click, btnCBAM_DS_TELOTEC_Detail.Click, btnCBAM_DS_TELOTEC_Summe.Click, - btnCBAM_DS_DAKOSY_XML.Click, btnCBAM_DS_DAKOSY_Spedb.Click + Private Sub btnCBAM_DS_DAKOSY_Deteil_Click(sender As Object, e As EventArgs) Handles btnCBAM_DS_DAKOSY_Detail.Click, btnCBAM_DS_DAKOSY_Summe.Click, btnCBAM_DS_DHF_VERAG_Detail.Click, + btnCBAM_DS_DHF_VERAG_Summe.Click, btnCBAM_DS_DHF_UNISPED_Detail.Click, btnCBAM_DS_DHF_UNISPED_Summe.Click, btnCBAM_DS_TELOTEC_Detail.Click, btnCBAM_DS_TELOTEC_Summe.Click, + btnCBAM_DS_DAKOSY_XML.Click, btnCBAM_DS_DAKOSY_Spedb.Click, btnCBAM_DS_DAKOSY_GP.Click, btnCBAM_DS_DHF_UNISPED_GP.Click, btnCBAM_DS_DHF_VERAG_GP.Click, btnCBAM_DS_TELOTEC_GP.Click If sender.tag <> "" Then Try : Process.Start(sender.tag) : Catch : End Try @@ -1068,7 +1112,7 @@ Private Sub btnCBAM_DS_DAKOSY_Copy_Click(sender As Object, e As EventArgs) Handles btnCBAM_DS_DAKOSY_Copy.Click Dim f As New List(Of String) - If btnCBAM_DS_DAKOSY_Deteil.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_Deteil.Tag) + If btnCBAM_DS_DAKOSY_Detail.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_Detail.Tag) If btnCBAM_DS_DAKOSY_Summe.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_Summe.Tag) If f.Count > 0 Then @@ -1081,7 +1125,7 @@ Private Sub btnCBAM_DS_DHF_VERAG_Copy_Click(sender As Object, e As EventArgs) Handles btnCBAM_DS_DHF_VERAG_Copy.Click Dim f As New List(Of String) - If btnCBAM_DS_DHF_VERAG_Deteil.Tag <> "" Then f.Add(btnCBAM_DS_DHF_VERAG_Deteil.Tag) + If btnCBAM_DS_DHF_VERAG_Detail.Tag <> "" Then f.Add(btnCBAM_DS_DHF_VERAG_Detail.Tag) If btnCBAM_DS_DHF_VERAG_Summe.Tag <> "" Then f.Add(btnCBAM_DS_DHF_VERAG_Summe.Tag) If f.Count > 0 Then @@ -1094,7 +1138,7 @@ Private Sub btnCBAM_DS_DHF_UNISPED_Copy_Click(sender As Object, e As EventArgs) Handles btnCBAM_DS_DHF_UNISPED_Copy.Click Dim f As New List(Of String) - If btnCBAM_DS_DHF_UNISPED_Deteil.Tag <> "" Then f.Add(btnCBAM_DS_DHF_UNISPED_Deteil.Tag) + If btnCBAM_DS_DHF_UNISPED_Detail.Tag <> "" Then f.Add(btnCBAM_DS_DHF_UNISPED_Detail.Tag) If btnCBAM_DS_DHF_UNISPED_Summe.Tag <> "" Then f.Add(btnCBAM_DS_DHF_UNISPED_Summe.Tag) If f.Count > 0 Then @@ -1121,14 +1165,14 @@ Private Sub btnCBAM_DS_DHF_VERAG_Click(sender As Object, e As EventArgs) Handles btnCBAM_DS_DHF_VERAG.Click, btnCBAM_DS_DHF_UNISPED.Click Dim EZOLL_SQL = "EZOLL" If sender Is btnCBAM_DS_DHF_VERAG Then - btnCBAM_DS_DHF_VERAG_Deteil.Enabled = False + btnCBAM_DS_DHF_VERAG_Detail.Enabled = False btnCBAM_DS_DHF_VERAG_Copy.Enabled = False - btnCBAM_DS_DHF_VERAG_Deteil.Tag = "" + btnCBAM_DS_DHF_VERAG_Detail.Tag = "" End If If sender Is btnCBAM_DS_DHF_UNISPED Then - btnCBAM_DS_DHF_UNISPED_Deteil.Enabled = False + btnCBAM_DS_DHF_UNISPED_Detail.Enabled = False btnCBAM_DS_DHF_UNISPED_Copy.Enabled = False - btnCBAM_DS_DHF_UNISPED_Deteil.Tag = "" + btnCBAM_DS_DHF_UNISPED_Detail.Tag = "" EZOLL_SQL = "EZOLL_UNISPED" End If @@ -1193,13 +1237,13 @@ If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, False, EORI & "_Detailbericht_" & txtVon._value & "-" & txtBis._value) If sender Is btnCBAM_DS_DHF_VERAG Then - btnCBAM_DS_DHF_VERAG_Deteil.Tag = path - btnCBAM_DS_DHF_VERAG_Deteil.Enabled = True + btnCBAM_DS_DHF_VERAG_Detail.Tag = path + btnCBAM_DS_DHF_VERAG_Detail.Enabled = True btnCBAM_DS_DHF_VERAG_Copy.Enabled = True End If If sender Is btnCBAM_DS_DHF_UNISPED Then - btnCBAM_DS_DHF_UNISPED_Deteil.Tag = path - btnCBAM_DS_DHF_UNISPED_Deteil.Enabled = True + btnCBAM_DS_DHF_UNISPED_Detail.Tag = path + btnCBAM_DS_DHF_UNISPED_Detail.Enabled = True btnCBAM_DS_DHF_UNISPED_Copy.Enabled = True End If Me.Cursor = Cursors.Default @@ -1329,7 +1373,7 @@ Private Sub Button3_Click(sender As Object, e As EventArgs) Dim f As New List(Of String) - If btnCBAM_DS_DAKOSY_Deteil.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_Deteil.Tag) + If btnCBAM_DS_DAKOSY_Detail.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_Detail.Tag) If btnCBAM_DS_DAKOSY_Summe.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_Summe.Tag) If btnCBAM_DS_DAKOSY_XML.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_XML.Tag) @@ -1532,4 +1576,108 @@ End Sub + Public Function createExcelForGreenPulse(dt As DataTable, EORI As String, Importer_City As String) + + + Dim EORI_Ort As String = "" + If AD IsNot Nothing Then + EORI_Ort = AD.Ort + End If + + Dim Path_GP = "" + + Dim sPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\SR\" + If Not My.Computer.FileSystem.DirectoryExists(sPath) Then + My.Computer.FileSystem.CreateDirectory(sPath) + End If + + Dim exclApp As Object 'as Application + Dim Datei As Object 'Workbook + Dim Blatt As Object 'Microsoft.Office.Interop.Excel.Worksheet 'As Object 'as Worksheet + exclApp = CreateObject("Excel.Application") + + + + With exclApp + .Visible = False + + Try + Path_GP = sPath & EORI & "_Detailbericht_GP_" & txtVon._value & "-" & txtBis._value & " .xlsx" + While System.IO.File.Exists(Path_GP) + Path_GP = sPath & EORI & "_Detailbericht_GP_" & txtVon._value & "-" & txtBis._value & Now.ToString("ddMMyyyyHHmmss") & ".xlsx" + End While + My.Computer.FileSystem.WriteAllBytes(Path_GP, My.Resources.CBAM_Auswertung_GP, False) + + System.Threading.Thread.Sleep(200) + GC.Collect() + GC.WaitForPendingFinalizers() + + Catch ex As System.Exception + ' MsgBox(ex.Message) + MsgBox("ERROR 01: " & ex.Message & vbNewLine & ex.StackTrace) + Me.Cursor = Cursors.Default + + Return "" + End Try + + Datei = .Workbooks.Open(Path_GP) + Blatt = Datei.Worksheets(1) + + Dim cnt = 3 + + Dim rowcounter As Integer = 0 + + For Each row As DataRow In dt.Rows + Blatt.Range("A" & cnt).Value = row("declaration no") + Blatt.Range("B" & cnt).Value = row("declaration date") + Blatt.Range("C" & cnt).Value = row("importer identification number") + Blatt.Range("D" & cnt).Value = row("exporter identification number") + Blatt.Range("E" & cnt).Value = row("commodity code") + 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("J" & cnt).Value = row("type of measurement unit") + Blatt.Range("K" & cnt).Value = row("invoice numbers") + Blatt.Range("L" & cnt).Value = row("invoice date") + Blatt.Range("M" & cnt).Value = row("member state auth") + Blatt.Range("N" & cnt).Value = row("discharge bill waiver") + Blatt.Range("O" & cnt).Value = row("authorisation") + Blatt.Range("P" & cnt).Value = row("start time") + Blatt.Range("Q" & cnt).Value = row("end time") + Blatt.Range("R" & cnt).Value = row("deadline") + Blatt.Range("S" & cnt).Value = row("reporting declarant EORI number") + Blatt.Range("T" & cnt).Value = row("type of representation") + Blatt.Range("U" & cnt).Value = row("importer title") + Blatt.Range("V" & cnt).Value = row("importer email") + Blatt.Range("W" & cnt).Value = row("importer phone") + Blatt.Range("X" & cnt).Value = row("importer country code or member state") + Blatt.Range("Y" & cnt).Value = row("importer subdivision") + Blatt.Range("Z" & cnt).Value = IIf(Importer_City <> "", Importer_City, row("importer city")) + + Blatt.Range("AA" & cnt).Value = row("importer street") + Blatt.Range("AB" & cnt).Value = row("importer street additional") + Blatt.Range("AC" & cnt).Value = row("importer address number") + Blatt.Range("AD" & cnt).Value = row("importer post code") + Blatt.Range("AE" & cnt).Value = row("importer po box") + Blatt.Range("AF" & cnt).Value = row("importer coordinate longitude (x)") + Blatt.Range("AG" & cnt).Value = row("importer coordinate latitude (y)") + cnt += 1 + rowcounter += 1 + Next + + Datei.Save() + Datei.Close(SaveChanges:=True) + Datei = Nothing + + End With + + exclApp.Quit() + exclApp = Nothing + + + Return Path_GP + + End Function + End Class diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index 4be5956b..f9ec093c 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -3185,6 +3185,7 @@ Public Class usrCntlKundenuebersicht Exit Sub End If + '#wenn PDF und JSON in einem geht, dann folgende Zeile auskommentieren! pdfObject = cs.getPDF(company, failureDesc) 'cs.AddCompanyToPortfolio(company) @@ -3352,14 +3353,16 @@ Public Class usrCntlKundenuebersicht If cs.authenticate() = "200" Then Dim company As New cCreditSafeAPI.Company("", "", "", "", KUNDE_ERW.kde_CreditSaveNo, KUNDE_ERW.kde_CreditSaveId, Nothing, "", "", "", "", "", "", "", "", "", KUNDE.KundenNr) - company.lastChecked = IIf(IsDate(lastChecked), lastChecked, Today().AddDays(-1)) + company.lastChecked = IIf(IsDate(lastChecked), lastChecked, Today().AddDays(-30)) 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") If currentBonID > 0 Then company.csBonID = currentBonID Dim dt As New DataTable() - cs.getCompanyEvents(company, dt, checklastDate) + If cs.getCompanyEvents(company, dt, checklastDate, True) = "Error" Then + Exit Sub + End If If dt.Rows.Count > 0 Then Dim frm As New Form @@ -3376,22 +3379,30 @@ Public Class usrCntlKundenuebersicht dgv.DataSource = dt - If dgv IsNot Nothing Then + If dgv IsNot Nothing Then - frm.Size = New Size(750, 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.Size = New Size(750, 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() + If frm.ShowDialog().Cancel Then + initCreditsave() + setKD(kdNr) End If - Else + + + End If + + MsgBox("Creditsafe-Daten wurden aktualisiert!") + + Else MsgBox("Keine Creditsafe-Änderungen seit " & lastChecked.ToShortDateString) End If diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index b0263b3f..fb79079e 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -2056,7 +2056,7 @@ Public Class frmMDMDatenverarbetiung - Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL") + Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL", 60) diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cFirmen.vb b/VERAG_PROG_ALLGEMEIN/Classes/cFirmen.vb index 5b73dafb..a0d39e53 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cFirmen.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cFirmen.vb @@ -29,8 +29,8 @@ Public Class cFirmen Property Firma_Webadresse As Object = Nothing ' NVARCHAR (40) NULL, Property Firma_LandKz As Object = Nothing ' NVARCHAR (40) NULL, Property Firma_Steuernummer As Object = Nothing - Property Firmengruppe As Object = Nothing + Property Firma_PLZ As Object = Nothing Dim SQL As New SQL @@ -46,7 +46,6 @@ Public Class cFirmen Public 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("Firma_ID", Firma_ID, , True, True)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma_Bez", Firma_Bez)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma_BackColor", Firma_BackColor)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma_Logo", Firma_Logo)) @@ -74,6 +73,7 @@ Public Class cFirmen list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma_LandKz", Firma_LandKz)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firmengruppe", Firmengruppe)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma_Steuernummer", Firma_Steuernummer)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma_PLZ", Firma_PLZ)) Return list diff --git a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb index 2a136b64..2ea0d9ce 100644 --- a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb +++ b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb @@ -2283,7 +2283,7 @@ Public Class DATENVERVER_OPTIONS End Function - Public Shared Function addAttachementToPDF(File As String, attPath As String) As String + Public Shared Function addAttachementToPDF(File As String, attPath As String, Optional renameFile As String = "") As String Try Dim pdf As New Spire.Pdf.PdfDocument() @@ -2295,6 +2295,8 @@ Public Class DATENVERVER_OPTIONS Dim attachment As PdfAttachment = New PdfAttachment(attPath) + If renameFile <> "" Then attachment.FileName = renameFile + docPdf.Attachments.Add(attachment) docPdf.SaveToFile(File) End If diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb index 8d6238ed..8d03854c 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb @@ -219,6 +219,7 @@ Public Class cCreditSafeAPI If acceptContentType.Contains("application/pdf") Then + 'If acceptContentType.Contains("application/json+pdf") Or acceptContentType.Contains("application/json") Then responseJson = rest.FullRequestNoBodyBd(method, url, pdfData) If (rest.LastMethodSuccess <> True) Then @@ -419,14 +420,20 @@ Public Class cCreditSafeAPI End Function - Shared Function getCompanyEvents(company As Company, ByRef dtEvents As DataTable, Optional checklastChecked As Boolean = False) As String + 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) As String VERAG_PROG_ALLGEMEIN.cChilkat_Helper.UnlockCilkat() + 'rest.AddQueryParam("from", Today().AddDays(-1)) + Dim failureDesc As String - Dim myUrl As String = API_STRING & "/v1/monitoring/companies/" & company.creditSafeId & "/events" & IIf(checklastChecked, "?startDate=" & company.lastChecked, "") + Dim myUrl As String = API_STRING & "/v1/monitoring/companies/" & company.creditSafeId & "/events" & IIf(checklastChecked, "?startDate=" & company.lastChecked.ToString("yyyy-MM-ddTHH:mm:ss"), "") Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token, failureDesc) + If failureDesc <> "" Then + If showError Then MsgBox(failureDesc) + Return "Error" + End If Dim json As New Chilkat.JsonObject Dim success As Boolean = json.Load(jsonRespString) @@ -462,122 +469,125 @@ Public Class cCreditSafeAPI Dim numCompanies As Integer = companieData.Size - Dim CL As Double = -1 - Dim CR As Integer = -1 - Dim CL_Date As Date = company.lastChecked - Dim CR_Date As Date = company.lastChecked + Dim defaultCL As Double = -10000000 + Dim defaultCR As Integer = -10000000 - For i = 0 To 1 + Dim CL As Double = defaultCL + Dim CR As Integer = defaultCR + Dim CL_Datum As Date = company.lastChecked + Dim CR_Datum As Date = company.lastChecked + + ' For i = 0 To 1 - Dim j As Integer = 0 - While j < numCompanies + Dim j As Integer = 0 + While j < numCompanies - Dim compObj As Chilkat.JsonObject = companieData.ObjectAt(j) + Dim compObj As Chilkat.JsonObject = companieData.ObjectAt(j) - Dim index = companieData.FindString("eventId", False) + Dim index = companieData.FindString("eventId", False) - Dim dateTime As New Chilkat.CkDateTime - Dim dt As New Chilkat.DtObj - Dim getAsLocal As Boolean = 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)) + 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) + 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) - dtEvents.Rows.Add(R) + dtEvents.Rows.Add(R) - Dim cEvent As New cCreditsafeEvent(CLng(R("eventId"))) + Dim cEvent As New cCreditsafeEvent(CLng(R("eventId"))) - 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") + 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") - '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 - 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 - End If - + '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 - - '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_Date, CR_Date) - ElseIf cEvent.localEventCode = "CR" Or cEvent.globalEventCode = "CR" Then - cEvent.newValueCR = cEvent.newValue - setCL_CR_Entry(CDate(cEvent.eventDate), "CR", cEvent.newValueCR, CL, CR, CL_Date, CR_Date) - 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_Date, CR_Date) - - 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 - setCL_CR_Entry(CDate(cEvent.eventDate), "CR", cEvent.newValueCR, CL, CR, CL_Date, CR_Date) - 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 - If cEvent.bonId Is Nothing AndAlso company.csBonID > 0 Then - cEvent.bonId = company.csBonID + 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 - cEvent.kundenNr = company.kdNr - cEvent.SAVE() - - j = j + 1 - End While - Next - + 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 If dtEvents.Rows.Count > 1 Then @@ -586,41 +596,64 @@ 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 Then + If company.kdNr > 0 AndAlso updateKunden AndAlso (CR <> -1000000 Or CL <> -1000000) Then Dim KUNDE As New cKunde(company.kdNr) - If KUNDE.Bonitätsdatum <= CL_Date Or KUNDE.Bonitätsdatum <= CR_Date Then + If KUNDE.Bonitätsdatum <= CL_Datum Or KUNDE.Bonitätsdatum <= CR_Datum Then - If KUNDE.Bonität <> CR Then - KUNDE.Bonität = CR - KUNDE.Bonitätsdatum = CDate(CR_Date) + 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 KUNDE.Höchstkredit <> CL Then + If Index <> -1 Then + If KUNDE_ERW.kde_CreditSaveBonitaetsIndex <> Index Then + 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 + 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 KUNDE.Höchstkredit = CL - KUNDE.Bonitätsdatum = CDate(CL_Date) + If KUNDE.Bonitätsdatum <= CDate(CL_Datum) Then + KUNDE.Bonitätsdatum = Today() + End If End If - KUNDE.SAVE() - + KUNDE_ERW.SAVE() End If - End If + KUNDE.SAVE() + End If Return "Anzahl gefundener Datensätze: " & numCompanies End Function - Private Shared Sub setCL_CR_Entry(cs_date As Date, type As String, value As Object, CL As Double, CR As Integer, CL_Date As Date, CR_Date As Date) + 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) Select Case type Case "CR" Dim saveCR As Boolean = False - If CR_Date <= cs_date Then - cs_date = CR_Date + If CR_Datum <= cs_date Then + CR_Datum = cs_date saveCR = True End If @@ -628,8 +661,8 @@ Public Class cCreditSafeAPI Case "CL" Dim saveCL As Boolean = False - If CL_Date <= cs_date Then - cs_date = CL_Date + If CL_Datum <= cs_date Then + CL_Datum = cs_date saveCL = True End If @@ -975,6 +1008,126 @@ Public Class cCreditSafeAPI End Function + Shared Function calculatedBonIndexFromBonScore(score As Object, ByRef riskClass As String) As Double + + If score Is Nothing OrElse Not IsNumeric(score) Then Return -1 + + Select Case score + Case 91 To 100 + riskClass = "A" + Case 81 To 90 + riskClass = "A" + Case 71 To 80 + riskClass = "B" + Case 61 To 70 + riskClass = "B" + Case 51 To 60 + riskClass = "C" + Case 35 To 50 + riskClass = "C" + Case 25 To 34 + riskClass = "D" + Case 15 To 24 + riskClass = "D" + Case 1 To 14 + riskClass = "D" + Case Else + riskClass = "E" + End Select + + + Select Case score + Case 0 + Return 6 + Case 1 To 10 + Return 5 + Case 11 To 12 + Return 4.9 + Case 13 To 14 + Return 4.8 + Case 15 To 16 + Return 4.7 + Case 17 To 18 + Return 4.6 + Case 19 To 20 + Return 4.5 + Case 21 To 22 + Return 4.4 + Case 23 To 25 + Return 4.3 + Case 26 To 28 + Return 4.2 + Case 29 To 31 + Return 4.1 + Case 32 To 34 + Return 4 + Case 35 To 38 + Return 3.9 + Case 39 To 41 + Return 3.8 + Case 42 To 44 + Return 3.7 + Case 45 To 47 + Return 3.6 + Case 48 To 50 + Return 3.5 + Case 51 To 52 + Return 3.4 + Case 53 To 54 + Return 3.3 + Case 55 To 56 + Return 3.2 + Case 57 To 58 + Return 3.1 + Case 59 To 60 + Return 3 + Case 61 To 62 + Return 2.9 + Case 63 To 64 + Return 2.8 + Case 65 To 66 + Return 2.7 + Case 67 To 68 + Return 2.6 + Case 69 To 70 + Return 2.5 + Case 71 To 72 + Return 2.4 + Case 73 To 74 + Return 2.3 + Case 75 To 76 + Return 2.2 + Case 77 To 78 + Return 2.1 + Case 79 To 80 + Return 2 + Case 81 To 82 + Return 1.9 + Case 83 To 84 + Return 1.8 + Case 85 To 86 + Return 1.7 + Case 87 To 88 + Return 1.6 + Case 89 To 90 + Return 1.5 + Case 91 To 92 + Return 1.4 + Case 93 To 94 + Return 1.3 + Case 95 To 96 + Return 1.2 + Case 97 To 98 + Return 1.1 + Case 99 To 100 + Return 1 + Case Else + Return 6 + End Select + End Function + + + Public Class CreditSafeUser Public Property username As String @@ -1067,6 +1220,10 @@ Public Class cCreditSafeAPI Property oldValueCL As Object = Nothing Property newValueCL As Object = Nothing Property kundenNr As Integer + Property newValueCRIndex As Object = Nothing + Property oldValueCRIndex As Object = Nothing + Property oldRiskClass As String + Property newRiskClass As String Public hasEntry = False @@ -1095,6 +1252,10 @@ Public Class cCreditSafeAPI list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("oldValueCL", oldValueCL)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("newValueCL", newValueCL)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kundenNr", kundenNr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("newValueCRIndex", newValueCRIndex)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("oldValueCRIndex", oldValueCRIndex)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("oldRiskClass", oldRiskClass)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("newRiskClass", newRiskClass)) Return list diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb index 3d747fea..0bba04bf 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb @@ -1488,7 +1488,7 @@ Public Class cSyska_Interface For Each r_OP In dt_OP.Rows Try - If KdNr > 1 Then OP_ID_CNT = SQL.getValueTxtBySql("SELECT isnull(MAX(OP_ID),0)+1 FROM [Offene Posten] AND Firma_ID = '" & Firma_ID & "'", "FMZOLL") 'Wenn ein Kunde geändert wird, wird die höchste ID ermittelt --> höchste ID des OPS der FIRMA!!!! + If KdNr > 1 Then OP_ID_CNT = SQL.getValueTxtBySql("SELECT isnull(MAX(OP_ID),0)+1 FROM [Offene Posten] WHERE Firma_ID = '" & Firma_ID & "'", "FMZOLL") 'Wenn ein Kunde geändert wird, wird die höchste ID ermittelt --> höchste ID des OPS der FIRMA!!!! Dim OP As New VERAG_PROG_ALLGEMEIN.cOffene_Posten() diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj index 5126e0ce..2a73db23 100644 --- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj +++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj @@ -386,14 +386,12 @@ - frmDatumsabfrage.vb Form - @@ -1426,9 +1424,6 @@ - - 2.11.1 - 3.8.0 @@ -1450,6 +1445,9 @@ 2024.0.0 + + 9.0.8 + 3.0.0.266 @@ -1599,7 +1597,6 @@ -