diff --git a/SDL/Fakturierung/frmFaktEmail.vb b/SDL/Fakturierung/frmFaktEmail.vb index 21ec5476..55f71739 100644 --- a/SDL/Fakturierung/frmFaktEmail.vb +++ b/SDL/Fakturierung/frmFaktEmail.vb @@ -629,7 +629,7 @@ Public Class frmFaktEmail Try Dim additionalLine = "" - If RECHNUNG.FakturierungsGruppe IsNot Nothing AndAlso RECHNUNG.FakturierungsGruppe <> "" Then + If RECHNUNG IsNot Nothing AndAlso RECHNUNG.FakturierungsGruppe IsNot Nothing AndAlso RECHNUNG.FakturierungsGruppe <> "" Then additionalLine = "Abrechnungsstelle: " & RECHNUNG.FakturierungsGruppe.Replace("WAI", "Waidhaus") End If diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_EU.Designer.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_EU.Designer.vb index 6b6b4542..ba8c6c79 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_EU.Designer.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_EU.Designer.vb @@ -786,7 +786,7 @@ Partial Class usrcntlVollmacht_MDM_EU Me.txtKapital._TimeOnly_Seconds = False Me.txtKapital._value = Nothing Me.txtKapital._Waehrung = True - Me.txtKapital._WaehrungZeichen = True + Me.txtKapital._WaehrungZeichen = False Me.txtKapital.ForeColor = System.Drawing.Color.Black Me.txtKapital.Location = New System.Drawing.Point(402, 202) Me.txtKapital.MaxLineLength = -1 diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index 78d9f222..5b94c1c4 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -1850,6 +1850,15 @@ Public Class FormularManagerNEU Case "place" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse3.Text Case "street" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse1.Text Case "surname_firstname" : odoc.FormFields(fieldName).Range.Text = IIf(usrCntl.txt_GF_Name.Text <> "", usrCntl.txt_GF_Name.Text, usrCntl.txtHerrFrau.Text) + + Case "ceo_place" : odoc.FormFields(fieldName).Range.Text = usrCntl.txt_GF_Ort.Text + Case "ceo_country" : odoc.FormFields(fieldName).Range.Text = usrCntl.cbx_GF_Land._value + Case "ceo_zipcode" : odoc.FormFields(fieldName).Range.Text = usrCntl.txt_GF_PLZ.Text + Case "ceo_birthdate" : odoc.FormFields(fieldName).Range.Text = usrCntl.txt_GF_Geb.Text + Case "ceo_street" : odoc.FormFields(fieldName).Range.Text = usrCntl.txt_GF_Adresse.Text + Case "ceo_address" : odoc.FormFields(fieldName).Range.Text = usrCntl.txt_GF_Adresse.Text & " " & usrCntl.cbx_GF_Land._value & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text + + Case "vatno" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtUid.Text Case "mailcontact" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtEmail.Text ' TODO: neues Feld im formular Case "phone" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtEmail.Text ' TODO: neues Feld im formular diff --git a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb index 03bb1c7b..d1f6744a 100644 --- a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb +++ b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb @@ -362,7 +362,7 @@ Public Class frmNacherfassungNEU sqlStr &= " ( SELECT SUM(isnull([SteuerpflichtigerBetrag],0)+isnull([SteuerfreierBetrag],0)) FROM [RechnungsausgangPositionen] where [RechnungsausgangPositionen].RK_ID=[Rechnungsausgang].RK_ID ) as Rechnungsbetrag," sqlStr &= " Sammelrechnung, isnull(cast(RechnungsKundenNr as nvarchar(7)) + ' ','') + [RechnungsName 1] as [RechnungAn] " ' sqlStr &= "Sachbearbeiter " - sqlStr &= " FROM [Rechnungsausgang] WHERE FilialenNr='" & SPEDITIONSBUCH.FilialenNr & "' and AbfertigungsNr='" & SPEDITIONSBUCH.AbfertigungsNr & "' AND [SpeditionsbuchUnterNr]='" & SPEDITIONSBUCH.UnterNr & "' " + sqlStr &= " FROM [Rechnungsausgang] WHERE FilialenNr='" & SPEDITIONSBUCH.FilialenNr & "' and AbfertigungsNr='" & SPEDITIONSBUCH.AbfertigungsNr & "' AND [SpeditionsbuchUnterNr]='" & SPEDITIONSBUCH.UnterNr & "' AND [RechnungsNr] is not null" sqlStr &= " order by RechnungsDatum" .DataSource = SQL.loadDgvBySql(sqlStr, "FMZOLL") diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.vb b/SDL/buchhaltung/frmBU_Mahnlauf.vb index ad2d0982..e3467884 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.vb @@ -295,7 +295,17 @@ Public Class frmBU_Mahnlauf Dim rpt As New rptMahnung(Sprache, MAHNSTUFE, Firma_ID) rpt.Document.Printer.PrinterName = "" - Dim RG_Bezeichnung = "Mahnung.pdf" + + Dim RG_Bezeichnung As String = "" + + Select Case art + Case "ZE" : RG_Bezeichnung = "Mahnung.pdf" + Case "OP" : RG_Bezeichnung = "OP-Liste.pdf" + Case Else + RG_Bezeichnung = "Mahnung.pdf" + End Select + + Dim KD_RG As New VERAG_PROG_ALLGEMEIN.cAdressen(AD.AdressenNr) @@ -425,7 +435,14 @@ Public Class frmBU_Mahnlauf rpt.lblUeberschriftRG_GS.Text = MAHNTEXT rpt.txtMahnungstextVOR.Text = MahnTEXT_VOR rpt.txtVermerk.Text = MahnTEXT_NACH - End If + Else + 'über Übersetzung geregelt, alle anderen über getMahnstufe (sollte in Zukunft noch abgeändert werden!) + getMahnstufetext("DE", MAHNSTUFE, MahnTEXT_VOR, MahnTEXT_NACH, MAHNTEXT) + rpt.lblUeberschriftRG_GS.Text = MAHNTEXT + rpt.txtMahnungstextVOR.Text = MahnTEXT_VOR + rpt.txtVermerk.Text = MahnTEXT_NACH + End If + @@ -655,13 +672,6 @@ Public Class frmBU_Mahnlauf Dim pdfBezeichnung As String = "" - Select Case art - Case "ZE" : pdfBezeichnung = "Mahnung.pdf" - Case "OP" : pdfBezeichnung = "OP-Liste.pdf" - Case Else - pdfBezeichnung = "Mahnung.pdf" - End Select - Select Case Mahndruckart Case 5 'MAIL_SEND Dim list As New List(Of String) @@ -1044,7 +1054,7 @@ Public Class frmBU_Mahnlauf Select Case getAusgabe(MainForm, False) Case "PDF" If KontoList.Count = 1 Then - doMahnung(3, KontoList(0), Firma, art, srchPrinter, forceMahnstufe,, hideMahnstopp) + doMahnung(3, KontoList(0), Firma, art,, srchPrinter, forceMahnstufe,, hideMahnstopp) Else Dim PDF_LIST As New List(Of String) fProgBar.Show(MainForm) diff --git a/SDL/buchhaltung/usrCntlBH.Designer.vb b/SDL/buchhaltung/usrCntlBH.Designer.vb index c800a0f2..e27205c3 100644 --- a/SDL/buchhaltung/usrCntlBH.Designer.vb +++ b/SDL/buchhaltung/usrCntlBH.Designer.vb @@ -25,6 +25,10 @@ Partial Class usrCntlBH Me.Label6 = New System.Windows.Forms.Label() Me.pnl = New System.Windows.Forms.Panel() Me.TabPage1 = New System.Windows.Forms.TabPage() + Me.Label42 = New System.Windows.Forms.Label() + Me.GroupBox10 = New System.Windows.Forms.GroupBox() + Me.Label43 = New System.Windows.Forms.Label() + Me.Button12 = New System.Windows.Forms.Button() Me.Label37 = New System.Windows.Forms.Label() Me.GroupBox9 = New System.Windows.Forms.GroupBox() Me.Label41 = New System.Windows.Forms.Label() @@ -122,12 +126,9 @@ Partial Class usrCntlBH Me.Label30 = New System.Windows.Forms.Label() Me.Label29 = New System.Windows.Forms.Label() Me.Button7 = New System.Windows.Forms.Button() - Me.Label42 = New System.Windows.Forms.Label() - Me.GroupBox10 = New System.Windows.Forms.GroupBox() - Me.Label43 = New System.Windows.Forms.Label() - Me.Button12 = New System.Windows.Forms.Button() Me.pnl.SuspendLayout() Me.TabPage1.SuspendLayout() + Me.GroupBox10.SuspendLayout() Me.GroupBox9.SuspendLayout() Me.GroupBox8.SuspendLayout() Me.GroupBox7.SuspendLayout() @@ -142,7 +143,6 @@ Partial Class usrCntlBH Me.tbcntr.SuspendLayout() Me.TabPage5.SuspendLayout() Me.GroupBox6.SuspendLayout() - Me.GroupBox10.SuspendLayout() Me.SuspendLayout() ' 'Label6 @@ -167,6 +167,7 @@ Partial Class usrCntlBH ' 'TabPage1 ' + Me.TabPage1.AutoScroll = True Me.TabPage1.Controls.Add(Me.Label42) Me.TabPage1.Controls.Add(Me.GroupBox10) Me.TabPage1.Controls.Add(Me.Label37) @@ -180,7 +181,6 @@ Partial Class usrCntlBH Me.TabPage1.Controls.Add(Me.Label27) Me.TabPage1.Controls.Add(Me.GroupBox5) Me.TabPage1.Controls.Add(Me.GroupBox1) - Me.TabPage1.Controls.Add(Me.Label24) Me.TabPage1.Controls.Add(Me.GroupBox2) Me.TabPage1.Controls.Add(Me.GroupBox4) Me.TabPage1.Controls.Add(Me.Label7) @@ -188,21 +188,65 @@ Partial Class usrCntlBH Me.TabPage1.Location = New System.Drawing.Point(4, 22) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(956, 1062) + Me.TabPage1.Size = New System.Drawing.Size(956, 968) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Allgemein" Me.TabPage1.UseVisualStyleBackColor = True ' + 'Label42 + ' + Me.Label42.AutoSize = True + Me.Label42.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label42.ForeColor = System.Drawing.SystemColors.ControlDarkDark + Me.Label42.Location = New System.Drawing.Point(7, 703) + Me.Label42.Name = "Label42" + Me.Label42.Size = New System.Drawing.Size(168, 17) + Me.Label42.TabIndex = 19 + Me.Label42.Text = "Sachkontenzuweisung" + ' + 'GroupBox10 + ' + Me.GroupBox10.Controls.Add(Me.Label43) + Me.GroupBox10.Controls.Add(Me.Button12) + Me.GroupBox10.Location = New System.Drawing.Point(6, 715) + Me.GroupBox10.Name = "GroupBox10" + Me.GroupBox10.Size = New System.Drawing.Size(847, 61) + Me.GroupBox10.TabIndex = 18 + Me.GroupBox10.TabStop = False + ' + 'Label43 + ' + Me.Label43.AutoSize = True + Me.Label43.Location = New System.Drawing.Point(141, 28) + Me.Label43.Name = "Label43" + Me.Label43.Size = New System.Drawing.Size(165, 13) + Me.Label43.TabIndex = 2 + Me.Label43.Text = "Sachkontenzuweisung für Syska." + ' + 'Button12 + ' + Me.Button12.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center + Me.Button12.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button12.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button12.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button12.Location = New System.Drawing.Point(4, 11) + Me.Button12.Name = "Button12" + Me.Button12.Size = New System.Drawing.Size(121, 44) + Me.Button12.TabIndex = 7 + Me.Button12.Text = "Sachkonten" + Me.Button12.UseVisualStyleBackColor = True + ' 'Label37 ' Me.Label37.AutoSize = True Me.Label37.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label37.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label37.Location = New System.Drawing.Point(13, 602) + Me.Label37.Location = New System.Drawing.Point(3, 871) Me.Label37.Name = "Label37" Me.Label37.Size = New System.Drawing.Size(136, 17) Me.Label37.TabIndex = 16 Me.Label37.Text = "Kontoabstimmung" + Me.Label37.Visible = False ' 'GroupBox9 ' @@ -214,11 +258,12 @@ Partial Class usrCntlBH Me.GroupBox9.Controls.Add(Me.Label39) Me.GroupBox9.Controls.Add(Me.Label38) Me.GroupBox9.Controls.Add(Me.Button9) - Me.GroupBox9.Location = New System.Drawing.Point(14, 622) + Me.GroupBox9.Location = New System.Drawing.Point(4, 891) Me.GroupBox9.Name = "GroupBox9" Me.GroupBox9.Size = New System.Drawing.Size(847, 67) Me.GroupBox9.TabIndex = 17 Me.GroupBox9.TabStop = False + Me.GroupBox9.Visible = False ' 'Label41 ' @@ -332,7 +377,7 @@ Partial Class usrCntlBH ' Me.Label34.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label34.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label34.Location = New System.Drawing.Point(11, 869) + Me.Label34.Location = New System.Drawing.Point(7, 628) Me.Label34.Name = "Label34" Me.Label34.Size = New System.Drawing.Size(298, 18) Me.Label34.TabIndex = 14 @@ -344,7 +389,7 @@ Partial Class usrCntlBH Me.GroupBox8.Controls.Add(Me.cboAbfVerbFirma) Me.GroupBox8.Controls.Add(Me.Button8) Me.GroupBox8.Controls.Add(Me.Label35) - Me.GroupBox8.Location = New System.Drawing.Point(10, 881) + Me.GroupBox8.Location = New System.Drawing.Point(6, 640) Me.GroupBox8.Name = "GroupBox8" Me.GroupBox8.Size = New System.Drawing.Size(847, 69) Me.GroupBox8.TabIndex = 15 @@ -396,7 +441,7 @@ Partial Class usrCntlBH ' Me.Label32.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label32.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label32.Location = New System.Drawing.Point(13, 221) + Me.Label32.Location = New System.Drawing.Point(7, 104) Me.Label32.Name = "Label32" Me.Label32.Size = New System.Drawing.Size(298, 18) Me.Label32.TabIndex = 12 @@ -406,7 +451,7 @@ Partial Class usrCntlBH ' Me.GroupBox7.Controls.Add(Me.Label33) Me.GroupBox7.Controls.Add(Me.Button6) - Me.GroupBox7.Location = New System.Drawing.Point(12, 233) + Me.GroupBox7.Location = New System.Drawing.Point(6, 116) Me.GroupBox7.Name = "GroupBox7" Me.GroupBox7.Size = New System.Drawing.Size(847, 69) Me.GroupBox7.TabIndex = 13 @@ -436,18 +481,19 @@ Partial Class usrCntlBH Me.Label3.AutoSize = True Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label3.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label3.Location = New System.Drawing.Point(11, 21) + Me.Label3.Location = New System.Drawing.Point(6, 781) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(216, 17) Me.Label3.TabIndex = 1 Me.Label3.Text = "Soll/Haben - Abgleich - MDM" + Me.Label3.Visible = False ' 'Label4 ' Me.Label4.AutoSize = True Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label4.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label4.Location = New System.Drawing.Point(13, 121) + Me.Label4.Location = New System.Drawing.Point(7, 4) Me.Label4.Name = "Label4" Me.Label4.Size = New System.Drawing.Size(260, 17) Me.Label4.TabIndex = 3 @@ -458,7 +504,7 @@ Partial Class usrCntlBH Me.Label27.AutoSize = True Me.Label27.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label27.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label27.Location = New System.Drawing.Point(11, 778) + Me.Label27.Location = New System.Drawing.Point(6, 552) Me.Label27.Name = "Label27" Me.Label27.Size = New System.Drawing.Size(101, 17) Me.Label27.TabIndex = 11 @@ -468,7 +514,7 @@ Partial Class usrCntlBH ' Me.GroupBox5.Controls.Add(Me.Label26) Me.GroupBox5.Controls.Add(Me.Button5) - Me.GroupBox5.Location = New System.Drawing.Point(10, 790) + Me.GroupBox5.Location = New System.Drawing.Point(5, 564) Me.GroupBox5.Name = "GroupBox5" Me.GroupBox5.Size = New System.Drawing.Size(847, 61) Me.GroupBox5.TabIndex = 10 @@ -506,11 +552,12 @@ Partial Class usrCntlBH Me.GroupBox1.Controls.Add(Me.cbxMdmSollHaben) Me.GroupBox1.Controls.Add(Me.Label1) Me.GroupBox1.Controls.Add(Me.btnWord) - Me.GroupBox1.Location = New System.Drawing.Point(10, 32) + Me.GroupBox1.Location = New System.Drawing.Point(6, 782) Me.GroupBox1.Name = "GroupBox1" Me.GroupBox1.Size = New System.Drawing.Size(847, 86) Me.GroupBox1.TabIndex = 2 Me.GroupBox1.TabStop = False + Me.GroupBox1.Visible = False ' 'cbxMdmSollHabenOhneKdNr ' @@ -586,7 +633,7 @@ Partial Class usrCntlBH Me.Label24.AutoSize = True Me.Label24.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label24.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label24.Location = New System.Drawing.Point(11, 692) + Me.Label24.Location = New System.Drawing.Point(2, -3) Me.Label24.Name = "Label24" Me.Label24.Size = New System.Drawing.Size(150, 17) Me.Label24.TabIndex = 8 @@ -597,7 +644,7 @@ Partial Class usrCntlBH Me.GroupBox2.Controls.Add(Me.Label2) Me.GroupBox2.Controls.Add(Me.Label5) Me.GroupBox2.Controls.Add(Me.Button1) - Me.GroupBox2.Location = New System.Drawing.Point(12, 132) + Me.GroupBox2.Location = New System.Drawing.Point(6, 15) Me.GroupBox2.Name = "GroupBox2" Me.GroupBox2.Size = New System.Drawing.Size(847, 86) Me.GroupBox2.TabIndex = 4 @@ -638,7 +685,8 @@ Partial Class usrCntlBH ' Me.GroupBox4.Controls.Add(Me.Label25) Me.GroupBox4.Controls.Add(Me.Button4) - Me.GroupBox4.Location = New System.Drawing.Point(10, 703) + Me.GroupBox4.Controls.Add(Me.Label24) + Me.GroupBox4.Location = New System.Drawing.Point(5, 488) Me.GroupBox4.Name = "GroupBox4" Me.GroupBox4.Size = New System.Drawing.Size(847, 61) Me.GroupBox4.TabIndex = 9 @@ -672,7 +720,7 @@ Partial Class usrCntlBH Me.Label7.AutoSize = True Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label7.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label7.Location = New System.Drawing.Point(13, 305) + Me.Label7.Location = New System.Drawing.Point(7, 188) Me.Label7.Name = "Label7" Me.Label7.Size = New System.Drawing.Size(182, 17) Me.Label7.TabIndex = 5 @@ -711,7 +759,7 @@ Partial Class usrCntlBH Me.GroupBox3.Controls.Add(Me.txtOPKdName) Me.GroupBox3.Controls.Add(Me.Label8) Me.GroupBox3.Controls.Add(Me.Button2) - Me.GroupBox3.Location = New System.Drawing.Point(12, 316) + Me.GroupBox3.Location = New System.Drawing.Point(6, 199) Me.GroupBox3.Name = "GroupBox3" Me.GroupBox3.Size = New System.Drawing.Size(847, 283) Me.GroupBox3.TabIndex = 6 @@ -1351,7 +1399,7 @@ Partial Class usrCntlBH Me.tbcntr.Location = New System.Drawing.Point(0, 52) Me.tbcntr.Name = "tbcntr" Me.tbcntr.SelectedIndex = 0 - Me.tbcntr.Size = New System.Drawing.Size(964, 1088) + Me.tbcntr.Size = New System.Drawing.Size(964, 994) Me.tbcntr.TabIndex = 25 ' 'TabPage5 @@ -1360,7 +1408,7 @@ Partial Class usrCntlBH Me.TabPage5.Controls.Add(Me.GroupBox6) Me.TabPage5.Location = New System.Drawing.Point(4, 22) Me.TabPage5.Name = "TabPage5" - Me.TabPage5.Size = New System.Drawing.Size(956, 1010) + Me.TabPage5.Size = New System.Drawing.Size(956, 1062) Me.TabPage5.TabIndex = 1 Me.TabPage5.Text = "IMEX" Me.TabPage5.UseVisualStyleBackColor = True @@ -1429,49 +1477,6 @@ Partial Class usrCntlBH Me.Button7.Text = "Importieren" Me.Button7.UseVisualStyleBackColor = True ' - 'Label42 - ' - Me.Label42.AutoSize = True - Me.Label42.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label42.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label42.Location = New System.Drawing.Point(9, 963) - Me.Label42.Name = "Label42" - Me.Label42.Size = New System.Drawing.Size(168, 17) - Me.Label42.TabIndex = 19 - Me.Label42.Text = "Sachkontenzuweisung" - ' - 'GroupBox10 - ' - Me.GroupBox10.Controls.Add(Me.Label43) - Me.GroupBox10.Controls.Add(Me.Button12) - Me.GroupBox10.Location = New System.Drawing.Point(8, 975) - Me.GroupBox10.Name = "GroupBox10" - Me.GroupBox10.Size = New System.Drawing.Size(847, 61) - Me.GroupBox10.TabIndex = 18 - Me.GroupBox10.TabStop = False - ' - 'Label43 - ' - Me.Label43.AutoSize = True - Me.Label43.Location = New System.Drawing.Point(141, 28) - Me.Label43.Name = "Label43" - Me.Label43.Size = New System.Drawing.Size(165, 13) - Me.Label43.TabIndex = 2 - Me.Label43.Text = "Sachkontenzuweisung für Syska." - ' - 'Button12 - ' - Me.Button12.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center - Me.Button12.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button12.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Button12.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button12.Location = New System.Drawing.Point(4, 11) - Me.Button12.Name = "Button12" - Me.Button12.Size = New System.Drawing.Size(121, 44) - Me.Button12.TabIndex = 7 - Me.Button12.Text = "Sachkonten" - Me.Button12.UseVisualStyleBackColor = True - ' 'usrCntlBH ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1480,11 +1485,13 @@ Partial Class usrCntlBH Me.Controls.Add(Me.tbcntr) Me.Controls.Add(Me.pnl) Me.Name = "usrCntlBH" - Me.Size = New System.Drawing.Size(964, 1140) + Me.Size = New System.Drawing.Size(964, 1046) Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() Me.TabPage1.ResumeLayout(False) Me.TabPage1.PerformLayout() + Me.GroupBox10.ResumeLayout(False) + Me.GroupBox10.PerformLayout() Me.GroupBox9.ResumeLayout(False) Me.GroupBox9.PerformLayout() Me.GroupBox8.ResumeLayout(False) @@ -1511,8 +1518,6 @@ Partial Class usrCntlBH Me.TabPage5.PerformLayout() Me.GroupBox6.ResumeLayout(False) Me.GroupBox6.PerformLayout() - Me.GroupBox10.ResumeLayout(False) - Me.GroupBox10.PerformLayout() Me.ResumeLayout(False) End Sub diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index 751146a1..0a2fb00b 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -2808,59 +2808,53 @@ Public Class usrCntlKundenuebersicht Exit Sub End If - Select Case ADRESSE.LandKz - - Case "A" : land = "AT" - Case "D" : land = "DE" - Case Else - land = ADRESSE.LandKz - - End Select - - - + If ADRESSE.LandKz.ToString.Length <> 2 Then + land = cProgramFunctions.getISO2Land(ADRESSE.LandKz) + Else + land = ADRESSE.LandKz + End If Dim company As New cCreditSafeAPI.Company("", "", "", land, KUNDE_ERW.kde_CreditSaveNo, KUNDE_ERW.kde_CreditSaveId, Nothing, "", "", "", "", "", "", "", "", "") If lblBonitaetsdatum._value <> Nothing Then - Dim lastChecked As Date = Date.ParseExact(lblBonitaetsdatum._value, "dd.MM.yyyy", System.Globalization.DateTimeFormatInfo.InvariantInfo) - company.lastChecked = lastChecked - - If lastChecked = Today Then - Dim bonaus = VERAG_PROG_ALLGEMEIN.cBonitaetsauskunft.LOADByKdNrDate(kdNr, Today) - 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 - - - - - 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 + Dim lastChecked As Date = Date.ParseExact(lblBonitaetsdatum._value, "dd.MM.yyyy", System.Globalization.DateTimeFormatInfo.InvariantInfo) + company.lastChecked = lastChecked + If lastChecked = Today Then + Dim bonaus = VERAG_PROG_ALLGEMEIN.cBonitaetsauskunft.LOADByKdNrDate(kdNr, Today) + 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 + + + + 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) + + End If Else + setCreditsafereportEntry(cs, company) End If + + Else - - setCreditsafereportEntry(cs, company) - - End If - - - Else - MsgBox("Authentifizierungsfehler bei Creditsafe-User") + MsgBox("Authentifizierungsfehler bei Creditsafe-User") End If diff --git a/SDL/kunden/usrCntlOfferte.Designer.vb b/SDL/kunden/usrCntlOfferte.Designer.vb index 5b5f45a8..649c1ca4 100644 --- a/SDL/kunden/usrCntlOfferte.Designer.vb +++ b/SDL/kunden/usrCntlOfferte.Designer.vb @@ -49,6 +49,7 @@ Partial Class usrCntlOfferte Me.Label2 = New System.Windows.Forms.Label() Me.lblLeistunAddErr2 = New System.Windows.Forms.Label() Me.pnlEdit = New System.Windows.Forms.Panel() + Me.Button1 = New System.Windows.Forms.Button() Me.cbxAutoFakturierung = New System.Windows.Forms.CheckBox() Me.Label3 = New System.Windows.Forms.Label() Me.cboLeistungenAdd = New VERAG_PROG_ALLGEMEIN.MyComboBox() @@ -63,7 +64,6 @@ Partial Class usrCntlOfferte Me.lblEditMode = New System.Windows.Forms.Label() Me.btnOffertbearbeiten = New System.Windows.Forms.Button() Me.dgvOfferteNew = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.Button1 = New System.Windows.Forms.Button() CType(Me.dgvOfferteDetails, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvOfferte, System.ComponentModel.ISupportInitialize).BeginInit() Me.cntxtAddSdl.SuspendLayout() @@ -101,7 +101,7 @@ Partial Class usrCntlOfferte Me.lblOffert.Multiline = True Me.lblOffert.Name = "lblOffert" Me.lblOffert.ReadOnly = True - Me.lblOffert.Size = New System.Drawing.Size(110, 22) + Me.lblOffert.Size = New System.Drawing.Size(171, 22) Me.lblOffert.TabIndex = 0 Me.lblOffert.Text = "Offerte" ' @@ -402,6 +402,20 @@ Partial Class usrCntlOfferte Me.pnlEdit.Size = New System.Drawing.Size(796, 60) Me.pnlEdit.TabIndex = 20 ' + 'Button1 + ' + Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button1.ForeColor = System.Drawing.Color.Black + Me.Button1.Image = Global.SDL.My.Resources.Resources.Excel_logo + Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button1.Location = New System.Drawing.Point(606, 0) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(51, 36) + Me.Button1.TabIndex = 33 + Me.Button1.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button1.UseVisualStyleBackColor = True + ' 'cbxAutoFakturierung ' Me.cbxAutoFakturierung.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -606,20 +620,6 @@ Partial Class usrCntlOfferte Me.dgvOfferteNew.Size = New System.Drawing.Size(228, 347) Me.dgvOfferteNew.TabIndex = 30 ' - 'Button1 - ' - Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button1.ForeColor = System.Drawing.Color.Black - Me.Button1.Image = Global.SDL.My.Resources.Resources.Excel_logo - Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button1.Location = New System.Drawing.Point(606, 0) - Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(51, 36) - Me.Button1.TabIndex = 33 - Me.Button1.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button1.UseVisualStyleBackColor = True - ' 'usrCntlOfferte ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/SDL/kunden/usrCntlOfferte.vb b/SDL/kunden/usrCntlOfferte.vb index 20d974cb..04357067 100644 --- a/SDL/kunden/usrCntlOfferte.vb +++ b/SDL/kunden/usrCntlOfferte.vb @@ -92,7 +92,7 @@ Public Class usrCntlOfferte ' OFFERTEBind.bindingdataTable.PrimaryKey = {OFFERTEBind.bindingdataTable.Columns("KundenNr"), OFFERTEBind.bindingdataTable.Columns("LeistungsNr"), OFFERTEBind.bindingdataTable.Columns("LeistungsNr"), OFFERTEBind.bindingdataTable.Columns("LeistungsBez")} Catch ex As Exception - MsgBox(ex.Message) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try @@ -135,7 +135,7 @@ Public Class usrCntlOfferte ' .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.Format = "p" .Columns("PreisänderungProzent").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight .Columns("PreisAlt").Width = 60 .Columns("PreisAlt").DefaultCellStyle.Format = "N2" @@ -334,22 +334,17 @@ Public Class usrCntlOfferte Private Sub dgvOfferteDetails_CellValueChanged(sender As Object, e As DataGridViewCellEventArgs) Handles dgvOfferteDetails.CellValueChanged Try - If loaded = True Then dgvOfferteDetails.Rows(e.RowIndex).Cells("Sachbearbeiter").Value = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME dgvOfferteDetails.Rows(e.RowIndex).Cells("Geändert am").Value = Now DGVHasChaged = True 'saveCurrentOffert() - If isNew = True Then - + If isNew Then currentOffert.Art = "Neuanlage" - currentOffert.SAVE() - Else - currentOffert.Art = "Geändert" - currentOffert.SAVE() End If + currentOffert.SAVE() End If Catch ex As Exception @@ -782,4 +777,35 @@ Public Class usrCntlOfferte Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click cProgramFunctions.genExcelFromDGV_NEW(dgvOfferteDetails, True) End Sub + + Private Sub dgvOfferteDetails_KeyUp(sender As Object, e As KeyEventArgs) Handles dgvOfferteDetails.KeyUp + If e.KeyCode = Keys.Tab Then + + + dgvOfferteDetails.CurrentCell = GetNextCell(dgvOfferteDetails.CurrentCell) + e.Handled = True + + End If + + + End Sub + + Private Function GetNextCell(currentCell As DataGridViewCell) As DataGridViewCell + + Dim i As Integer = 0 + 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) + lblOffert.Text = "C" & nextCellIndex & "R" & nextRowIndex & "RO" & IIf(nextCell.[ReadOnly], "1", "0") & "H" & IIf(Not nextCell.Visible, "1", "0") + nextCell = dgvOfferteDetails.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) + + Return nextCell + + End Function + End Class diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index 3ff2a390..84902e59 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -18,6 +18,9 @@ Public Class frmMDMDatenverarbetiung Private Sub frmPloseDatenverarbetiung_Load(sender As Object, e As EventArgs) Handles MyBase.Load Me.Top = 0 Me.Height = My.Computer.Screen.WorkingArea.Height + + VERAG_PROG_ALLGEMEIN.cProgramFunctions.SetDoubleBuffered(MyDatagridview1) + End Sub Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click @@ -555,7 +558,7 @@ Public Class frmMDMDatenverarbetiung With MyDatagridview1 .Columns.Clear() - .SET_SQL(" SELECT plose_POLSEKundennummer, count(*) Anzahl,plose_ProduktCode,max(plose_Produktbeschreibung) as plose_Produktbeschreibung, sum(plose_Menge) as plose_Menge,sum(plose_Preis) as plose_Preis,sum(plose_NettobetragWaehrungAbbuchung) as plose_NettobetragWaehrungAbbuchung,sum(plose_MWSTBetragWaehrungAbbuchung) as plose_MWSTBetragWaehrungAbbuchung,sum(plose_BruttobetragWaehrungAbbuchung) as plose_BruttobetragWaehrungAbbuchung + .SET_SQL(" SELECT plose_POLSEKundennummer, count(*) Anzahl,plose_ProduktCode,max(plose_Produktbeschreibung) as plose_Produktbeschreibung, sum(plose_Menge) as plose_Menge,sum(plose_Preis) as plose_Preis,sum(plose_NettobetragWaehrungAbbuchung) as plose_NettobetragWaehrungAbbuchung,sum(plose_MWSTBetragWaehrungAbbuchung) as plose_MWSTBetragWaehrungAbbuchung,sum(plose_BruttobetragWaehrungAbbuchung) as plose_BruttobetragWaehrungAbbuchung FROM tblPLOSE_Details WHERE 1 = 1 And plose_DatumTransaktion between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' @@ -3223,12 +3226,14 @@ Public Class frmMDMDatenverarbetiung Function pruefData_PLOSE() As Boolean + pruefData_PLOSE = True + Try - Dim VERAGKdNr_DT As DataTable = SQL.loadDgvBySql("SELECT AdressenNr,PLOSEKundenNr FROM Adressen WHERE PLOSEKundenNr is not null", "FMZOLL") - Dim VERAGLeistungsNr_DT = SQL.loadDgvBySql("SELECT [plp_LeistungsNr],plp_ProductCode FROM [tblPLOSE_Produktbeschreibung] where plp_ProductCode is not null and plp_Firma IN ('PSS','PU') ", "FMZOLL") - 'Dim OffertenNr_DT = SQL.loadDgvBySql("SELECT KundenNr,OffertenNr FROM [Offerten] where OffertenNr = 80 ", "FMZOLL") - ' Dim KundeLeistungsNr_DT = SQL.loadDgvBySql("SELECT [LeistungsNr],KundenNr FROM [Offertenpositionen] where OffertenNr = 80", "FMZOLL") + Dim VERAGKdNr_DT As DataTable = SQL.loadDgvBySql("SELECT AdressenNr,PLOSEKundenNr FROM Adressen WHERE PLOSEKundenNr is not null order by PLOSEKundenNr", "FMZOLL") + Dim VERAGLeistungsNr_DT = SQL.loadDgvBySql("SELECT [plp_LeistungsNr],plp_ProductCode FROM [tblPLOSE_Produktbeschreibung] where plp_ProductCode is not null and plp_Firma IN ('PSS','PU') order by plp_ProductCode ", "FMZOLL") + Dim OffertenNr_DT = SQL.loadDgvBySql("SELECT KundenNr,OffertenNr FROM [Offerten] where OffertenNr = 80 order by KundenNr", "FMZOLL") + Dim KundeLeistungsNr_DT = SQL.loadDgvBySql("SELECT [LeistungsNr],KundenNr FROM [Offertenpositionen] where OffertenNr = 80 order by KundenNr", "FMZOLL") Dim VERAGKdNr = -1 Dim VERAGLeistungsNr = -1 @@ -3236,6 +3241,7 @@ Public Class frmMDMDatenverarbetiung Dim results As DataRow() Dim cnt = 0 + Dim cntTotal = MyDatagridview1.Rows.Count() For Each r As DataGridViewRow In MyDatagridview1.Rows 'KUNDEN-NR / PLOSE KD-NR @@ -3251,21 +3257,7 @@ Public Class frmMDMDatenverarbetiung pruefData_PLOSE = False End If - 'KUNDEN-NR / PLOSE KD-NR - 'Default -> Nicht gefunden - 'r.Cells("VERAGKdNr").Style.BackColor = Color.PapayaWhip - 'found = False - 'For Each k In VERAGKdNr_DT.Rows - ' If r.Cells("plose_POLSEKundennummer").Value = k("PLOSEKundenNr") Then - ' 'Gefunden! - ' r.Cells("VERAGKdNr").Value = k("PLOSEKundenNr") - ' r.Cells("VERAGKdNr").Style.BackColor = Color.MintCream - ' VERAGKdNr = k("AdressenNr") - ' found = True - ' Exit For - ' End If - 'Next - 'If Not found Then pruefData_PLOSE = False + 'VERAG/PLOSE LEISTUNG results = VERAGLeistungsNr_DT.Select("plp_ProductCode = '" & r.Cells("plose_ProduktCode").Value & "' AND plp_LeistungsNr is not null") @@ -3283,7 +3275,7 @@ Public Class frmMDMDatenverarbetiung 'VERAG OFFERT 80 'Default -> Nicht gefunden - Dim OffertenNr_DT = SQL.loadDgvBySql("SELECT KundenNr,OffertenNr FROM [Offerten] where OffertenNr = 80 AND KundenNr = '" & VERAGKdNr & "'", "FMZOLL") + 'Dim OffertenNr_DT = SQL.loadDgvBySql("SELECT KundenNr,OffertenNr FROM [Offerten] where OffertenNr = 80 AND KundenNr = '" & VERAGKdNr & "'", "FMZOLL") results = OffertenNr_DT.Select("KundenNr = '" & VERAGKdNr & "'") If results.Length > 0 Then 'Gefunden! @@ -3298,7 +3290,7 @@ Public Class frmMDMDatenverarbetiung 'VERAG LEISTUNGS-NR 'Default -> Nicht gefunden - Dim KundeLeistungsNr_DT = SQL.loadDgvBySql("SELECT [LeistungsNr],KundenNr FROM [Offertenpositionen] where OffertenNr = 80 AND KundenNr = '" & VERAGKdNr & "' AND LeistungsNr = '" & VERAGLeistungsNr & "'", "FMZOLL") + 'Dim KundeLeistungsNr_DT = SQL.loadDgvBySql("SELECT [LeistungsNr],KundenNr FROM [Offertenpositionen] where OffertenNr = 80 AND KundenNr = '" & VERAGKdNr & "' AND LeistungsNr = '" & VERAGLeistungsNr & "'", "FMZOLL") results = KundeLeistungsNr_DT.Select("KundenNr = '" & VERAGKdNr & "' AND LeistungsNr = '" & VERAGLeistungsNr & "'") If results.Length > 0 Then 'Gefunden! @@ -3309,17 +3301,20 @@ Public Class frmMDMDatenverarbetiung pruefData_PLOSE = False End If - If cnt Mod 5 = 0 Then - lblProzPruef.Text = CInt(cnt / MyDatagridview1.Rows.Count() * 100) & " %" + lblProzPruef.Text = CInt(cnt / cntTotal * 100) & " %" lblProzPruef.Refresh() - Me.Refresh() + 'Me.Refresh() End If cnt += 1 Next - lblProzPruef.Text = CInt(cnt / MyDatagridview1.Rows.Count() * 100) & " %" '100 + + 'lblProzPruef.Text = CInt(cnt / MyDatagridview1.Rows.Count() * 100) & " %" '100 + 'lblProzPruef.Refresh() + Me.Refresh() + Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) pruefData_PLOSE = False @@ -3426,7 +3421,7 @@ Public Class frmMDMDatenverarbetiung left join [VERAG].[dbo].[tblMSECustomers] as cust on cust.partner_customer_number = trans.partner_haulier_id left join [VERAG].[dbo].[tblMSEInvoices] as inv on inv.[invoice_id] = bills.[invoice_number] and inv.customer_number = cust.[customer_id] and trans.transaction_country = inv.country left join adressen ON cust.[customer_id] = Adressen.MSEKundenNr - WHERE bills.[invoice_date] = '" & DateTimePicker2.Text & "' + WHERE bills.[invoice_date] = '" & DateTimePicker2.Text & "' GROUP BY cust.customer_id, cust.customer_name, Adressen.AdressenNr HAVING (((cust.customer_id) Is Not Null) AND ((Adressen.AdressenNr) Is Null)) OR (((cust.customer_id) Is Not Null) AND ((Adressen.AdressenNr) Is Not Null) AND (((SELECT Offerten.OffertenNr FROM Offerten WHERE (((Offerten.KundenNr)=isnull(Adressen.[AdressenNr],0)) AND ((Offerten.OffertenNr)=23)))) Is Null)))as a", "FMZOLL")) @@ -3436,8 +3431,7 @@ Public Class frmMDMDatenverarbetiung Return False End If - - Dim falscheLeistungsnummern As Integer = CInt((New SQL).getValueTxtBySql("select count (*) from (Select trans.device_product_type, trans.transaction_country,trans.transaction_product_name, trans.transaction_product_id, cust.[customer_id], trans.partner_haulier_id, cust.customer_name, + Dim sqlStringfalscheLeistungsNr = "select count (*) from (Select trans.device_product_type, trans.transaction_country,trans.transaction_product_name, trans.transaction_product_id, cust.[customer_id], trans.partner_haulier_id, cust.customer_name, sum(trans.transaction_gross_amount) As [Summe Transaction Amount ( EUR )], sum(trans.msts_fee_amount) As [Summe Admin Fee Amount ( EUR )], sum(trans.msts_fee_amount) As [Summe Fees And Costs Amount ( EUR )], @@ -3449,32 +3443,26 @@ Public Class frmMDMDatenverarbetiung Left Join [VERAG].[dbo].[tblMSEInvoices] as inv on inv.[invoice_id] = bills.[invoice_number] And inv.customer_number = cust.[customer_id] And trans.transaction_country = inv.country Left Join tblMSELeistungen ON trans.device_product_type = tblMSELeistungen.[Card Type] And trans.transaction_country = tblMSELeistungen.[Transaction Country] WHERE((trans.transaction_gross_amount <> 0) And tblMSELeistungen.LeistungsNr Is Null) And bills.[invoice_date] = '" & DateTimePicker2.Text & "' - GROUP by trans.device_product_type, trans.transaction_country, trans.transaction_product_name, trans.transaction_product_id, cust.[customer_id], trans.partner_haulier_id, cust.customer_name) as a", "FMZOLL")) + GROUP by trans.device_product_type, trans.transaction_country, trans.transaction_product_name, trans.transaction_product_id, cust.[customer_id], trans.partner_haulier_id, cust.customer_name) as a" + + Dim falscheLeistungsnummern As Integer = CInt((New SQL).getValueTxtBySql(sqlStringfalscheLeistungsNr, "FMZOLL")) If falscheLeistungsnummern > 0 Then - - pruefData_MSE = False - MsgBox("Es fehlen " & falscheLeistungsnummern & " Leistungsnummern!" & vbNewLine & "Diese Leistungssnummern (von Rechnung " & DateTimePicker2.Text & ") müssen nachgetragen werden. (bitte an Administrator wenden, tblMSELeistungen).") - Return False - - End If - - Dim fehlendeTransactionen As Integer = 0 - - fehlendeTransactionen = CInt((New SQL).getValueTxtBySql("select count(*) FROM [VERAG].[dbo].[tblMSESettlements] where [invoice_date] = '" & DateTimePicker2.Text & "' AND [transaction_id] not in (select [transaction_id] from [VERAG].[dbo].[tblMSETransactions]) ", "FMZOLL")) - - - If fehlendeTransactionen > 0 Then - pruefData_MSE = False - Dim hint As String = "" - If fehlendeTransactionen > 500 Then - hint = "Batch-Nr: " - hint &= SQL.getValueTxtBySql("select distinct(trans.batch_seq_nr) FROM [VERAG].[dbo].[tblMSESettlements] as settle INNER JOIN [VERAG].[dbo].[tblMSETransactions] as trans on trans.transaction_id = settle.transaction_id where [invoice_date] = '" & DateTimePicker2.Text & "' AND trans.[transaction_id] not in (select [transaction_id] from [VERAG].[dbo].[tblMSETransactions]) ", "FMZOLL") + If Not SQL.doSQL("update [VERAG].[dbo].[tblMSETransactions] set device_product_type = 'HUGO SIM renewal cost' where transaction_product_id = 453 and transaction_product_name like 'HUGO SIM renewal cost%'", "FMZOLL") Then + MsgBox("Fehler beim Setzen der HUGO SIM renewal cost") + Return False End If - MsgBox("Es fehlen " & fehlendeTransactionen & " Transaktionen in der Datenbank!" & vbNewLine & "Diese Transaktionen (von Rechnung " & DateTimePicker2.Text & ") müssen nachgeladen werden (bitte an Administrator wenden)." & IIf(hint <> "", vbNewLine & hint, "")) - End If + falscheLeistungsnummern = CInt((New SQL).getValueTxtBySql(sqlStringfalscheLeistungsNr, "FMZOLL")) + If falscheLeistungsnummern > 0 Then + pruefData_MSE = False + MsgBox("Es fehlen " & falscheLeistungsnummern & " Leistungsnummern!" & vbNewLine & "Diese Leistungssnummern (von Rechnung " & DateTimePicker2.Text & ") müssen nachgetragen werden. (bitte an Administrator wenden, tblMSELeistungen).") + Return False + End If + + + End If Dim nichtAufAbgerechnetGesetzteTransactionen As Integer = 0 @@ -3490,6 +3478,22 @@ Public Class frmMDMDatenverarbetiung MsgBox("Es sind " & nichtAufAbgerechnetGesetzteTransactionen & " Transaktionen in der Datenbank, die noch nicht auf VERRECHNET gesetzt sind!" & vbNewLine & "Diese Transaktionen (von Rechnung " & DateTimePicker2.Text & ") müssen aktualisiert werden. (bitte an Administrator wenden)." & IIf(hint <> "", vbNewLine & hint, "")) End If + + 'das muss die letzte Prüfung sein, da uU eine Transaktion fehlen kann! + Dim fehlendeTransactionen As Integer = 0 + + fehlendeTransactionen = CInt((New SQL).getValueTxtBySql("select count(*) FROM [VERAG].[dbo].[tblMSESettlements] where [invoice_date] = '" & DateTimePicker2.Text & "' AND [transaction_id] not in (select [transaction_id] from [VERAG].[dbo].[tblMSETransactions]) ", "FMZOLL")) + + If fehlendeTransactionen > 0 Then + pruefData_MSE = False + Dim hint As String = "" + If fehlendeTransactionen > 500 Then + hint = "Batch-Nr: " + hint &= SQL.getValueTxtBySql("select distinct(trans.batch_seq_nr) FROM [VERAG].[dbo].[tblMSESettlements] as settle INNER JOIN [VERAG].[dbo].[tblMSETransactions] as trans on trans.transaction_id = settle.transaction_id where [invoice_date] = '" & DateTimePicker2.Text & "' AND trans.[transaction_id] not in (select [transaction_id] from [VERAG].[dbo].[tblMSETransactions]) ", "FMZOLL") + End If + MsgBox("Es fehlen " & fehlendeTransactionen & " Transaktionen in der Datenbank!" & vbNewLine & "Diese Transaktionen (von Rechnung " & DateTimePicker2.Text & ") müssen nachgeladen werden (bitte an Administrator wenden)." & IIf(hint <> "", vbNewLine & hint, "")) + End If + Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) pruefData_MSE = False diff --git a/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb b/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb index d423eeac..db598015 100644 --- a/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb +++ b/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb @@ -45,6 +45,8 @@ Partial Class usrCntlMDMAuswertungen Me.Label8 = New System.Windows.Forms.Label() Me.GroupBox3 = New System.Windows.Forms.GroupBox() Me.Label12 = New System.Windows.Forms.Label() + Me.cboUeberfaelligeBestLeistung = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.kdUeberfaelligeBest = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.rbtUeberfaelligeBestKd = New System.Windows.Forms.RadioButton() Me.rbtUeberfaelligeBestAlleKd = New System.Windows.Forms.RadioButton() Me.PictureBox1 = New System.Windows.Forms.PictureBox() @@ -58,13 +60,16 @@ Partial Class usrCntlMDMAuswertungen Me.GroupBox4 = New System.Windows.Forms.GroupBox() Me.cbxArchiv = New System.Windows.Forms.CheckBox() Me.Label14 = New System.Windows.Forms.Label() + Me.KdSearchBox1 = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.PictureBox2 = New System.Windows.Forms.PictureBox() + Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label15 = New System.Windows.Forms.Label() Me.Label17 = New System.Windows.Forms.Label() Me.Button3 = New System.Windows.Forms.Button() Me.Label16 = New System.Windows.Forms.Label() Me.GroupBox5 = New System.Windows.Forms.GroupBox() Me.Label22 = New System.Windows.Forms.Label() + Me.KdSearchBox2 = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.PictureBox3 = New System.Windows.Forms.PictureBox() Me.Label19 = New System.Windows.Forms.Label() Me.datBenachrichtigungBis = New System.Windows.Forms.DateTimePicker() @@ -97,6 +102,7 @@ Partial Class usrCntlMDMAuswertungen Me.Label29 = New System.Windows.Forms.Label() Me.datIDSVon = New System.Windows.Forms.DateTimePicker() Me.GroupBox8 = New System.Windows.Forms.GroupBox() + Me.cboIDSDateType = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.txtOrt = New System.Windows.Forms.TextBox() Me.lbl = New System.Windows.Forms.Label() Me.cbxLand = New System.Windows.Forms.CheckBox() @@ -111,9 +117,19 @@ Partial Class usrCntlMDMAuswertungen Me.Button11 = New System.Windows.Forms.Button() Me.Label34 = New System.Windows.Forms.Label() Me.PictureBox5 = New System.Windows.Forms.PictureBox() + Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label36 = New System.Windows.Forms.Label() Me.TabPage3 = New System.Windows.Forms.TabPage() + Me.UsrCntlWoelfl_IM_CSVRg1 = New SDL.usrCntlWoelfl_IM_CSVRg() Me.tbIDS = New System.Windows.Forms.TabPage() + Me.Label60 = New System.Windows.Forms.Label() + Me.GroupBox18 = New System.Windows.Forms.GroupBox() + Me.Label57 = New System.Windows.Forms.Label() + Me.Label58 = New System.Windows.Forms.Label() + Me.ProgressBar2 = New System.Windows.Forms.ProgressBar() + Me.TextBox2 = New System.Windows.Forms.TextBox() + Me.Label59 = New System.Windows.Forms.Label() + Me.Button17 = New System.Windows.Forms.Button() Me.TabPage2 = New System.Windows.Forms.TabPage() Me.Label44 = New System.Windows.Forms.Label() Me.GroupBox13 = New System.Windows.Forms.GroupBox() @@ -141,6 +157,7 @@ Partial Class usrCntlMDMAuswertungen Me.Label41 = New System.Windows.Forms.Label() Me.Button12 = New System.Windows.Forms.Button() Me.TabPage4 = New System.Windows.Forms.TabPage() + Me.UsrCntlMSE_KonvertCSV1 = New SDL.usrCntlMSE_KonvertCSV() Me.TabPage5 = New System.Windows.Forms.TabPage() Me.Label56 = New System.Windows.Forms.Label() Me.GroupBox17 = New System.Windows.Forms.GroupBox() @@ -165,23 +182,6 @@ Partial Class usrCntlMDMAuswertungen Me.btnContractdaten = New System.Windows.Forms.Button() Me.Button15 = New System.Windows.Forms.Button() Me.pnl = New System.Windows.Forms.Panel() - Me.UsrCntlWoelfl_IM_CSVRg1 = New SDL.usrCntlWoelfl_IM_CSVRg() - Me.UsrCntlMSE_KonvertCSV1 = New SDL.usrCntlMSE_KonvertCSV() - Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.cboUeberfaelligeBestLeistung = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.kdUeberfaelligeBest = New VERAG_PROG_ALLGEMEIN.KdSearchBox() - Me.KdSearchBox1 = New VERAG_PROG_ALLGEMEIN.KdSearchBox() - Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.KdSearchBox2 = New VERAG_PROG_ALLGEMEIN.KdSearchBox() - Me.cboIDSDateType = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.GroupBox18 = New System.Windows.Forms.GroupBox() - Me.Label57 = New System.Windows.Forms.Label() - Me.Label58 = New System.Windows.Forms.Label() - Me.ProgressBar2 = New System.Windows.Forms.ProgressBar() - Me.TextBox2 = New System.Windows.Forms.TextBox() - Me.Label59 = New System.Windows.Forms.Label() - Me.Button17 = New System.Windows.Forms.Button() - Me.Label60 = New System.Windows.Forms.Label() Me.GroupBox1.SuspendLayout() Me.GroupBox2.SuspendLayout() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() @@ -201,6 +201,7 @@ Partial Class usrCntlMDMAuswertungen CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabPage3.SuspendLayout() Me.tbIDS.SuspendLayout() + Me.GroupBox18.SuspendLayout() Me.TabPage2.SuspendLayout() Me.GroupBox13.SuspendLayout() Me.GroupBox10.SuspendLayout() @@ -214,7 +215,6 @@ Partial Class usrCntlMDMAuswertungen Me.GroupBox15.SuspendLayout() Me.GroupBox14.SuspendLayout() Me.pnl.SuspendLayout() - Me.GroupBox18.SuspendLayout() Me.SuspendLayout() ' 'GroupBox1 @@ -457,6 +457,50 @@ Partial Class usrCntlMDMAuswertungen Me.Label12.TabIndex = 16 Me.Label12.Text = "SDL-Leistung:" ' + 'cboUeberfaelligeBestLeistung + ' + Me.cboUeberfaelligeBestLeistung._allowedValuesFreiText = Nothing + Me.cboUeberfaelligeBestLeistung._allowFreiText = False + Me.cboUeberfaelligeBestLeistung._value = "" + Me.cboUeberfaelligeBestLeistung.DropDownHeight = 350 + Me.cboUeberfaelligeBestLeistung.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboUeberfaelligeBestLeistung.DropDownWidth = 250 + Me.cboUeberfaelligeBestLeistung.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cboUeberfaelligeBestLeistung.FormattingEnabled = True + Me.cboUeberfaelligeBestLeistung.IntegralHeight = False + Me.cboUeberfaelligeBestLeistung.Location = New System.Drawing.Point(223, 58) + Me.cboUeberfaelligeBestLeistung.Name = "cboUeberfaelligeBestLeistung" + Me.cboUeberfaelligeBestLeistung.Size = New System.Drawing.Size(221, 24) + Me.cboUeberfaelligeBestLeistung.TabIndex = 15 + ' + 'kdUeberfaelligeBest + ' + Me.kdUeberfaelligeBest._AlleFirmenCLUSTER = False + Me.kdUeberfaelligeBest._AllowSetValue = True + Me.kdUeberfaelligeBest._autoSizeGross = False + Me.kdUeberfaelligeBest._display_Name1 = False + Me.kdUeberfaelligeBest._displayAVISO_Email = False + Me.kdUeberfaelligeBest._displayFullName = False + Me.kdUeberfaelligeBest._displayWoelflKd = False + Me.kdUeberfaelligeBest._hideIfListEmpty = True + Me.kdUeberfaelligeBest._loadKdData = False + Me.kdUeberfaelligeBest._searchName1 = True + Me.kdUeberfaelligeBest._UseFIRMA = "" + Me.kdUeberfaelligeBest._ValueKdAndName = True + Me.kdUeberfaelligeBest.dgvpos = "LEFT" + Me.kdUeberfaelligeBest.KdName = "" + Me.kdUeberfaelligeBest.KdNr = "-1" + Me.kdUeberfaelligeBest.kdNrField = Nothing + Me.kdUeberfaelligeBest.KdNrNullInt = Nothing + Me.kdUeberfaelligeBest.Location = New System.Drawing.Point(223, 109) + Me.kdUeberfaelligeBest.Name = "kdUeberfaelligeBest" + Me.kdUeberfaelligeBest.nurAktive = True + Me.kdUeberfaelligeBest.searchActive = True + Me.kdUeberfaelligeBest.Size = New System.Drawing.Size(350, 20) + Me.kdUeberfaelligeBest.TabIndex = 14 + Me.kdUeberfaelligeBest.TIMER_SEARCH = True + Me.kdUeberfaelligeBest.usrcntl = Nothing + ' 'rbtUeberfaelligeBestKd ' Me.rbtUeberfaelligeBestKd.AutoSize = True @@ -590,6 +634,34 @@ Partial Class usrCntlMDMAuswertungen Me.Label14.TabIndex = 16 Me.Label14.Text = "SDL-Leistung:" ' + 'KdSearchBox1 + ' + Me.KdSearchBox1._AlleFirmenCLUSTER = False + Me.KdSearchBox1._AllowSetValue = True + Me.KdSearchBox1._autoSizeGross = False + Me.KdSearchBox1._display_Name1 = False + Me.KdSearchBox1._displayAVISO_Email = False + Me.KdSearchBox1._displayFullName = False + 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" + Me.KdSearchBox1.KdName = "" + Me.KdSearchBox1.KdNr = "-1" + Me.KdSearchBox1.kdNrField = Nothing + Me.KdSearchBox1.KdNrNullInt = Nothing + Me.KdSearchBox1.Location = New System.Drawing.Point(223, 48) + Me.KdSearchBox1.Name = "KdSearchBox1" + Me.KdSearchBox1.nurAktive = True + Me.KdSearchBox1.searchActive = True + Me.KdSearchBox1.Size = New System.Drawing.Size(350, 20) + Me.KdSearchBox1.TabIndex = 14 + Me.KdSearchBox1.TIMER_SEARCH = True + Me.KdSearchBox1.usrcntl = Nothing + ' 'PictureBox2 ' Me.PictureBox2.Image = CType(resources.GetObject("PictureBox2.Image"), System.Drawing.Image) @@ -600,6 +672,22 @@ Partial Class usrCntlMDMAuswertungen Me.PictureBox2.TabIndex = 11 Me.PictureBox2.TabStop = False ' + 'MyComboBox1 + ' + Me.MyComboBox1._allowedValuesFreiText = Nothing + Me.MyComboBox1._allowFreiText = False + Me.MyComboBox1._value = "" + Me.MyComboBox1.DropDownHeight = 350 + Me.MyComboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.MyComboBox1.DropDownWidth = 250 + Me.MyComboBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.MyComboBox1.FormattingEnabled = True + Me.MyComboBox1.IntegralHeight = False + Me.MyComboBox1.Location = New System.Drawing.Point(223, 72) + Me.MyComboBox1.Name = "MyComboBox1" + Me.MyComboBox1.Size = New System.Drawing.Size(221, 24) + Me.MyComboBox1.TabIndex = 15 + ' 'Label15 ' Me.Label15.AutoSize = True @@ -666,6 +754,34 @@ Partial Class usrCntlMDMAuswertungen Me.Label22.TabIndex = 17 Me.Label22.Text = "Kunde:" ' + 'KdSearchBox2 + ' + Me.KdSearchBox2._AlleFirmenCLUSTER = False + Me.KdSearchBox2._AllowSetValue = True + Me.KdSearchBox2._autoSizeGross = False + Me.KdSearchBox2._display_Name1 = False + Me.KdSearchBox2._displayAVISO_Email = False + Me.KdSearchBox2._displayFullName = False + Me.KdSearchBox2._displayWoelflKd = False + Me.KdSearchBox2._hideIfListEmpty = True + Me.KdSearchBox2._loadKdData = False + Me.KdSearchBox2._searchName1 = True + Me.KdSearchBox2._UseFIRMA = "" + Me.KdSearchBox2._ValueKdAndName = True + Me.KdSearchBox2.dgvpos = "LEFT" + Me.KdSearchBox2.KdName = "" + Me.KdSearchBox2.KdNr = "-1" + Me.KdSearchBox2.kdNrField = Nothing + Me.KdSearchBox2.KdNrNullInt = Nothing + Me.KdSearchBox2.Location = New System.Drawing.Point(223, 43) + Me.KdSearchBox2.Name = "KdSearchBox2" + Me.KdSearchBox2.nurAktive = True + Me.KdSearchBox2.searchActive = True + Me.KdSearchBox2.Size = New System.Drawing.Size(350, 20) + Me.KdSearchBox2.TabIndex = 14 + Me.KdSearchBox2.TIMER_SEARCH = True + Me.KdSearchBox2.usrcntl = Nothing + ' 'PictureBox3 ' Me.PictureBox3.Image = Global.SDL.My.Resources.Resources.cards @@ -991,6 +1107,17 @@ Partial Class usrCntlMDMAuswertungen Me.GroupBox8.TabIndex = 23 Me.GroupBox8.TabStop = False ' + 'cboIDSDateType + ' + Me.cboIDSDateType._allowedValuesFreiText = Nothing + Me.cboIDSDateType._allowFreiText = False + Me.cboIDSDateType._value = "" + Me.cboIDSDateType.FormattingEnabled = True + Me.cboIDSDateType.Location = New System.Drawing.Point(9, 63) + Me.cboIDSDateType.Name = "cboIDSDateType" + Me.cboIDSDateType.Size = New System.Drawing.Size(152, 21) + Me.cboIDSDateType.TabIndex = 27 + ' 'txtOrt ' Me.txtOrt.Location = New System.Drawing.Point(201, 87) @@ -1163,6 +1290,22 @@ Partial Class usrCntlMDMAuswertungen Me.PictureBox5.TabIndex = 11 Me.PictureBox5.TabStop = False ' + 'MyComboBox2 + ' + Me.MyComboBox2._allowedValuesFreiText = Nothing + Me.MyComboBox2._allowFreiText = False + Me.MyComboBox2._value = "" + Me.MyComboBox2.DropDownHeight = 350 + Me.MyComboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.MyComboBox2.DropDownWidth = 250 + Me.MyComboBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.MyComboBox2.FormattingEnabled = True + Me.MyComboBox2.IntegralHeight = False + Me.MyComboBox2.Location = New System.Drawing.Point(223, 40) + Me.MyComboBox2.Name = "MyComboBox2" + Me.MyComboBox2.Size = New System.Drawing.Size(221, 24) + Me.MyComboBox2.TabIndex = 17 + ' 'Label36 ' Me.Label36.AutoSize = True @@ -1184,6 +1327,14 @@ Partial Class usrCntlMDMAuswertungen Me.TabPage3.Text = "WÖLFL" Me.TabPage3.UseVisualStyleBackColor = True ' + 'UsrCntlWoelfl_IM_CSVRg1 + ' + Me.UsrCntlWoelfl_IM_CSVRg1.BackColor = System.Drawing.Color.White + Me.UsrCntlWoelfl_IM_CSVRg1.Location = New System.Drawing.Point(6, 167) + Me.UsrCntlWoelfl_IM_CSVRg1.Name = "UsrCntlWoelfl_IM_CSVRg1" + Me.UsrCntlWoelfl_IM_CSVRg1.Size = New System.Drawing.Size(728, 97) + Me.UsrCntlWoelfl_IM_CSVRg1.TabIndex = 10 + ' 'tbIDS ' Me.tbIDS.Controls.Add(Me.Label60) @@ -1200,6 +1351,84 @@ Partial Class usrCntlMDMAuswertungen Me.tbIDS.Text = "IDS" Me.tbIDS.UseVisualStyleBackColor = True ' + 'Label60 + ' + Me.Label60.AutoSize = True + Me.Label60.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label60.ForeColor = System.Drawing.SystemColors.ControlDarkDark + Me.Label60.Location = New System.Drawing.Point(9, 162) + Me.Label60.Name = "Label60" + Me.Label60.Size = New System.Drawing.Size(284, 17) + Me.Label60.TabIndex = 25 + Me.Label60.Text = "IDS Dieselabrechnungsdaten einlesen" + ' + 'GroupBox18 + ' + Me.GroupBox18.Controls.Add(Me.Label57) + Me.GroupBox18.Controls.Add(Me.Label58) + Me.GroupBox18.Controls.Add(Me.ProgressBar2) + Me.GroupBox18.Controls.Add(Me.TextBox2) + Me.GroupBox18.Controls.Add(Me.Label59) + Me.GroupBox18.Controls.Add(Me.Button17) + Me.GroupBox18.Location = New System.Drawing.Point(6, 182) + Me.GroupBox18.Name = "GroupBox18" + Me.GroupBox18.Size = New System.Drawing.Size(297, 134) + Me.GroupBox18.TabIndex = 24 + Me.GroupBox18.TabStop = False + ' + 'Label57 + ' + Me.Label57.Location = New System.Drawing.Point(133, 19) + Me.Label57.Name = "Label57" + Me.Label57.Size = New System.Drawing.Size(158, 49) + Me.Label57.TabIndex = 23 + Me.Label57.Text = "Liest die .CSV Datei von IDS ein und sichert die Daten in der Datenbank." + ' + 'Label58 + ' + Me.Label58.Location = New System.Drawing.Point(220, 103) + Me.Label58.Name = "Label58" + Me.Label58.Size = New System.Drawing.Size(69, 13) + Me.Label58.TabIndex = 22 + Me.Label58.Text = "0%" + Me.Label58.TextAlign = System.Drawing.ContentAlignment.TopRight + ' + 'ProgressBar2 + ' + Me.ProgressBar2.Location = New System.Drawing.Point(6, 74) + Me.ProgressBar2.Name = "ProgressBar2" + Me.ProgressBar2.Size = New System.Drawing.Size(283, 23) + Me.ProgressBar2.TabIndex = 20 + ' + 'TextBox2 + ' + Me.TextBox2.BackColor = System.Drawing.Color.White + Me.TextBox2.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.TextBox2.Location = New System.Drawing.Point(78, 103) + Me.TextBox2.Name = "TextBox2" + Me.TextBox2.Size = New System.Drawing.Size(106, 13) + Me.TextBox2.TabIndex = 19 + ' + 'Label59 + ' + Me.Label59.AutoSize = True + Me.Label59.Location = New System.Drawing.Point(3, 103) + Me.Label59.Name = "Label59" + Me.Label59.Size = New System.Drawing.Size(69, 13) + Me.Label59.TabIndex = 18 + Me.Label59.Text = "Einarbeitung:" + ' + 'Button17 + ' + Me.Button17.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button17.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button17.Location = New System.Drawing.Point(6, 19) + Me.Button17.Name = "Button17" + Me.Button17.Size = New System.Drawing.Size(121, 49) + Me.Button17.TabIndex = 4 + Me.Button17.Text = "Einlesen" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Datei auswählen ..." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) + Me.Button17.UseVisualStyleBackColor = True + ' 'TabPage2 ' Me.TabPage2.Controls.Add(Me.Label44) @@ -1483,6 +1712,14 @@ Partial Class usrCntlMDMAuswertungen Me.TabPage4.Text = "MSE" Me.TabPage4.UseVisualStyleBackColor = True ' + 'UsrCntlMSE_KonvertCSV1 + ' + Me.UsrCntlMSE_KonvertCSV1.BackColor = System.Drawing.Color.White + Me.UsrCntlMSE_KonvertCSV1.Location = New System.Drawing.Point(7, 7) + Me.UsrCntlMSE_KonvertCSV1.Name = "UsrCntlMSE_KonvertCSV1" + Me.UsrCntlMSE_KonvertCSV1.Size = New System.Drawing.Size(728, 97) + Me.UsrCntlMSE_KonvertCSV1.TabIndex = 0 + ' 'TabPage5 ' Me.TabPage5.Controls.Add(Me.Label56) @@ -1742,243 +1979,6 @@ Partial Class usrCntlMDMAuswertungen Me.pnl.Size = New System.Drawing.Size(1057, 54) Me.pnl.TabIndex = 26 ' - 'UsrCntlWoelfl_IM_CSVRg1 - ' - Me.UsrCntlWoelfl_IM_CSVRg1.BackColor = System.Drawing.Color.White - Me.UsrCntlWoelfl_IM_CSVRg1.Location = New System.Drawing.Point(6, 167) - Me.UsrCntlWoelfl_IM_CSVRg1.Name = "UsrCntlWoelfl_IM_CSVRg1" - Me.UsrCntlWoelfl_IM_CSVRg1.Size = New System.Drawing.Size(728, 97) - Me.UsrCntlWoelfl_IM_CSVRg1.TabIndex = 10 - ' - 'UsrCntlMSE_KonvertCSV1 - ' - Me.UsrCntlMSE_KonvertCSV1.BackColor = System.Drawing.Color.White - Me.UsrCntlMSE_KonvertCSV1.Location = New System.Drawing.Point(7, 7) - Me.UsrCntlMSE_KonvertCSV1.Name = "UsrCntlMSE_KonvertCSV1" - Me.UsrCntlMSE_KonvertCSV1.Size = New System.Drawing.Size(728, 97) - Me.UsrCntlMSE_KonvertCSV1.TabIndex = 0 - ' - 'MyComboBox2 - ' - Me.MyComboBox2._allowedValuesFreiText = Nothing - Me.MyComboBox2._allowFreiText = False - Me.MyComboBox2._value = "" - Me.MyComboBox2.DropDownHeight = 350 - Me.MyComboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.MyComboBox2.DropDownWidth = 250 - Me.MyComboBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.MyComboBox2.FormattingEnabled = True - Me.MyComboBox2.IntegralHeight = False - Me.MyComboBox2.Location = New System.Drawing.Point(223, 40) - Me.MyComboBox2.Name = "MyComboBox2" - Me.MyComboBox2.Size = New System.Drawing.Size(221, 24) - Me.MyComboBox2.TabIndex = 17 - ' - 'cboUeberfaelligeBestLeistung - ' - Me.cboUeberfaelligeBestLeistung._allowedValuesFreiText = Nothing - Me.cboUeberfaelligeBestLeistung._allowFreiText = False - Me.cboUeberfaelligeBestLeistung._value = "" - Me.cboUeberfaelligeBestLeistung.DropDownHeight = 350 - Me.cboUeberfaelligeBestLeistung.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboUeberfaelligeBestLeistung.DropDownWidth = 250 - Me.cboUeberfaelligeBestLeistung.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cboUeberfaelligeBestLeistung.FormattingEnabled = True - Me.cboUeberfaelligeBestLeistung.IntegralHeight = False - Me.cboUeberfaelligeBestLeistung.Location = New System.Drawing.Point(223, 58) - Me.cboUeberfaelligeBestLeistung.Name = "cboUeberfaelligeBestLeistung" - Me.cboUeberfaelligeBestLeistung.Size = New System.Drawing.Size(221, 24) - Me.cboUeberfaelligeBestLeistung.TabIndex = 15 - ' - 'kdUeberfaelligeBest - ' - Me.kdUeberfaelligeBest._AlleFirmenCLUSTER = False - Me.kdUeberfaelligeBest._AllowSetValue = True - Me.kdUeberfaelligeBest._autoSizeGross = False - Me.kdUeberfaelligeBest._display_Name1 = False - Me.kdUeberfaelligeBest._displayAVISO_Email = False - Me.kdUeberfaelligeBest._displayFullName = False - Me.kdUeberfaelligeBest._displayWoelflKd = False - Me.kdUeberfaelligeBest._hideIfListEmpty = True - Me.kdUeberfaelligeBest._loadKdData = False - Me.kdUeberfaelligeBest._searchName1 = True - Me.kdUeberfaelligeBest._UseFIRMA = "" - Me.kdUeberfaelligeBest._ValueKdAndName = True - Me.kdUeberfaelligeBest.dgvpos = "LEFT" - Me.kdUeberfaelligeBest.KdName = "" - Me.kdUeberfaelligeBest.KdNr = "-1" - Me.kdUeberfaelligeBest.kdNrField = Nothing - Me.kdUeberfaelligeBest.KdNrNullInt = Nothing - Me.kdUeberfaelligeBest.Location = New System.Drawing.Point(223, 109) - Me.kdUeberfaelligeBest.Name = "kdUeberfaelligeBest" - Me.kdUeberfaelligeBest.nurAktive = True - Me.kdUeberfaelligeBest.searchActive = True - Me.kdUeberfaelligeBest.Size = New System.Drawing.Size(350, 20) - Me.kdUeberfaelligeBest.TabIndex = 14 - Me.kdUeberfaelligeBest.TIMER_SEARCH = True - Me.kdUeberfaelligeBest.usrcntl = Nothing - ' - 'KdSearchBox1 - ' - Me.KdSearchBox1._AlleFirmenCLUSTER = False - Me.KdSearchBox1._AllowSetValue = True - Me.KdSearchBox1._autoSizeGross = False - Me.KdSearchBox1._display_Name1 = False - Me.KdSearchBox1._displayAVISO_Email = False - Me.KdSearchBox1._displayFullName = False - 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" - Me.KdSearchBox1.KdName = "" - Me.KdSearchBox1.KdNr = "-1" - Me.KdSearchBox1.kdNrField = Nothing - Me.KdSearchBox1.KdNrNullInt = Nothing - Me.KdSearchBox1.Location = New System.Drawing.Point(223, 48) - Me.KdSearchBox1.Name = "KdSearchBox1" - Me.KdSearchBox1.nurAktive = True - Me.KdSearchBox1.searchActive = True - Me.KdSearchBox1.Size = New System.Drawing.Size(350, 20) - Me.KdSearchBox1.TabIndex = 14 - Me.KdSearchBox1.TIMER_SEARCH = True - Me.KdSearchBox1.usrcntl = Nothing - ' - 'MyComboBox1 - ' - Me.MyComboBox1._allowedValuesFreiText = Nothing - Me.MyComboBox1._allowFreiText = False - Me.MyComboBox1._value = "" - Me.MyComboBox1.DropDownHeight = 350 - Me.MyComboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.MyComboBox1.DropDownWidth = 250 - Me.MyComboBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.MyComboBox1.FormattingEnabled = True - Me.MyComboBox1.IntegralHeight = False - Me.MyComboBox1.Location = New System.Drawing.Point(223, 72) - Me.MyComboBox1.Name = "MyComboBox1" - Me.MyComboBox1.Size = New System.Drawing.Size(221, 24) - Me.MyComboBox1.TabIndex = 15 - ' - 'KdSearchBox2 - ' - Me.KdSearchBox2._AlleFirmenCLUSTER = False - Me.KdSearchBox2._AllowSetValue = True - Me.KdSearchBox2._autoSizeGross = False - Me.KdSearchBox2._display_Name1 = False - Me.KdSearchBox2._displayAVISO_Email = False - Me.KdSearchBox2._displayFullName = False - Me.KdSearchBox2._displayWoelflKd = False - Me.KdSearchBox2._hideIfListEmpty = True - Me.KdSearchBox2._loadKdData = False - Me.KdSearchBox2._searchName1 = True - Me.KdSearchBox2._UseFIRMA = "" - Me.KdSearchBox2._ValueKdAndName = True - Me.KdSearchBox2.dgvpos = "LEFT" - Me.KdSearchBox2.KdName = "" - Me.KdSearchBox2.KdNr = "-1" - Me.KdSearchBox2.kdNrField = Nothing - Me.KdSearchBox2.KdNrNullInt = Nothing - Me.KdSearchBox2.Location = New System.Drawing.Point(223, 43) - Me.KdSearchBox2.Name = "KdSearchBox2" - Me.KdSearchBox2.nurAktive = True - Me.KdSearchBox2.searchActive = True - Me.KdSearchBox2.Size = New System.Drawing.Size(350, 20) - Me.KdSearchBox2.TabIndex = 14 - Me.KdSearchBox2.TIMER_SEARCH = True - Me.KdSearchBox2.usrcntl = Nothing - ' - 'cboIDSDateType - ' - Me.cboIDSDateType._allowedValuesFreiText = Nothing - Me.cboIDSDateType._allowFreiText = False - Me.cboIDSDateType._value = "" - Me.cboIDSDateType.FormattingEnabled = True - Me.cboIDSDateType.Location = New System.Drawing.Point(9, 63) - Me.cboIDSDateType.Name = "cboIDSDateType" - Me.cboIDSDateType.Size = New System.Drawing.Size(152, 21) - Me.cboIDSDateType.TabIndex = 27 - ' - 'GroupBox18 - ' - Me.GroupBox18.Controls.Add(Me.Label57) - Me.GroupBox18.Controls.Add(Me.Label58) - Me.GroupBox18.Controls.Add(Me.ProgressBar2) - Me.GroupBox18.Controls.Add(Me.TextBox2) - Me.GroupBox18.Controls.Add(Me.Label59) - Me.GroupBox18.Controls.Add(Me.Button17) - Me.GroupBox18.Location = New System.Drawing.Point(6, 182) - Me.GroupBox18.Name = "GroupBox18" - Me.GroupBox18.Size = New System.Drawing.Size(297, 134) - Me.GroupBox18.TabIndex = 24 - Me.GroupBox18.TabStop = False - ' - 'Label57 - ' - Me.Label57.Location = New System.Drawing.Point(133, 19) - Me.Label57.Name = "Label57" - Me.Label57.Size = New System.Drawing.Size(158, 49) - Me.Label57.TabIndex = 23 - Me.Label57.Text = "Liest die .CSV Datei von IDS ein und sichert die Daten in der Datenbank." - ' - 'Label58 - ' - Me.Label58.Location = New System.Drawing.Point(220, 103) - Me.Label58.Name = "Label58" - Me.Label58.Size = New System.Drawing.Size(69, 13) - Me.Label58.TabIndex = 22 - Me.Label58.Text = "0%" - Me.Label58.TextAlign = System.Drawing.ContentAlignment.TopRight - ' - 'ProgressBar2 - ' - Me.ProgressBar2.Location = New System.Drawing.Point(6, 74) - Me.ProgressBar2.Name = "ProgressBar2" - Me.ProgressBar2.Size = New System.Drawing.Size(283, 23) - Me.ProgressBar2.TabIndex = 20 - ' - 'TextBox2 - ' - Me.TextBox2.BackColor = System.Drawing.Color.White - Me.TextBox2.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.TextBox2.Location = New System.Drawing.Point(78, 103) - Me.TextBox2.Name = "TextBox2" - Me.TextBox2.Size = New System.Drawing.Size(106, 13) - Me.TextBox2.TabIndex = 19 - ' - 'Label59 - ' - Me.Label59.AutoSize = True - Me.Label59.Location = New System.Drawing.Point(3, 103) - Me.Label59.Name = "Label59" - Me.Label59.Size = New System.Drawing.Size(69, 13) - Me.Label59.TabIndex = 18 - Me.Label59.Text = "Einarbeitung:" - ' - 'Button17 - ' - Me.Button17.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button17.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Button17.Location = New System.Drawing.Point(6, 19) - Me.Button17.Name = "Button17" - Me.Button17.Size = New System.Drawing.Size(121, 49) - Me.Button17.TabIndex = 4 - Me.Button17.Text = "Einlesen" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Datei auswählen ..." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) - Me.Button17.UseVisualStyleBackColor = True - ' - 'Label60 - ' - Me.Label60.AutoSize = True - Me.Label60.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label60.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label60.Location = New System.Drawing.Point(9, 162) - Me.Label60.Name = "Label60" - Me.Label60.Size = New System.Drawing.Size(284, 17) - Me.Label60.TabIndex = 25 - Me.Label60.Text = "IDS Dieselabrechnungsdaten einlesen" - ' 'usrCntlMDMAuswertungen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -2019,6 +2019,8 @@ Partial Class usrCntlMDMAuswertungen Me.TabPage3.PerformLayout() Me.tbIDS.ResumeLayout(False) Me.tbIDS.PerformLayout() + Me.GroupBox18.ResumeLayout(False) + Me.GroupBox18.PerformLayout() Me.TabPage2.ResumeLayout(False) Me.TabPage2.PerformLayout() Me.GroupBox13.ResumeLayout(False) @@ -2044,8 +2046,6 @@ Partial Class usrCntlMDMAuswertungen Me.GroupBox14.PerformLayout() Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() - Me.GroupBox18.ResumeLayout(False) - Me.GroupBox18.PerformLayout() Me.ResumeLayout(False) End Sub diff --git a/SDL/mdm/usrCntlMDMAuswertungen.vb b/SDL/mdm/usrCntlMDMAuswertungen.vb index 5d94a621..962fa7d2 100644 --- a/SDL/mdm/usrCntlMDMAuswertungen.vb +++ b/SDL/mdm/usrCntlMDMAuswertungen.vb @@ -1415,6 +1415,10 @@ Public Class usrCntlMDMAuswertungen Me.Cursor = Cursors.Default End Sub + + Private Sub UsrCntlMSE_KonvertCSV1_Load(sender As Object, e As EventArgs) Handles UsrCntlMSE_KonvertCSV1.Load + + End Sub End Class diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb index a76d513f..1b2664b6 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb @@ -661,6 +661,7 @@ Public Class cCreditSafeAPI i = i + 1 End While + Return "Anzahl gefundener Datensätze: " & i