From d327133bb473221dcf00b9c30d302a640813dcc7 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 22 May 2023 17:15:50 +0200 Subject: [PATCH] Fiskalkunden -> Creditsafe-API erweitert, Fiskalkunden weitergebaut, etc. --- SDL/Creditsafe/usrcntlCreditsafe.vb | 2 +- SDL/kunden/usrCntlKundenuebersicht.vb | 13 +- .../usrcntlFiskaluebersicht.Designer.vb | 699 ++++++++++++------ SDL/kunden/usrcntlFiskaluebersicht.vb | 233 +++++- .../Classes/cBonitaetsauskunft.vb | 39 +- VERAG_PROG_ALLGEMEIN/Classes/cFiskalkunden.vb | 25 + .../Schnittstellen/cCreditSafeAPI.vb | 43 +- 7 files changed, 805 insertions(+), 249 deletions(-) diff --git a/SDL/Creditsafe/usrcntlCreditsafe.vb b/SDL/Creditsafe/usrcntlCreditsafe.vb index 89078202..2f287d1e 100644 --- a/SDL/Creditsafe/usrcntlCreditsafe.vb +++ b/SDL/Creditsafe/usrcntlCreditsafe.vb @@ -98,7 +98,7 @@ Public Class usrcntlCreditsafe If cs.authenticate(user, pw) = "200" Then - Dim company = New cCreditSafeAPI.Company(txtFirma.Text, txtUID.Text, cboLand.SelectedItem.Value, "", "", Nothing, txtStrasse.Text, txtPLZ.Text, txtOrt.Text) + Dim company = New cCreditSafeAPI.Company(txtFirma.Text, txtUID.Text, cboLand.SelectedItem.Value, "", "", Nothing, txtStrasse.Text, txtPLZ.Text, txtOrt.Text, "", "", "", "", "") lblWarning.Text = cs.searchCompanies(company, dataTable).ToString initDGV(dataTable) Cursor = Cursors.Default diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index 2a7741df..1410c2b7 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -2757,7 +2757,7 @@ Public Class usrCntlKundenuebersicht End Select - Dim company As New cCreditSafeAPI.Company("", "", land, KUNDE_ERW.kde_CreditSaveNo, KUNDE_ERW.kde_CreditSaveId, Nothing, "", "", "") + Dim company As New cCreditSafeAPI.Company("", "", land, KUNDE_ERW.kde_CreditSaveNo, KUNDE_ERW.kde_CreditSaveId, Nothing, "", "", "", "", "", "", "", "") Dim pdfObject As Byte() = Nothing If lblBonitaetsdatum._value <> Nothing Then @@ -2857,9 +2857,9 @@ Public Class usrCntlKundenuebersicht cBonitaetsauskunft.ba_Hoechstkredit = 0 End If - cBonitaetsauskunft.ba_Bankverbindung = "" + cBonitaetsauskunft.ba_Bankverbindung = company.csBank cBonitaetsauskunft.ba_Zahlungsweise = "" - cBonitaetsauskunft.ba_GFName = "" + cBonitaetsauskunft.ba_GFName = company.csCEO cBonitaetsauskunft.ba_Sonstiges = "" If IsDate(company.csDFoundingDate) Then cBonitaetsauskunft.ba_GruendundsDatum = IIf(company.csDFoundingDate > New Date("01.01.1900"), company.csDFoundingDate, "") @@ -2867,7 +2867,14 @@ Public Class usrCntlKundenuebersicht cBonitaetsauskunft.ba_GruendundsDatum = "" End If + cBonitaetsauskunft.ba_GSName = company.csShareholder + cBonitaetsauskunft.ba_Geschaeftszweck = company.csBusinessPurpose + If company.csSumEmployees <> "" And IsNumeric(company.csSumEmployees) Then + cBonitaetsauskunft.ba_Mitarbeiter = CInt(company.csSumEmployees) + Else + cBonitaetsauskunft.ba_Mitarbeiter = 0 + End If If cBonitaetsauskunft.SAVE Then SQL.doSQL("UPDATE Kunden SET Bonität='" & cBonitaetsauskunft.ba_BonitaetsIndex & "', Bonitätsdatum='" & cBonitaetsauskunft.ba_Datum & "', Höchstkredit=" & If(cBonitaetsauskunft.ba_Hoechstkredit Is Nothing, "null", "'" & cBonitaetsauskunft.ba_Hoechstkredit & "'") & " WHERE KundenNr='" & cBonitaetsauskunft.ba_KundenNr & "'", "FMZOLL") diff --git a/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb b/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb index 7c4fbd11..9eb7d10d 100644 --- a/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb +++ b/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb @@ -30,6 +30,7 @@ Partial Class usrcntlFiskaluebersicht Me.lblWarning = New System.Windows.Forms.Label() Me.Button4 = New System.Windows.Forms.Button() Me.picLocked = New System.Windows.Forms.PictureBox() + Me.lblAbschluss = New System.Windows.Forms.Label() Me.cbxFiskalart = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel() Me.btnOK = New System.Windows.Forms.Button() @@ -37,19 +38,24 @@ Partial Class usrcntlFiskaluebersicht Me.btnPDFReport = New System.Windows.Forms.Button() Me.dgvFiskaluebersicht = New VERAG_PROG_ALLGEMEIN.MyDatagridview() Me.MyPanel2 = New VERAG_PROG_ALLGEMEIN.MyPanel() - Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtGesellschafter = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label12 = New System.Windows.Forms.Label() + Me.txtGF = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label11 = New System.Windows.Forms.Label() + Me.Label10 = New System.Windows.Forms.Label() + Me.txtKredit = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtAnzMA = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label9 = New System.Windows.Forms.Label() + Me.txtWaren = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label8 = New System.Windows.Forms.Label() + Me.txtGriendungsjahr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label7 = New System.Windows.Forms.Label() + Me.txtGeschaeftszweck = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label5 = New System.Windows.Forms.Label() + Me.btnAddAttachments = New System.Windows.Forms.Button() + Me.cbxAttachmentArt = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label4 = New System.Windows.Forms.Label() - Me.lblAbschluss = New System.Windows.Forms.Label() - Me.cbxBeurteilung = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.dgvEmpfaenger = New VERAG_PROG_ALLGEMEIN.MyDatagridview() - Me.dgvLieferanten = New VERAG_PROG_ALLGEMEIN.MyDatagridview() - Me.Button3 = New System.Windows.Forms.Button() - Me.lblBeurteilung = New System.Windows.Forms.Label() - Me.Label3 = New System.Windows.Forms.Label() - Me.Label2 = New System.Windows.Forms.Label() - Me.lblAnmerkungen = New System.Windows.Forms.Label() - Me.RichTextBox1 = New System.Windows.Forms.RichTextBox() + Me.rtbAnmerkung = New System.Windows.Forms.RichTextBox() Me.Button2 = New System.Windows.Forms.Button() Me.picEORIOK = New System.Windows.Forms.PictureBox() Me.picOK = New System.Windows.Forms.PictureBox() @@ -67,17 +73,27 @@ Partial Class usrcntlFiskaluebersicht Me.dgvUnterlagen = New VERAG_PROG_ALLGEMEIN.MyDatagridview() Me.cbxUID = New System.Windows.Forms.CheckBox() Me.txtUID = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.cbxAttachmentArt = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.btnAddAttachments = New System.Windows.Forms.Button() + Me.rtbZwischenh = New System.Windows.Forms.RichTextBox() + Me.dgvZwischenh = New VERAG_PROG_ALLGEMEIN.MyDatagridview() + Me.Label6 = New System.Windows.Forms.Label() + Me.rtfEmpfaenger = New System.Windows.Forms.RichTextBox() + Me.rtfLieferanten = New System.Windows.Forms.RichTextBox() + Me.dgvEmpfaenger = New VERAG_PROG_ALLGEMEIN.MyDatagridview() + Me.dgvLieferanten = New VERAG_PROG_ALLGEMEIN.MyDatagridview() + Me.Button3 = New System.Windows.Forms.Button() + Me.Label3 = New System.Windows.Forms.Label() + Me.Label2 = New System.Windows.Forms.Label() + Me.lblAnmerkungen = New System.Windows.Forms.Label() CType(Me.picLocked, System.ComponentModel.ISupportInitialize).BeginInit() Me.MyPanel1.SuspendLayout() CType(Me.dgvFiskaluebersicht, System.ComponentModel.ISupportInitialize).BeginInit() Me.MyPanel2.SuspendLayout() - CType(Me.dgvEmpfaenger, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.dgvLieferanten, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.picEORIOK, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.picOK, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvUnterlagen, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.dgvZwischenh, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.dgvEmpfaenger, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.dgvLieferanten, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'btn @@ -156,6 +172,15 @@ Partial Class usrcntlFiskaluebersicht Me.picLocked.TabStop = False Me.picLocked.Visible = False ' + 'lblAbschluss + ' + Me.lblAbschluss.AutoSize = True + Me.lblAbschluss.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblAbschluss.Location = New System.Drawing.Point(858, 12) + Me.lblAbschluss.Name = "lblAbschluss" + Me.lblAbschluss.Size = New System.Drawing.Size(0, 20) + Me.lblAbschluss.TabIndex = 138 + ' 'cbxFiskalart ' Me.cbxFiskalart._allowedValuesFreiText = Nothing @@ -253,21 +278,35 @@ Partial Class usrcntlFiskaluebersicht Me.MyPanel2.AutoScrollMinSize = New System.Drawing.Size(0, 10) Me.MyPanel2.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.MyPanel2.BackColor = System.Drawing.Color.White - Me.MyPanel2.Controls.Add(Me.btnAddAttachments) - Me.MyPanel2.Controls.Add(Me.cbxAttachmentArt) - Me.MyPanel2.Controls.Add(Me.MyTextBox1) - Me.MyPanel2.Controls.Add(Me.Label5) - Me.MyPanel2.Controls.Add(Me.Label4) - Me.MyPanel2.Controls.Add(Me.lblAbschluss) - Me.MyPanel2.Controls.Add(Me.cbxBeurteilung) + Me.MyPanel2.Controls.Add(Me.rtbZwischenh) + Me.MyPanel2.Controls.Add(Me.dgvZwischenh) + Me.MyPanel2.Controls.Add(Me.Label6) + Me.MyPanel2.Controls.Add(Me.rtfEmpfaenger) + Me.MyPanel2.Controls.Add(Me.rtfLieferanten) Me.MyPanel2.Controls.Add(Me.dgvEmpfaenger) Me.MyPanel2.Controls.Add(Me.dgvLieferanten) Me.MyPanel2.Controls.Add(Me.Button3) - Me.MyPanel2.Controls.Add(Me.lblBeurteilung) Me.MyPanel2.Controls.Add(Me.Label3) Me.MyPanel2.Controls.Add(Me.Label2) Me.MyPanel2.Controls.Add(Me.lblAnmerkungen) - Me.MyPanel2.Controls.Add(Me.RichTextBox1) + Me.MyPanel2.Controls.Add(Me.txtGesellschafter) + Me.MyPanel2.Controls.Add(Me.Label12) + Me.MyPanel2.Controls.Add(Me.txtGF) + Me.MyPanel2.Controls.Add(Me.Label11) + Me.MyPanel2.Controls.Add(Me.Label10) + Me.MyPanel2.Controls.Add(Me.txtKredit) + Me.MyPanel2.Controls.Add(Me.txtAnzMA) + Me.MyPanel2.Controls.Add(Me.Label9) + Me.MyPanel2.Controls.Add(Me.txtWaren) + Me.MyPanel2.Controls.Add(Me.Label8) + Me.MyPanel2.Controls.Add(Me.txtGriendungsjahr) + Me.MyPanel2.Controls.Add(Me.Label7) + Me.MyPanel2.Controls.Add(Me.txtGeschaeftszweck) + Me.MyPanel2.Controls.Add(Me.Label5) + Me.MyPanel2.Controls.Add(Me.btnAddAttachments) + Me.MyPanel2.Controls.Add(Me.cbxAttachmentArt) + Me.MyPanel2.Controls.Add(Me.Label4) + Me.MyPanel2.Controls.Add(Me.rtbAnmerkung) Me.MyPanel2.Controls.Add(Me.Button2) Me.MyPanel2.Controls.Add(Me.picEORIOK) Me.MyPanel2.Controls.Add(Me.picOK) @@ -290,38 +329,261 @@ Partial Class usrcntlFiskaluebersicht Me.MyPanel2.Size = New System.Drawing.Size(721, 657) Me.MyPanel2.TabIndex = 110 ' - 'MyTextBox1 + 'txtGesellschafter ' - Me.MyTextBox1._DateTimeOnly = False - Me.MyTextBox1._numbersOnly = False - Me.MyTextBox1._numbersOnlyKommastellen = "" - Me.MyTextBox1._numbersOnlyTrennzeichen = True - Me.MyTextBox1._Prozent = False - Me.MyTextBox1._ShortDateNew = False - Me.MyTextBox1._ShortDateOnly = False - Me.MyTextBox1._TimeOnly = False - Me.MyTextBox1._TimeOnly_Seconds = False - Me.MyTextBox1._value = Nothing - Me.MyTextBox1._Waehrung = False - Me.MyTextBox1._WaehrungZeichen = True - Me.MyTextBox1.ForeColor = System.Drawing.Color.Black - Me.MyTextBox1.Location = New System.Drawing.Point(144, 593) - Me.MyTextBox1.MaxLineLength = -1 - Me.MyTextBox1.MaxLines_Warning = "" - Me.MyTextBox1.MaxLines_Warning_Label = Nothing - Me.MyTextBox1.Name = "MyTextBox1" - Me.MyTextBox1.Size = New System.Drawing.Size(500, 20) - Me.MyTextBox1.TabIndex = 141 + Me.txtGesellschafter._DateTimeOnly = False + Me.txtGesellschafter._numbersOnly = False + Me.txtGesellschafter._numbersOnlyKommastellen = "" + Me.txtGesellschafter._numbersOnlyTrennzeichen = True + Me.txtGesellschafter._Prozent = False + Me.txtGesellschafter._ShortDateNew = False + Me.txtGesellschafter._ShortDateOnly = False + Me.txtGesellschafter._TimeOnly = False + Me.txtGesellschafter._TimeOnly_Seconds = False + Me.txtGesellschafter._value = Nothing + Me.txtGesellschafter._Waehrung = False + Me.txtGesellschafter._WaehrungZeichen = True + Me.txtGesellschafter.ForeColor = System.Drawing.Color.Black + Me.txtGesellschafter.Location = New System.Drawing.Point(419, 188) + Me.txtGesellschafter.MaxLineLength = -1 + Me.txtGesellschafter.MaxLines_Warning = "" + Me.txtGesellschafter.MaxLines_Warning_Label = Nothing + Me.txtGesellschafter.Name = "txtGesellschafter" + Me.txtGesellschafter.Size = New System.Drawing.Size(239, 20) + Me.txtGesellschafter.TabIndex = 165 + ' + 'Label12 + ' + Me.Label12.AutoSize = True + Me.Label12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label12.Location = New System.Drawing.Point(279, 191) + Me.Label12.Name = "Label12" + Me.Label12.Size = New System.Drawing.Size(88, 13) + Me.Label12.TabIndex = 164 + Me.Label12.Text = "Gesellschafter" + ' + 'txtGF + ' + Me.txtGF._DateTimeOnly = False + Me.txtGF._numbersOnly = False + Me.txtGF._numbersOnlyKommastellen = "" + Me.txtGF._numbersOnlyTrennzeichen = True + Me.txtGF._Prozent = False + Me.txtGF._ShortDateNew = False + Me.txtGF._ShortDateOnly = False + Me.txtGF._TimeOnly = False + Me.txtGF._TimeOnly_Seconds = False + Me.txtGF._value = Nothing + Me.txtGF._Waehrung = False + Me.txtGF._WaehrungZeichen = True + Me.txtGF.ForeColor = System.Drawing.Color.Black + Me.txtGF.Location = New System.Drawing.Point(419, 162) + Me.txtGF.MaxLineLength = -1 + Me.txtGF.MaxLines_Warning = "" + Me.txtGF.MaxLines_Warning_Label = Nothing + Me.txtGF.Name = "txtGF" + Me.txtGF.Size = New System.Drawing.Size(239, 20) + Me.txtGF.TabIndex = 163 + ' + 'Label11 + ' + Me.Label11.AutoSize = True + Me.Label11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label11.Location = New System.Drawing.Point(279, 165) + Me.Label11.Name = "Label11" + Me.Label11.Size = New System.Drawing.Size(97, 13) + Me.Label11.TabIndex = 162 + Me.Label11.Text = "Geschäftsführer" + ' + 'Label10 + ' + Me.Label10.AutoSize = True + Me.Label10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label10.Location = New System.Drawing.Point(5, 165) + Me.Label10.Name = "Label10" + Me.Label10.Size = New System.Drawing.Size(79, 13) + Me.Label10.TabIndex = 161 + Me.Label10.Text = "Höchstkredit" + ' + 'txtKredit + ' + Me.txtKredit._DateTimeOnly = False + Me.txtKredit._numbersOnly = True + Me.txtKredit._numbersOnlyKommastellen = "" + Me.txtKredit._numbersOnlyTrennzeichen = True + Me.txtKredit._Prozent = False + Me.txtKredit._ShortDateNew = False + Me.txtKredit._ShortDateOnly = False + Me.txtKredit._TimeOnly = False + Me.txtKredit._TimeOnly_Seconds = False + Me.txtKredit._value = Nothing + Me.txtKredit._Waehrung = True + Me.txtKredit._WaehrungZeichen = True + Me.txtKredit.ForeColor = System.Drawing.Color.Black + Me.txtKredit.Location = New System.Drawing.Point(150, 162) + Me.txtKredit.MaxLineLength = -1 + Me.txtKredit.MaxLines_Warning = "" + Me.txtKredit.MaxLines_Warning_Label = Nothing + Me.txtKredit.Name = "txtKredit" + Me.txtKredit.Size = New System.Drawing.Size(91, 20) + Me.txtKredit.TabIndex = 160 + ' + 'txtAnzMA + ' + Me.txtAnzMA._DateTimeOnly = False + Me.txtAnzMA._numbersOnly = True + Me.txtAnzMA._numbersOnlyKommastellen = "" + Me.txtAnzMA._numbersOnlyTrennzeichen = True + Me.txtAnzMA._Prozent = False + Me.txtAnzMA._ShortDateNew = False + Me.txtAnzMA._ShortDateOnly = False + Me.txtAnzMA._TimeOnly = False + Me.txtAnzMA._TimeOnly_Seconds = False + Me.txtAnzMA._value = Nothing + Me.txtAnzMA._Waehrung = False + Me.txtAnzMA._WaehrungZeichen = False + Me.txtAnzMA.ForeColor = System.Drawing.Color.Black + Me.txtAnzMA.Location = New System.Drawing.Point(150, 136) + Me.txtAnzMA.MaxLineLength = -1 + Me.txtAnzMA.MaxLines_Warning = "" + Me.txtAnzMA.MaxLines_Warning_Label = Nothing + Me.txtAnzMA.Name = "txtAnzMA" + Me.txtAnzMA.Size = New System.Drawing.Size(91, 20) + Me.txtAnzMA.TabIndex = 159 + ' + 'Label9 + ' + Me.Label9.AutoSize = True + Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label9.Location = New System.Drawing.Point(5, 139) + Me.Label9.Name = "Label9" + Me.Label9.Size = New System.Drawing.Size(109, 13) + Me.Label9.TabIndex = 158 + Me.Label9.Text = "Anzahl Mitarbeiter" + ' + 'txtWaren + ' + Me.txtWaren._DateTimeOnly = False + Me.txtWaren._numbersOnly = False + Me.txtWaren._numbersOnlyKommastellen = "" + Me.txtWaren._numbersOnlyTrennzeichen = True + Me.txtWaren._Prozent = False + Me.txtWaren._ShortDateNew = False + Me.txtWaren._ShortDateOnly = False + Me.txtWaren._TimeOnly = False + Me.txtWaren._TimeOnly_Seconds = False + Me.txtWaren._value = Nothing + Me.txtWaren._Waehrung = False + Me.txtWaren._WaehrungZeichen = True + Me.txtWaren.ForeColor = System.Drawing.Color.Black + Me.txtWaren.Location = New System.Drawing.Point(419, 136) + Me.txtWaren.MaxLineLength = -1 + Me.txtWaren.MaxLines_Warning = "" + Me.txtWaren.MaxLines_Warning_Label = Nothing + Me.txtWaren.Name = "txtWaren" + Me.txtWaren.Size = New System.Drawing.Size(239, 20) + Me.txtWaren.TabIndex = 157 + ' + 'Label8 + ' + Me.Label8.AutoSize = True + Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label8.Location = New System.Drawing.Point(279, 139) + Me.Label8.Name = "Label8" + Me.Label8.Size = New System.Drawing.Size(44, 13) + Me.Label8.TabIndex = 156 + Me.Label8.Text = "Waren" + ' + 'txtGriendungsjahr + ' + Me.txtGriendungsjahr._DateTimeOnly = False + Me.txtGriendungsjahr._numbersOnly = False + Me.txtGriendungsjahr._numbersOnlyKommastellen = "" + Me.txtGriendungsjahr._numbersOnlyTrennzeichen = True + Me.txtGriendungsjahr._Prozent = False + Me.txtGriendungsjahr._ShortDateNew = False + Me.txtGriendungsjahr._ShortDateOnly = True + Me.txtGriendungsjahr._TimeOnly = False + Me.txtGriendungsjahr._TimeOnly_Seconds = False + Me.txtGriendungsjahr._value = Nothing + Me.txtGriendungsjahr._Waehrung = False + Me.txtGriendungsjahr._WaehrungZeichen = False + Me.txtGriendungsjahr.ForeColor = System.Drawing.Color.Black + Me.txtGriendungsjahr.Location = New System.Drawing.Point(150, 110) + Me.txtGriendungsjahr.MaxLength = 10 + Me.txtGriendungsjahr.MaxLineLength = -1 + Me.txtGriendungsjahr.MaxLines_Warning = "" + Me.txtGriendungsjahr.MaxLines_Warning_Label = Nothing + Me.txtGriendungsjahr.Name = "txtGriendungsjahr" + Me.txtGriendungsjahr.Size = New System.Drawing.Size(91, 20) + Me.txtGriendungsjahr.TabIndex = 155 + ' + 'Label7 + ' + Me.Label7.AutoSize = True + Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label7.Location = New System.Drawing.Point(5, 113) + Me.Label7.Name = "Label7" + Me.Label7.Size = New System.Drawing.Size(89, 13) + Me.Label7.TabIndex = 154 + Me.Label7.Text = "Gründungsjahr" + ' + 'txtGeschaeftszweck + ' + Me.txtGeschaeftszweck._DateTimeOnly = False + Me.txtGeschaeftszweck._numbersOnly = False + Me.txtGeschaeftszweck._numbersOnlyKommastellen = "" + Me.txtGeschaeftszweck._numbersOnlyTrennzeichen = True + Me.txtGeschaeftszweck._Prozent = False + Me.txtGeschaeftszweck._ShortDateNew = False + Me.txtGeschaeftszweck._ShortDateOnly = False + Me.txtGeschaeftszweck._TimeOnly = False + Me.txtGeschaeftszweck._TimeOnly_Seconds = False + Me.txtGeschaeftszweck._value = Nothing + Me.txtGeschaeftszweck._Waehrung = False + Me.txtGeschaeftszweck._WaehrungZeichen = True + Me.txtGeschaeftszweck.ForeColor = System.Drawing.Color.Black + Me.txtGeschaeftszweck.Location = New System.Drawing.Point(419, 110) + Me.txtGeschaeftszweck.MaxLineLength = -1 + Me.txtGeschaeftszweck.MaxLines_Warning = "" + Me.txtGeschaeftszweck.MaxLines_Warning_Label = Nothing + Me.txtGeschaeftszweck.Name = "txtGeschaeftszweck" + Me.txtGeschaeftszweck.Size = New System.Drawing.Size(239, 20) + Me.txtGeschaeftszweck.TabIndex = 153 ' 'Label5 ' Me.Label5.AutoSize = True - Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label5.Location = New System.Drawing.Point(4, 591) + Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label5.Location = New System.Drawing.Point(279, 113) Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(61, 20) - Me.Label5.TabIndex = 140 - Me.Label5.Text = "Waren" + Me.Label5.Size = New System.Drawing.Size(100, 13) + Me.Label5.TabIndex = 152 + Me.Label5.Text = "Geschäftszweck" + ' + 'btnAddAttachments + ' + Me.btnAddAttachments.BackgroundImage = Global.SDL.My.Resources.Resources.plus + Me.btnAddAttachments.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnAddAttachments.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnAddAttachments.ForeColor = System.Drawing.Color.Black + Me.btnAddAttachments.Location = New System.Drawing.Point(433, 512) + Me.btnAddAttachments.Name = "btnAddAttachments" + Me.btnAddAttachments.Size = New System.Drawing.Size(29, 19) + Me.btnAddAttachments.TabIndex = 142 + Me.btnAddAttachments.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnAddAttachments.UseVisualStyleBackColor = True + ' + 'cbxAttachmentArt + ' + Me.cbxAttachmentArt._allowedValuesFreiText = Nothing + Me.cbxAttachmentArt._allowFreiText = False + Me.cbxAttachmentArt._value = "" + Me.cbxAttachmentArt.FormattingEnabled = True + Me.cbxAttachmentArt.Location = New System.Drawing.Point(326, 512) + Me.cbxAttachmentArt.Name = "cbxAttachmentArt" + Me.cbxAttachmentArt.Size = New System.Drawing.Size(101, 21) + Me.cbxAttachmentArt.TabIndex = 131 ' 'Label4 ' @@ -332,123 +594,13 @@ Partial Class usrcntlFiskaluebersicht Me.Label4.Size = New System.Drawing.Size(0, 20) Me.Label4.TabIndex = 139 ' - 'lblAbschluss + 'rtbAnmerkung ' - Me.lblAbschluss.AutoSize = True - Me.lblAbschluss.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAbschluss.Location = New System.Drawing.Point(508, 741) - Me.lblAbschluss.Name = "lblAbschluss" - Me.lblAbschluss.Size = New System.Drawing.Size(0, 20) - Me.lblAbschluss.TabIndex = 138 - Me.lblAbschluss.TextAlign = System.Drawing.ContentAlignment.TopRight - ' - 'cbxBeurteilung - ' - Me.cbxBeurteilung._allowedValuesFreiText = Nothing - Me.cbxBeurteilung._allowFreiText = False - Me.cbxBeurteilung._value = "" - Me.cbxBeurteilung.FormattingEnabled = True - Me.cbxBeurteilung.Location = New System.Drawing.Point(150, 681) - Me.cbxBeurteilung.Name = "cbxBeurteilung" - Me.cbxBeurteilung.Size = New System.Drawing.Size(70, 21) - Me.cbxBeurteilung.TabIndex = 131 - ' - 'dgvEmpfaenger - ' - Me.dgvEmpfaenger.AKTUALISIERUNGS_INTERVALL = -1 - Me.dgvEmpfaenger.AllowUserToAddRows = False - Me.dgvEmpfaenger.AllowUserToDeleteRows = False - Me.dgvEmpfaenger.AllowUserToOrderColumns = True - Me.dgvEmpfaenger.AllowUserToResizeRows = False - Me.dgvEmpfaenger.BackgroundColor = System.Drawing.Color.White - Me.dgvEmpfaenger.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvEmpfaenger.Location = New System.Drawing.Point(389, 453) - Me.dgvEmpfaenger.MultiSelect = False - Me.dgvEmpfaenger.Name = "dgvEmpfaenger" - Me.dgvEmpfaenger.ReadOnly = True - Me.dgvEmpfaenger.RowHeadersVisible = False - Me.dgvEmpfaenger.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvEmpfaenger.Size = New System.Drawing.Size(255, 92) - Me.dgvEmpfaenger.TabIndex = 137 - ' - 'dgvLieferanten - ' - Me.dgvLieferanten.AKTUALISIERUNGS_INTERVALL = -1 - Me.dgvLieferanten.AllowUserToAddRows = False - Me.dgvLieferanten.AllowUserToDeleteRows = False - Me.dgvLieferanten.AllowUserToOrderColumns = True - Me.dgvLieferanten.AllowUserToResizeRows = False - Me.dgvLieferanten.BackgroundColor = System.Drawing.Color.White - Me.dgvLieferanten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvLieferanten.Location = New System.Drawing.Point(144, 453) - Me.dgvLieferanten.MultiSelect = False - Me.dgvLieferanten.Name = "dgvLieferanten" - Me.dgvLieferanten.ReadOnly = True - Me.dgvLieferanten.RowHeadersVisible = False - Me.dgvLieferanten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvLieferanten.Size = New System.Drawing.Size(239, 92) - Me.dgvLieferanten.TabIndex = 136 - ' - 'Button3 - ' - Me.Button3.BackgroundImage = Global.SDL.My.Resources.Resources.spedbuch - Me.Button3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button3.ForeColor = System.Drawing.Color.Black - Me.Button3.Location = New System.Drawing.Point(650, 453) - Me.Button3.Name = "Button3" - Me.Button3.Size = New System.Drawing.Size(35, 33) - Me.Button3.TabIndex = 135 - Me.Button3.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button3.UseVisualStyleBackColor = True - ' - 'lblBeurteilung - ' - Me.lblBeurteilung.AutoSize = True - Me.lblBeurteilung.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblBeurteilung.Location = New System.Drawing.Point(4, 682) - Me.lblBeurteilung.Name = "lblBeurteilung" - Me.lblBeurteilung.Size = New System.Drawing.Size(101, 20) - Me.lblBeurteilung.TabIndex = 134 - Me.lblBeurteilung.Text = "Beurteilung" - ' - 'Label3 - ' - Me.Label3.AutoSize = True - Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label3.Location = New System.Drawing.Point(385, 430) - Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(147, 20) - Me.Label3.TabIndex = 133 - Me.Label3.Text = "Top 5 Empfänger" - ' - 'Label2 - ' - Me.Label2.AutoSize = True - Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label2.Location = New System.Drawing.Point(143, 430) - Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(151, 20) - Me.Label2.TabIndex = 132 - Me.Label2.Text = "Top 5 Lieferanten" - ' - 'lblAnmerkungen - ' - Me.lblAnmerkungen.AutoSize = True - Me.lblAnmerkungen.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAnmerkungen.Location = New System.Drawing.Point(4, 281) - Me.lblAnmerkungen.Name = "lblAnmerkungen" - Me.lblAnmerkungen.Size = New System.Drawing.Size(120, 20) - Me.lblAnmerkungen.TabIndex = 131 - Me.lblAnmerkungen.Text = "Anmerkungen" - ' - 'RichTextBox1 - ' - Me.RichTextBox1.Location = New System.Drawing.Point(147, 308) - Me.RichTextBox1.Name = "RichTextBox1" - Me.RichTextBox1.Size = New System.Drawing.Size(497, 78) - Me.RichTextBox1.TabIndex = 130 - Me.RichTextBox1.Text = "" + Me.rtbAnmerkung.Location = New System.Drawing.Point(144, 544) + Me.rtbAnmerkung.Name = "rtbAnmerkung" + Me.rtbAnmerkung.Size = New System.Drawing.Size(497, 78) + Me.rtbAnmerkung.TabIndex = 130 + Me.rtbAnmerkung.Text = "" ' 'Button2 ' @@ -497,10 +649,10 @@ Partial Class usrcntlFiskaluebersicht Me.usrcntlUnterlagen.BackColor = System.Drawing.Color.White Me.usrcntlUnterlagen.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.usrcntlUnterlagen.Cursor = System.Windows.Forms.Cursors.Default - Me.usrcntlUnterlagen.Location = New System.Drawing.Point(148, 128) + Me.usrcntlUnterlagen.Location = New System.Drawing.Point(153, 410) Me.usrcntlUnterlagen.Margin = New System.Windows.Forms.Padding(0) Me.usrcntlUnterlagen.Name = "usrcntlUnterlagen" - Me.usrcntlUnterlagen.Size = New System.Drawing.Size(496, 123) + Me.usrcntlUnterlagen.Size = New System.Drawing.Size(170, 123) Me.usrcntlUnterlagen.TabIndex = 121 ' 'Button1 @@ -521,7 +673,7 @@ Partial Class usrcntlFiskaluebersicht Me.cbxVollmacht.AutoSize = True Me.cbxVollmacht.Enabled = False Me.cbxVollmacht.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxVollmacht.Location = New System.Drawing.Point(384, 70) + Me.cbxVollmacht.Location = New System.Drawing.Point(418, 71) Me.cbxVollmacht.Name = "cbxVollmacht" Me.cbxVollmacht.Size = New System.Drawing.Size(130, 17) Me.cbxVollmacht.TabIndex = 103 @@ -532,7 +684,7 @@ Partial Class usrcntlFiskaluebersicht ' Me.lblUnterlagen.AutoSize = True Me.lblUnterlagen.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblUnterlagen.Location = New System.Drawing.Point(4, 110) + Me.lblUnterlagen.Location = New System.Drawing.Point(4, 393) Me.lblUnterlagen.Name = "lblUnterlagen" Me.lblUnterlagen.Size = New System.Drawing.Size(98, 20) Me.lblUnterlagen.TabIndex = 113 @@ -553,7 +705,7 @@ Partial Class usrcntlFiskaluebersicht Me.txtVM._Waehrung = False Me.txtVM._WaehrungZeichen = False Me.txtVM.ForeColor = System.Drawing.Color.Black - Me.txtVM.Location = New System.Drawing.Point(540, 68) + Me.txtVM.Location = New System.Drawing.Point(574, 69) Me.txtVM.MaxLength = 10 Me.txtVM.MaxLineLength = -1 Me.txtVM.MaxLines_Warning = "" @@ -568,7 +720,7 @@ Partial Class usrcntlFiskaluebersicht Me.cbxBonitaet.AutoSize = True Me.cbxBonitaet.Enabled = False Me.cbxBonitaet.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxBonitaet.Location = New System.Drawing.Point(384, 47) + Me.cbxBonitaet.Location = New System.Drawing.Point(418, 48) Me.cbxBonitaet.Name = "cbxBonitaet" Me.cbxBonitaet.Size = New System.Drawing.Size(115, 17) Me.cbxBonitaet.TabIndex = 101 @@ -590,7 +742,7 @@ Partial Class usrcntlFiskaluebersicht Me.txtBon._Waehrung = False Me.txtBon._WaehrungZeichen = False Me.txtBon.ForeColor = System.Drawing.Color.Black - Me.txtBon.Location = New System.Drawing.Point(541, 44) + Me.txtBon.Location = New System.Drawing.Point(575, 45) Me.txtBon.MaxLength = 10 Me.txtBon.MaxLineLength = -1 Me.txtBon.MaxLines_Warning = "" @@ -680,7 +832,7 @@ Partial Class usrcntlFiskaluebersicht Me.dgvUnterlagen.AllowUserToResizeRows = False Me.dgvUnterlagen.BackgroundColor = System.Drawing.Color.White Me.dgvUnterlagen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvUnterlagen.Location = New System.Drawing.Point(641, 163) + Me.dgvUnterlagen.Location = New System.Drawing.Point(326, 430) Me.dgvUnterlagen.MultiSelect = False Me.dgvUnterlagen.Name = "dgvUnterlagen" Me.dgvUnterlagen.ReadOnly = True @@ -695,7 +847,7 @@ Partial Class usrcntlFiskaluebersicht Me.cbxUID.AutoSize = True Me.cbxUID.Enabled = False Me.cbxUID.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxUID.Location = New System.Drawing.Point(384, 23) + Me.cbxUID.Location = New System.Drawing.Point(418, 24) Me.cbxUID.Name = "cbxUID" Me.cbxUID.Size = New System.Drawing.Size(141, 17) Me.cbxUID.TabIndex = 105 @@ -717,7 +869,7 @@ Partial Class usrcntlFiskaluebersicht Me.txtUID._Waehrung = False Me.txtUID._WaehrungZeichen = True Me.txtUID.ForeColor = System.Drawing.Color.Black - Me.txtUID.Location = New System.Drawing.Point(539, 23) + Me.txtUID.Location = New System.Drawing.Point(575, 21) Me.txtUID.MaxLineLength = -1 Me.txtUID.MaxLines_Warning = "" Me.txtUID.MaxLines_Warning_Label = Nothing @@ -726,29 +878,143 @@ Partial Class usrcntlFiskaluebersicht Me.txtUID.Size = New System.Drawing.Size(83, 20) Me.txtUID.TabIndex = 106 ' - 'cbxAttachmentArt + 'rtbZwischenh ' - Me.cbxAttachmentArt._allowedValuesFreiText = Nothing - Me.cbxAttachmentArt._allowFreiText = False - Me.cbxAttachmentArt._value = "" - Me.cbxAttachmentArt.FormattingEnabled = True - Me.cbxAttachmentArt.Location = New System.Drawing.Point(8, 163) - Me.cbxAttachmentArt.Name = "cbxAttachmentArt" - Me.cbxAttachmentArt.Size = New System.Drawing.Size(76, 21) - Me.cbxAttachmentArt.TabIndex = 131 + Me.rtbZwischenh.Enabled = False + Me.rtbZwischenh.Location = New System.Drawing.Point(237, 283) + Me.rtbZwischenh.Name = "rtbZwischenh" + Me.rtbZwischenh.Size = New System.Drawing.Size(225, 78) + Me.rtbZwischenh.TabIndex = 176 + Me.rtbZwischenh.Text = "" + Me.rtbZwischenh.Visible = False ' - 'btnAddAttachments + 'dgvZwischenh ' - Me.btnAddAttachments.BackgroundImage = Global.SDL.My.Resources.Resources.plus - Me.btnAddAttachments.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.btnAddAttachments.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnAddAttachments.ForeColor = System.Drawing.Color.Black - Me.btnAddAttachments.Location = New System.Drawing.Point(90, 165) - Me.btnAddAttachments.Name = "btnAddAttachments" - Me.btnAddAttachments.Size = New System.Drawing.Size(29, 19) - Me.btnAddAttachments.TabIndex = 142 - Me.btnAddAttachments.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnAddAttachments.UseVisualStyleBackColor = True + Me.dgvZwischenh.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvZwischenh.AllowUserToAddRows = False + Me.dgvZwischenh.AllowUserToDeleteRows = False + Me.dgvZwischenh.AllowUserToOrderColumns = True + Me.dgvZwischenh.AllowUserToResizeRows = False + Me.dgvZwischenh.BackgroundColor = System.Drawing.Color.White + Me.dgvZwischenh.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvZwischenh.Location = New System.Drawing.Point(237, 260) + Me.dgvZwischenh.MultiSelect = False + Me.dgvZwischenh.Name = "dgvZwischenh" + Me.dgvZwischenh.ReadOnly = True + Me.dgvZwischenh.RowHeadersVisible = False + Me.dgvZwischenh.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvZwischenh.Size = New System.Drawing.Size(225, 92) + Me.dgvZwischenh.TabIndex = 175 + ' + 'Label6 + ' + Me.Label6.AutoSize = True + Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label6.Location = New System.Drawing.Point(233, 237) + Me.Label6.Name = "Label6" + Me.Label6.Size = New System.Drawing.Size(167, 16) + Me.Label6.TabIndex = 174 + Me.Label6.Text = "Top 5 Zwischenhändler" + ' + 'rtfEmpfaenger + ' + Me.rtfEmpfaenger.Enabled = False + Me.rtfEmpfaenger.Location = New System.Drawing.Point(477, 283) + Me.rtfEmpfaenger.Name = "rtfEmpfaenger" + Me.rtfEmpfaenger.Size = New System.Drawing.Size(224, 78) + Me.rtfEmpfaenger.TabIndex = 173 + Me.rtfEmpfaenger.Text = "" + Me.rtfEmpfaenger.Visible = False + ' + 'rtfLieferanten + ' + Me.rtfLieferanten.Enabled = False + Me.rtfLieferanten.Location = New System.Drawing.Point(6, 283) + Me.rtfLieferanten.Name = "rtfLieferanten" + Me.rtfLieferanten.Size = New System.Drawing.Size(215, 78) + Me.rtfLieferanten.TabIndex = 172 + Me.rtfLieferanten.Text = "" + Me.rtfLieferanten.Visible = False + ' + 'dgvEmpfaenger + ' + Me.dgvEmpfaenger.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvEmpfaenger.AllowUserToAddRows = False + Me.dgvEmpfaenger.AllowUserToDeleteRows = False + Me.dgvEmpfaenger.AllowUserToOrderColumns = True + Me.dgvEmpfaenger.AllowUserToResizeRows = False + Me.dgvEmpfaenger.BackgroundColor = System.Drawing.Color.White + Me.dgvEmpfaenger.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvEmpfaenger.Location = New System.Drawing.Point(477, 260) + Me.dgvEmpfaenger.MultiSelect = False + Me.dgvEmpfaenger.Name = "dgvEmpfaenger" + Me.dgvEmpfaenger.ReadOnly = True + Me.dgvEmpfaenger.RowHeadersVisible = False + Me.dgvEmpfaenger.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvEmpfaenger.Size = New System.Drawing.Size(224, 92) + Me.dgvEmpfaenger.TabIndex = 171 + ' + 'dgvLieferanten + ' + Me.dgvLieferanten.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvLieferanten.AllowUserToAddRows = False + Me.dgvLieferanten.AllowUserToDeleteRows = False + Me.dgvLieferanten.AllowUserToOrderColumns = True + Me.dgvLieferanten.AllowUserToResizeRows = False + Me.dgvLieferanten.BackgroundColor = System.Drawing.Color.White + Me.dgvLieferanten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvLieferanten.Location = New System.Drawing.Point(6, 260) + Me.dgvLieferanten.MultiSelect = False + Me.dgvLieferanten.Name = "dgvLieferanten" + Me.dgvLieferanten.ReadOnly = True + Me.dgvLieferanten.RowHeadersVisible = False + Me.dgvLieferanten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvLieferanten.Size = New System.Drawing.Size(215, 92) + Me.dgvLieferanten.TabIndex = 170 + ' + 'Button3 + ' + Me.Button3.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Button3.BackgroundImage = Global.SDL.My.Resources.Resources.spedbuch + Me.Button3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button3.ForeColor = System.Drawing.Color.Black + Me.Button3.Location = New System.Drawing.Point(629, 224) + Me.Button3.Name = "Button3" + Me.Button3.Size = New System.Drawing.Size(35, 33) + Me.Button3.TabIndex = 169 + Me.Button3.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button3.UseVisualStyleBackColor = True + ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label3.Location = New System.Drawing.Point(473, 237) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(126, 16) + Me.Label3.TabIndex = 168 + Me.Label3.Text = "Top 5 Empfänger" + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label2.Location = New System.Drawing.Point(5, 241) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(128, 16) + Me.Label2.TabIndex = 167 + Me.Label2.Text = "Top 5 Lieferanten" + ' + 'lblAnmerkungen + ' + Me.lblAnmerkungen.AutoSize = True + Me.lblAnmerkungen.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblAnmerkungen.Location = New System.Drawing.Point(4, 544) + Me.lblAnmerkungen.Name = "lblAnmerkungen" + Me.lblAnmerkungen.Size = New System.Drawing.Size(120, 20) + Me.lblAnmerkungen.TabIndex = 166 + Me.lblAnmerkungen.Text = "Anmerkungen" ' 'usrcntlFiskaluebersicht ' @@ -765,6 +1031,7 @@ Partial Class usrcntlFiskaluebersicht Me.Controls.Add(Me.MyPanel1) Me.Controls.Add(Me.btn) Me.Controls.Add(Me.dgvFiskaluebersicht) + Me.Controls.Add(Me.lblAbschluss) Me.Controls.Add(Me.MyPanel2) Me.Name = "usrcntlFiskaluebersicht" Me.Size = New System.Drawing.Size(933, 765) @@ -773,11 +1040,12 @@ Partial Class usrcntlFiskaluebersicht CType(Me.dgvFiskaluebersicht, System.ComponentModel.ISupportInitialize).EndInit() Me.MyPanel2.ResumeLayout(False) Me.MyPanel2.PerformLayout() - CType(Me.dgvEmpfaenger, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.dgvLieferanten, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.picEORIOK, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.picOK, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.dgvUnterlagen, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.dgvZwischenh, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.dgvEmpfaenger, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.dgvLieferanten, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -815,18 +1083,35 @@ Partial Class usrcntlFiskaluebersicht Friend WithEvents Button2 As Button Friend WithEvents picLocked As PictureBox Friend WithEvents lblBeurteilung As Label - Friend WithEvents Label3 As Label - Friend WithEvents Label2 As Label - Friend WithEvents lblAnmerkungen As Label - Friend WithEvents RichTextBox1 As RichTextBox - Friend WithEvents Button3 As Button - Friend WithEvents dgvEmpfaenger As VERAG_PROG_ALLGEMEIN.MyDatagridview - Friend WithEvents dgvLieferanten As VERAG_PROG_ALLGEMEIN.MyDatagridview + Friend WithEvents rtbAnmerkung As RichTextBox Friend WithEvents cbxBeurteilung As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents lblAbschluss As Label - Friend WithEvents MyTextBox1 As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents Label5 As Label Friend WithEvents Label4 As Label Friend WithEvents btnAddAttachments As Button Friend WithEvents cbxAttachmentArt As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents txtAnzMA As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label9 As Label + Friend WithEvents txtWaren As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label8 As Label + Friend WithEvents txtGriendungsjahr As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label7 As Label + Friend WithEvents txtGeschaeftszweck As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label5 As Label + Friend WithEvents txtGesellschafter As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label12 As Label + Friend WithEvents txtGF As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label11 As Label + Friend WithEvents Label10 As Label + Friend WithEvents txtKredit As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents rtbZwischenh As RichTextBox + Friend WithEvents dgvZwischenh As VERAG_PROG_ALLGEMEIN.MyDatagridview + Friend WithEvents Label6 As Label + Friend WithEvents rtfEmpfaenger As RichTextBox + Friend WithEvents rtfLieferanten As RichTextBox + Friend WithEvents dgvEmpfaenger As VERAG_PROG_ALLGEMEIN.MyDatagridview + Friend WithEvents dgvLieferanten As VERAG_PROG_ALLGEMEIN.MyDatagridview + Friend WithEvents Button3 As Button + Friend WithEvents Label3 As Label + Friend WithEvents Label2 As Label + Friend WithEvents lblAnmerkungen As Label End Class diff --git a/SDL/kunden/usrcntlFiskaluebersicht.vb b/SDL/kunden/usrcntlFiskaluebersicht.vb index 1efd8ad9..d5a4568e 100644 --- a/SDL/kunden/usrcntlFiskaluebersicht.vb +++ b/SDL/kunden/usrcntlFiskaluebersicht.vb @@ -9,6 +9,7 @@ Imports DocumentFormat.OpenXml.Vml.Spreadsheet Imports DAKOSY_Worker.DEERRE Imports DAKOSY_Worker.VERAG_KundenStamm_Export Imports DAKOSY_Worker.VERAG_KundenStamm_Export_V2 +Imports jdk.internal.org.objectweb.asm.tree Public Class usrcntlFiskaluebersicht @@ -21,7 +22,7 @@ Public Class usrcntlFiskaluebersicht Dim fk As VERAG_PROG_ALLGEMEIN.cFiskalkunden Dim FirmaTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Dim DS As VERAG_PROG_ALLGEMEIN.cDATENSERVER - + Dim BA As VERAG_PROG_ALLGEMEIN.cBonitaetsauskunft Sub initDGVFiskaluebersicht() @@ -39,23 +40,13 @@ Public Class usrcntlFiskaluebersicht End Sub - Sub initdgv(year As Integer) - - Dim WHEREStatistik = "" - WHEREStatistik &= " YEAR(Abfertigungsdatum) = '" & year & "' AND " - - Label3.Text = "Top 5 Empfänger (" & year & ")" - With dgvEmpfaenger - .Columns.Clear() - .DataSource() = SQL.loadDgvBySql("SELECT Top(5) [EmpfängerKundenNr] as KdNr, CASE WHEN [EmpfängerKundenNr] IS NULL THEN '-' ELSE MAX(Empfänger) END as Firma, COUNT(*) as Anzahl FROM [Speditionsbuch] WHERE " & WHEREStatistik & " " & kdNr & " IN([AbsenderKundenNr],[EmpfängerKundenNr],[FrachtführerKundenNr],[VermittlerKundenNr],[EndempfängerKundenNr]) GROUP BY EmpfängerKundenNr ORDER BY Anzahl DESC ", "FMZOLL") - - - End With + Sub initdgvLieferanten(year As Integer) Label2.Text = "Top 5 Lieferanten (" & year & ")" With dgvLieferanten .Columns.Clear() - .DataSource() = SQL.loadDgvBySql("SELECT Top(5) [AbsenderKundenNr] as KdNr, CASE WHEN [AbsenderKundenNr] IS NULL THEN '-' ELSE MAX(Absender) END as Firma, COUNT(*) as Anzahl FROM [Speditionsbuch] WHERE " & WHEREStatistik & " " & kdNr & " IN([AbsenderKundenNr],[EmpfängerKundenNr],[FrachtführerKundenNr],[VermittlerKundenNr],[EndempfängerKundenNr]) GROUP BY AbsenderKundenNr ORDER BY Anzahl DESC ", "FMZOLL") + .DataSource() = SQL.loadDgvBySql("SELECT Top(5) [AbsenderKundenNr] as KdNr, CASE WHEN [AbsenderKundenNr] IS NULL THEN '-' ELSE MAX(Absender) END as Firma, COUNT(*) as Anzahl FROM [Speditionsbuch] WHERE year(Abfertigungsdatum) = '" & year & "' AND " & kdNr & " In([AbsenderKundenNr], [EmpfängerKundenNr], [FrachtführerKundenNr], [VermittlerKundenNr], [EndempfängerKundenNr]) GROUP BY AbsenderKundenNr ORDER BY Anzahl DESC ", "FMZOLL") + .Columns("KdNr").Width = 50 End With @@ -63,6 +54,28 @@ Public Class usrcntlFiskaluebersicht End Sub + Sub initdgvEmfpaenger(year As Integer) + + Label3.Text = "Top 5 Endempfänger (" & year & ")" + With dgvEmpfaenger + .Columns.Clear() + .DataSource() = SQL.loadDgvBySql("SELECT Top(5) [EndempfängerKundenNr] as KdNr, CASE WHEN [EndempfängerKundenNr] IS NULL THEN '-' ELSE MAX(Endempfänger) END as Firma, COUNT(*) as Anzahl FROM [Speditionsbuch] WHERE year(Abfertigungsdatum) = '" & year & "' AND " & kdNr & " IN([AbsenderKundenNr],[EmpfängerKundenNr],[FrachtführerKundenNr],[VermittlerKundenNr],[EndempfängerKundenNr]) GROUP BY EndempfängerKundenNr ORDER BY Anzahl DESC ", "FMZOLL") + .Columns("KdNr").Width = 50 + End With + + End Sub + + Sub initdgvZwischenhaendler(year As Integer) + + Label6.Text = "Top 5 Zwischenhändler (" & year & ")" + With dgvZwischenh + .Columns.Clear() + .DataSource() = SQL.loadDgvBySql("SELECT Top(5) [EmpfängerKundenNr] as KdNr, CASE WHEN [EmpfängerKundenNr] IS NULL THEN '-' ELSE MAX(Empfänger) END as Firma, COUNT(*) as Anzahl FROM [Speditionsbuch] WHERE year(Abfertigungsdatum) = '" & year & "' AND " & kdNr & " IN([AbsenderKundenNr],[EmpfängerKundenNr],[FrachtführerKundenNr],[VermittlerKundenNr],[EndempfängerKundenNr]) GROUP BY EmpfängerKundenNr ORDER BY Anzahl DESC ", "FMZOLL") + .Columns("KdNr").Width = 50 + End With + + End Sub + @@ -105,6 +118,7 @@ Public Class usrcntlFiskaluebersicht Sub init(_kdnr As Integer) + cbxFiskalart.Items.Clear() cbxFiskalart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AT", "AT")) cbxFiskalart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DE", "DE")) @@ -120,6 +134,7 @@ Public Class usrcntlFiskaluebersicht kdNr = _kdnr KUNDE = New VERAG_PROG_ALLGEMEIN.cKunde(kdNr) ADRESSE = New VERAG_PROG_ALLGEMEIN.cAdressen(kdNr) + BA = VERAG_PROG_ALLGEMEIN.cBonitaetsauskunft.LOADByKdNrWithingDate(kdNr, Today().AddDays(-365)) lblUnterlagen.Text = "Unterlagen" initDGVFiskaluebersicht() @@ -153,7 +168,7 @@ Public Class usrcntlFiskaluebersicht End Sub - Private Function checkDateIsValid(ByRef checkDate As Date, ByVal hint As String) As Boolean + Private Function checkDateIsValid(ByRef checkDate As Date, ByRef hint As String) As Boolean If Not IsDate(checkDate) Then hint = checkDate & " ist kein Datumswert" @@ -162,10 +177,10 @@ Public Class usrcntlFiskaluebersicht For Each row As DataGridViewRow In dgvFiskaluebersicht.Rows If Not IsDBNull(row.Cells("FK_Datum").Value) Then - 'If row.Cells("FK_Datum").Value = Name Then - ' hint = "Es existiert bereits ein Eintrag mit " & checkDate - ' Return False - 'End If + If CDate(row.Cells("FK_Datum").Value) = CDate(checkDate) Then + hint = "Es existiert bereits ein Eintrag mit " & checkDate + Return False + End If End If Next @@ -187,15 +202,21 @@ Public Class usrcntlFiskaluebersicht fk.FK_Abschlussdatum = Now() fk.FK_MaId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID fk.SAVE() + btnOK.Enabled = False + btnSave.Enabled = False End If - btnOK.Enabled = False - btnSave.Enabled = False + End If End Sub Private Sub btnSave_Click(sender As Object, e As EventArgs) Handles btnSave.Click getFields() - fk.SAVE() + If fk.SAVE() Then + btnSave.Enabled = False + Else + btnSave.Enabled = True + End If + End Sub @@ -204,9 +225,6 @@ Public Class usrcntlFiskaluebersicht fk = New cFiskalkunden(dgvFiskaluebersicht.SelectedRows(0).Cells("FK_Id").Value) - If checkNullStr(fk.FK_Datum) <> "" Then - initdgv(CDate(fk.FK_Datum).Year) - End If Dim locked As Boolean = IIf(fk.FK_locked Is Nothing, False, fk.FK_locked) setFields() @@ -216,17 +234,12 @@ Public Class usrcntlFiskaluebersicht btnSave.Enabled = Not locked setUIenabled(locked) Button4.Enabled = True - If locked Then - Dim mit = New VERAG_PROG_ALLGEMEIN.cMitarbeiter(fk.FK_MaId) - lblAbschluss.Text = mit.Fullname & " " & fk.FK_Abschlussdatum - - Else - lblAbschluss.Text = "" - End If + setAbschlusstxt(locked) Else Button4.Enabled = False clearTXT() End If + BA = VERAG_PROG_ALLGEMEIN.cBonitaetsauskunft.LOADByKdNrWithingDate(kdNr, Today().AddDays(-365)) End Sub @@ -239,7 +252,44 @@ Public Class usrcntlFiskaluebersicht txtVM.Text = checkNullStr(fk.FK_Vollmacht) txtEORI.Text = checkNullStr(fk.FK_EORI) txtUID.Text = checkNullStr(fk.FK_UID) - RichTextBox1.Text = checkNullStr(fk.FK_Anmerkung) + rtbAnmerkung.Text = checkNullStr(fk.FK_Anmerkung) + rtfLieferanten.Text = checkNullStr(fk.FK_Lieferanten) + rtfEmpfaenger.Text = checkNullStr(fk.FK_Empfaenger) + txtGriendungsjahr.Text = checkNullStr(fk.FK_Gruendungsdatum) + txtGeschaeftszweck.Text = checkNullStr(fk.FK_Geschaeftszweck) + txtKredit.Text = checkNullStr(fk.FK_KreditMax) + txtWaren.Text = checkNullStr(fk.FK_Waren) + txtAnzMA.Text = checkNullStr(fk.FK_AnzahlMitarbeiter) + txtGF.Text = checkNullStr(fk.FK_Geschaeftsfuehrer) + txtGesellschafter.Text = checkNullStr(fk.FK_Gesellschafter) + + If txtGriendungsjahr.Text = "" Then + txtGriendungsjahr.Text = BA.ba_GruendundsDatum + End If + + If txtKredit.Text = "" Then + txtKredit.Text = BA.ba_Hoechstkredit + End If + + + If txtGF.Text = "" Then + txtGF.Text = BA.ba_GFName + End If + + If txtGeschaeftszweck.Text = "" Then + txtGeschaeftszweck.Text = BA.ba_Geschaeftszweck + End If + + If txtAnzMA.Text = "" Then + txtAnzMA.Text = BA.ba_Mitarbeiter + End If + + If txtGesellschafter.Text = "" Then + txtGesellschafter.Text = BA.ba_GFName + End If + + + If txtBon.Text = "" And KUNDE.Bonitätsdatum IsNot Nothing AndAlso IsDate(KUNDE.Bonitätsdatum) Then txtBon.Text = CDate(KUNDE.Bonitätsdatum).ToShortDateString @@ -310,6 +360,35 @@ Public Class usrcntlFiskaluebersicht End If + If rtfEmpfaenger.Text = "" Then + rtfEmpfaenger.Visible = False + + If checkNullStr(fk.FK_Datum) <> "" Then + initdgvEmfpaenger(CDate(fk.FK_Datum).Year) + End If + Else + rtfEmpfaenger.Visible = True + + End If + + If rtfLieferanten.Text = "" Then + rtfLieferanten.Visible = False + If checkNullStr(fk.FK_Datum) <> "" Then + initdgvLieferanten(CDate(fk.FK_Datum).Year) + End If + Else + rtfLieferanten.Visible = True + End If + + + If rtbZwischenh.Text = "" Then + rtbZwischenh.Visible = False + If checkNullStr(fk.FK_Datum) <> "" Then + initdgvZwischenhaendler(CDate(fk.FK_Datum).Year) + End If + Else + rtbZwischenh.Visible = True + End If End Sub @@ -321,7 +400,64 @@ Public Class usrcntlFiskaluebersicht fk.FK_Vollmacht = txtVM.Text fk.FK_UID = txtUID.Text fk.FK_EORI = txtEORI.Text - fk.FK_Anmerkung = RichTextBox1.Text + fk.FK_Anmerkung = rtbAnmerkung.Text + fk.FK_KreditMax = CDbl(txtKredit.Text) + fk.FK_Geschaeftsfuehrer = txtGF.Text + fk.FK_Geschaeftszweck = txtGeschaeftszweck.Text + fk.FK_AnzahlMitarbeiter = txtAnzMA.Text + fk.FK_Gesellschafter = txtGesellschafter.Text + fk.FK_Gruendungsdatum = txtGriendungsjahr.Text + + + + + If checkNullStr(fk.FK_Empfaenger) = "" Then + Dim txtEmpfaenger As String + For Each row As DataGridViewRow In dgvEmpfaenger.Rows + For i As Integer = 0 To row.Cells.Count - 1 + txtEmpfaenger &= row.Cells(i).Value.ToString & ", " + Next + fk.FK_Empfaenger &= txtEmpfaenger + If row.Index < dgvEmpfaenger.Rows.Count Then + fk.FK_Empfaenger &= vbNewLine + End If + + Next + End If + + + + If checkNullStr(fk.FK_Lieferanten) = "" Then + Dim txtLieferanten As String + For Each row As DataGridViewRow In dgvLieferanten.Rows + For i As Integer = 0 To row.Cells.Count - 1 + txtLieferanten &= row.Cells(i).Value.ToString & ", " + Next + fk.FK_Lieferanten &= txtLieferanten + If row.Index < dgvLieferanten.Rows.Count Then + fk.FK_Lieferanten &= vbNewLine + End If + + Next + End If + + If checkNullStr(fk.FK_Zwischenhaendler) = "" Then + Dim txtZwischenhaendler As String + For Each row As DataGridViewRow In dgvZwischenh.Rows + For i As Integer = 0 To row.Cells.Count - 1 + txtZwischenhaendler &= row.Cells(i).Value.ToString & ", " + Next + fk.FK_Zwischenhaendler &= txtZwischenhaendler + If row.Index < dgvZwischenh.Rows.Count Then + fk.FK_Zwischenhaendler &= vbNewLine + End If + + Next + End If + + + + End Sub Private Sub txtBon_TextChanged(sender As Object, e As EventArgs) Handles txtBon.TextChanged @@ -475,6 +611,7 @@ Public Class usrcntlFiskaluebersicht If dgvFiskaluebersicht.SelectedRows.Count > 0 Then If fk.FK_locked Then MsgBox("Fiskalübersicht ist bereits abgeschlossen und kann nicht gelöscht werden!") + Exit Sub End If If vbYes = MsgBox("Möchten Sie die Fiskalübersicht vom " & dgvFiskaluebersicht.SelectedRows(0).Cells("fk_datum").Value & " wirklich löschen?", vbYesNo) Then fk.deleteEntry(fk.FK_Id) @@ -583,7 +720,7 @@ Public Class usrcntlFiskaluebersicht End Sub - Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click + Private Sub Button3_Click(sender As Object, e As EventArgs) If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Speditionsbuch", "AVISO") Then For Each ft As Form In Application.OpenForms @@ -606,4 +743,30 @@ Public Class usrcntlFiskaluebersicht Private Sub cbxAttachmentArt_SelectedValueChanged(sender As Object, e As EventArgs) Handles cbxAttachmentArt.SelectedValueChanged btnAddAttachments.Enabled = cbxAttachmentArt._value <> "" End Sub + + Private Sub setAbschlusstxt(locked As Boolean) + + If locked Then + Dim mit = New VERAG_PROG_ALLGEMEIN.cMitarbeiter(fk.FK_MaId) + lblAbschluss.Text = mit.Fullname & " " & fk.FK_Abschlussdatum + + Else + lblAbschluss.Text = "" + End If + End Sub + + Private Sub panelChanged() + + For Each c As Control In MyPanel1.Controls + If TypeOf (c) Is CheckBox Then + AddHandler CType(c, CheckBox).CheckedChanged, AddressOf SomethingChanged + ElseIf TypeOf (c) Is TextBox Then + AddHandler CType(c, TextBox).TextChanged, AddressOf SomethingChanged + End If + Next + End Sub + + Private Sub somethingChanged() + + End Sub End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cBonitaetsauskunft.vb b/VERAG_PROG_ALLGEMEIN/Classes/cBonitaetsauskunft.vb index 1952efb2..c640a7c0 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cBonitaetsauskunft.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cBonitaetsauskunft.vb @@ -30,6 +30,8 @@ Public Class cBonitaetsauskunft Property ba_CreditSaveBonitaetsIndex As Object = Nothing Property ba_Pruefungstool As Object = Nothing Property ba_datenarchivId As Object = Nothing + Property ba_Geschaeftszweck As Object = Nothing + Property ba_GSName As Object = Nothing Dim SQL As New SQL @@ -71,6 +73,8 @@ Public Class cBonitaetsauskunft list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ba_CreditSaveBonitaetsScore", ba_CreditSaveBonitaetsScore)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ba_CreditSaveBonitaetsIndex", ba_CreditSaveBonitaetsIndex)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ba_datenarchivId", ba_datenarchivId)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ba_Geschaeftszweck", ba_Geschaeftszweck)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ba_GSName", ba_GSName)) Return list End Function @@ -91,7 +95,7 @@ Public Class cBonitaetsauskunft End Function Public Shared Function LOADByKdNrDate(ba_KundenNr As Integer, ba_Datum As Date) As cBonitaetsauskunft - Try + Try Dim BONI As New cBonitaetsauskunft Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() Using cmd As New SqlCommand("SELECT * FROM tblBonitaetsauskunft WHERE ba_KundenNr=@ba_KundenNr AND cast(ba_Datum as date)=@ba_Datum ", conn) @@ -121,6 +125,39 @@ Public Class cBonitaetsauskunft Return Nothing End Function + + Public Shared Function LOADByKdNrWithingDate(ba_KundenNr As Integer, ba_Datum As Date) As cBonitaetsauskunft + Try + Dim BONI As New cBonitaetsauskunft + Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() + Using cmd As New SqlCommand("SELECT Top(1) * FROM tblBonitaetsauskunft WHERE ba_KundenNr=@ba_KundenNr AND cast(ba_Datum as date) >= @ba_Datum order by ba_Datum desc ", conn) + cmd.Parameters.AddWithValue("@ba_KundenNr", ba_KundenNr) + cmd.Parameters.AddWithValue("@ba_Datum", ba_Datum.ToShortDateString) + Dim dr = cmd.ExecuteReader() + If dr.Read Then + For Each li In BONI.getParameterList() + Dim propInfo As PropertyInfo = BONI.GetType.GetProperty(li.Scalarvariable) + + If dr.Item(li.Text) Is DBNull.Value Then + propInfo.SetValue(BONI, Nothing) + Else + propInfo.SetValue(BONI, dr.Item(li.Text)) + End If + + Next + dr.Close() + Return BONI + End If + dr.Close() + End Using + End Using + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + Return Nothing + End Function + + Public Sub LOAD() Try Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cFiskalkunden.vb b/VERAG_PROG_ALLGEMEIN/Classes/cFiskalkunden.vb index 8966904e..74f4a885 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cFiskalkunden.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cFiskalkunden.vb @@ -19,6 +19,21 @@ Public Class cFiskalkunden Property FK_MaId As Object = Nothing Property FK_Abschlussdatum As Object = Nothing Property FK_Anmerkung As Object = Nothing + Property FK_Lieferanten As Object = Nothing + Property FK_Empfaenger As Object = Nothing + Property FK_Zwischenhaendler As Object = Nothing + Property FK_Waren As Object = Nothing + Property FK_Gruendungsdatum As Object = Nothing + Property FK_AnzahlMitarbeiter As Object = Nothing + Property FK_Geschaeftszweck As Object = Nothing + Property FK_KreditMax As Object = Nothing + Property FK_Geschaeftsfuehrer As Object = Nothing + Property FK_Gesellschafter As Object = Nothing + + + + + Public hasEntry = False @@ -51,6 +66,16 @@ Public Class cFiskalkunden list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Anmerkung", FK_Anmerkung)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Abschlussdatum", FK_Abschlussdatum)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_MaId", FK_MaId)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Lieferanten", FK_Lieferanten)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Empfaenger", FK_Empfaenger)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Zwischenhaendler", FK_Zwischenhaendler)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Waren", FK_Waren)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Gruendungsdatum", FK_Gruendungsdatum)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_AnzahlMitarbeiter", FK_MaId)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Geschaeftszweck", FK_Lieferanten)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_KreditMax", FK_Empfaenger)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Geschaeftsfuehrer", FK_Zwischenhaendler)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Gesellschafter", FK_Waren)) Return list End Function diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cCreditSafeAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cCreditSafeAPI.vb index b5ae37f5..af81c4c4 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cCreditSafeAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cCreditSafeAPI.vb @@ -301,6 +301,7 @@ Public Class cCreditSafeAPI Dim companyAddInformObj As Chilkat.JsonObject = reportObj.ObjectOf("additionalInformation") If (reportObj.LastMethodSuccess = True) Then Dim companyMiscObj As Chilkat.JsonObject = companyAddInformObj.ObjectOf("misc") + company.csBusinessPurpose = companyMiscObj.StringOf("businessPurpose") If (companyAddInformObj.LastMethodSuccess = True) Then Dim deCurrentRatingObj As Chilkat.JsonObject = companyMiscObj.ObjectOf("deCurrentRating") If (companyAddInformObj.LastMethodSuccess = True) Then @@ -330,6 +331,15 @@ Public Class cCreditSafeAPI company.csDFoundingDate = dateTime.GetAsTimestamp(getAsLocal) Debug.WriteLine(dateTime) + + Dim principalActivityObj As Chilkat.JsonObject = basicInfoObj.ObjectOf("principalActivity") + If (basicInfoObj.LastMethodSuccess = True) And company.csBusinessPurpose = "" Then + company.csBusinessPurpose = principalActivityObj.StringOf("industrySector") & " - " & principalActivityObj.StringOf("description") + Else + Debug.WriteLine("principalActivityObj object not found.") + End If + + Else Debug.WriteLine("basicInfoObj object not found.") @@ -339,10 +349,28 @@ Public Class cCreditSafeAPI Debug.WriteLine("companyIDObj object not found.") End If - + Dim otherInformationObject As Chilkat.JsonObject = reportObj.ObjectOf("otherInformation") Dim creditScoreObj As Chilkat.JsonObject = reportObj.ObjectOf("creditScore") + If (reportObj.LastMethodSuccess = True) Then + Dim employeesInformationsArray As Chilkat.JsonArray = otherInformationObject.ArrayOf("employeesInformation") + If (otherInformationObject.LastMethodSuccess = True) Then + Dim employees As Chilkat.JsonObject = employeesInformationsArray.ObjectAt(0) + company.csSumEmployees = employees.StringOf("numberOfEmployees") + Else + Debug.WriteLine("otherInformationObject object not found.") + End If + + Dim bankersArray As Chilkat.JsonArray = otherInformationObject.ArrayOf("bankers") + If (otherInformationObject.LastMethodSuccess = True) Then + Dim bankers As Chilkat.JsonObject = bankersArray.ObjectAt(0) + company.csBank = bankers.StringOf("name") & " - " & bankers.StringOf("bankCode") + Else + Debug.WriteLine("otherInformationObject object not found.") + End If + + Dim creditRatingObj As Chilkat.JsonObject = creditScoreObj.ObjectOf("currentCreditRating") If (creditScoreObj.LastMethodSuccess = True) Then @@ -503,10 +531,16 @@ Public Class cCreditSafeAPI Public Property csDFoundingDate As Date Public Property csPDF As String Public Property csFailure As String + Public Property csSumEmployees As String + Public Property csBusinessPurpose As String + Public Property csShareholder As String + Public Property csCEO As String + + Public Property csBank As String - Public Sub New(_name As String, _vatNo As String, _country As String, _creditsafeNo As String, _creditSafeId As String, _lastChecked As Date, _street As String, _postalCode As String, _city As String) + Public Sub New(_name As String, _vatNo As String, _country As String, _creditsafeNo As String, _creditSafeId As String, _lastChecked As Date, _street As String, _postalCode As String, _city As String, _sumEmployees As String, _businessPurpose As String, _shareholder As String, _ceo As String, _bank As String) creditSafeId = _creditSafeId name = _name vatNo = _vatNo @@ -516,6 +550,11 @@ Public Class cCreditSafeAPI Street = _street Postalcode = _postalCode City = _city + csSumEmployees = _sumEmployees + csBusinessPurpose = _businessPurpose + csShareholder = _shareholder + csCEO = _ceo + csBank = _bank End Sub Public Sub New()