From f0d772910093a0c83822ee45d1da41473a916360 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 6 Feb 2024 11:09:03 +0100 Subject: [PATCH] Timas, MDM Datenverarbeitung (Asfinag), UID-Nr bei Creditsafe --- SDL/My Project/AssemblyInfo.vb | 4 +- SDL/SDL.vbproj | 19 +- SDL/buchhaltung/usrCntlBH.Designer.vb | 826 +++++++++++------- SDL/buchhaltung/usrCntlBH.vb | 63 ++ SDL/kunden/usrCntlKundenuebersicht.vb | 10 + SDL/mdm/frmMDMDatenverarbetiung.vb | 6 +- .../Classes/cBonitaetsauskunft.vb | 2 + VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb | 3 + .../Creditsafe/cCreditSafeAPI.vb | 2 - .../Schnittstellen/TIMAS/cTimasAPI.vb | 2 +- .../VERAG_PROG_ALLGEMEIN.vbproj | 82 +- 11 files changed, 633 insertions(+), 386 deletions(-) diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index c5de8cfe..1c26304e 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index d3574fee..81980c95 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -94,7 +94,7 @@ false - SDL_1_TemporaryKey.pfx + AL20210908.pfx @@ -102,8 +102,9 @@ False C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\BouncyCastle.Crypto.dll - - ..\packages\ClosedXML.0.95.4\lib\net46\ClosedXML.dll + + False + F:\PROGRAMMIERUNG\dll\closedxml\ClosedXML.dll ..\..\..\AVISO\Aviso\packages\esendex-dotnet-sdk.3.8.0\lib\net35\com.esendex.sdk.dll @@ -115,15 +116,16 @@ False ..\..\..\dll\SharpSSH\DiffieHellman.dll - - ..\..\..\AVISO\Aviso\packages\DocumentFormat.OpenXml.2.7.2\lib\net46\DocumentFormat.OpenXml.dll + + False + F:\PROGRAMMIERUNG\dll\documentformat.openxml(1).dll ..\..\..\AVISO\Aviso\packages\ExcelNumberFormat.1.0.10\lib\net20\ExcelNumberFormat.dll False - ..\..\..\dll\Ghostscript.NET.dll + F:\PROGRAMMIERUNG\dll\Ghostscript.NET.dll ..\..\..\..\RKSV DE\Gma.QrCodeNet.Encoding.dll @@ -3184,7 +3186,6 @@ usrCntlSDLLeistungVERAGCardNEU.vb - frmATR.vb @@ -4279,6 +4280,7 @@ + Always @@ -4291,8 +4293,6 @@ - - Reference.map @@ -4453,7 +4453,6 @@ Always - Always diff --git a/SDL/buchhaltung/usrCntlBH.Designer.vb b/SDL/buchhaltung/usrCntlBH.Designer.vb index ca1173bc..0b2a7740 100644 --- a/SDL/buchhaltung/usrCntlBH.Designer.vb +++ b/SDL/buchhaltung/usrCntlBH.Designer.vb @@ -25,6 +25,11 @@ 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.Label34 = New System.Windows.Forms.Label() + Me.GroupBox8 = New System.Windows.Forms.GroupBox() + Me.Label36 = New System.Windows.Forms.Label() + Me.Button8 = New System.Windows.Forms.Button() + Me.Label35 = New System.Windows.Forms.Label() Me.Label32 = New System.Windows.Forms.Label() Me.GroupBox7 = New System.Windows.Forms.GroupBox() Me.Label33 = New System.Windows.Forms.Label() @@ -62,39 +67,26 @@ Partial Class usrCntlBH Me.cbx2JahreUmsatz = New System.Windows.Forms.CheckBox() Me.cbxSDLLeistungenSperre = New System.Windows.Forms.CheckBox() Me.Label23 = New System.Windows.Forms.Label() - Me.MyListBox1 = New VERAG_PROG_ALLGEMEIN.MyListBox() - Me.cboSort = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label22 = New System.Windows.Forms.Label() Me.cbxHideZeroValues = New System.Windows.Forms.CheckBox() Me.cbxFormatNumbers = New System.Windows.Forms.CheckBox() Me.Panel3 = New System.Windows.Forms.Panel() - Me.txtBagatellgrenzeBei = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label19 = New System.Windows.Forms.Label() Me.cbxBagatellgrenze = New System.Windows.Forms.CheckBox() - Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Panel2 = New System.Windows.Forms.Panel() Me.Label21 = New System.Windows.Forms.Label() Me.Label20 = New System.Windows.Forms.Label() Me.Label18 = New System.Windows.Forms.Label() - Me.txtOPUmsatzBetragBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtOPUmsatzBetragVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label16 = New System.Windows.Forms.Label() - Me.txtOPUmsatzBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtOPUmsatzVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label15 = New System.Windows.Forms.Label() Me.cbxOPUmsatz = New System.Windows.Forms.CheckBox() Me.Label10 = New System.Windows.Forms.Label() Me.Label14 = New System.Windows.Forms.Label() - Me.txtOPRisikoBetragBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Button3 = New System.Windows.Forms.Button() - Me.txtOPRisikoBetragVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label13 = New System.Windows.Forms.Label() Me.Label12 = New System.Windows.Forms.Label() - Me.txtOPKdNrBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtOPKdNrVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label11 = New System.Windows.Forms.Label() Me.Label9 = New System.Windows.Forms.Label() - Me.txtOPKdName = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label8 = New System.Windows.Forms.Label() Me.Button2 = New System.Windows.Forms.Button() Me.tbcntr = New System.Windows.Forms.TabControl() @@ -105,14 +97,33 @@ 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.Label34 = New System.Windows.Forms.Label() - Me.GroupBox8 = New System.Windows.Forms.GroupBox() - Me.Label35 = New System.Windows.Forms.Label() - Me.Button8 = New System.Windows.Forms.Button() + Me.Label37 = New System.Windows.Forms.Label() + Me.GroupBox9 = New System.Windows.Forms.GroupBox() + Me.Label38 = New System.Windows.Forms.Label() + Me.Button9 = New System.Windows.Forms.Button() + Me.Label39 = New System.Windows.Forms.Label() + Me.Label40 = New System.Windows.Forms.Label() + Me.Button10 = New System.Windows.Forms.Button() + Me.Label41 = New System.Windows.Forms.Label() + Me.Button11 = New System.Windows.Forms.Button() + Me.txtStichtag = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.cboAbfVerbFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.Label36 = New System.Windows.Forms.Label() + Me.MyListBox1 = New VERAG_PROG_ALLGEMEIN.MyListBox() + Me.cboSort = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.txtBagatellgrenzeBei = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.txtOPUmsatzBetragBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtOPUmsatzBetragVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtOPUmsatzBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtOPUmsatzVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtOPRisikoBetragBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtOPRisikoBetragVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtOPKdNrBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtOPKdNrVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtOPKdName = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.pnl.SuspendLayout() Me.TabPage1.SuspendLayout() + Me.GroupBox8.SuspendLayout() Me.GroupBox7.SuspendLayout() Me.GroupBox5.SuspendLayout() Me.GroupBox1.SuspendLayout() @@ -125,7 +136,7 @@ Partial Class usrCntlBH Me.tbcntr.SuspendLayout() Me.TabPage5.SuspendLayout() Me.GroupBox6.SuspendLayout() - Me.GroupBox8.SuspendLayout() + Me.GroupBox9.SuspendLayout() Me.SuspendLayout() ' 'Label6 @@ -150,6 +161,8 @@ Partial Class usrCntlBH ' 'TabPage1 ' + Me.TabPage1.Controls.Add(Me.Label37) + Me.TabPage1.Controls.Add(Me.GroupBox9) Me.TabPage1.Controls.Add(Me.Label34) Me.TabPage1.Controls.Add(Me.GroupBox8) Me.TabPage1.Controls.Add(Me.Label32) @@ -167,11 +180,64 @@ 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, 952) + Me.TabPage1.Size = New System.Drawing.Size(956, 1010) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Allgemein" Me.TabPage1.UseVisualStyleBackColor = True ' + 'Label34 + ' + 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, 907) + Me.Label34.Name = "Label34" + Me.Label34.Size = New System.Drawing.Size(298, 18) + Me.Label34.TabIndex = 14 + Me.Label34.Text = "Abfertigungsverbot" + ' + 'GroupBox8 + ' + Me.GroupBox8.Controls.Add(Me.Label36) + 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, 919) + Me.GroupBox8.Name = "GroupBox8" + Me.GroupBox8.Size = New System.Drawing.Size(847, 69) + Me.GroupBox8.TabIndex = 15 + Me.GroupBox8.TabStop = False + ' + 'Label36 + ' + Me.Label36.AutoSize = True + Me.Label36.Location = New System.Drawing.Point(462, 30) + Me.Label36.Name = "Label36" + Me.Label36.Size = New System.Drawing.Size(35, 13) + Me.Label36.TabIndex = 30 + Me.Label36.Text = "Firma:" + ' + 'Button8 + ' + Me.Button8.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center + Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button8.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button8.Image = Global.SDL.My.Resources.Resources.Excel_logo + Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button8.Location = New System.Drawing.Point(4, 21) + Me.Button8.Name = "Button8" + Me.Button8.Size = New System.Drawing.Size(121, 31) + Me.Button8.TabIndex = 8 + Me.Button8.Text = " Excel" + Me.Button8.UseVisualStyleBackColor = True + ' + 'Label35 + ' + Me.Label35.Location = New System.Drawing.Point(145, 30) + Me.Label35.Name = "Label35" + Me.Label35.Size = New System.Drawing.Size(327, 17) + Me.Label35.TabIndex = 3 + Me.Label35.Text = "Liefert eine Liste der Kunden mit Abfertigungsverbot." + ' 'Label32 ' Me.Label32.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -238,7 +304,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(13, 745) + Me.Label27.Location = New System.Drawing.Point(11, 816) Me.Label27.Name = "Label27" Me.Label27.Size = New System.Drawing.Size(101, 17) Me.Label27.TabIndex = 11 @@ -248,7 +314,7 @@ Partial Class usrCntlBH ' Me.GroupBox5.Controls.Add(Me.Label26) Me.GroupBox5.Controls.Add(Me.Button5) - Me.GroupBox5.Location = New System.Drawing.Point(12, 757) + Me.GroupBox5.Location = New System.Drawing.Point(10, 828) Me.GroupBox5.Name = "GroupBox5" Me.GroupBox5.Size = New System.Drawing.Size(847, 61) Me.GroupBox5.TabIndex = 10 @@ -366,7 +432,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(13, 659) + Me.Label24.Location = New System.Drawing.Point(11, 730) Me.Label24.Name = "Label24" Me.Label24.Size = New System.Drawing.Size(150, 17) Me.Label24.TabIndex = 8 @@ -418,7 +484,7 @@ Partial Class usrCntlBH ' Me.GroupBox4.Controls.Add(Me.Label25) Me.GroupBox4.Controls.Add(Me.Button4) - Me.GroupBox4.Location = New System.Drawing.Point(12, 670) + Me.GroupBox4.Location = New System.Drawing.Point(10, 741) Me.GroupBox4.Name = "GroupBox4" Me.GroupBox4.Size = New System.Drawing.Size(847, 61) Me.GroupBox4.TabIndex = 9 @@ -613,27 +679,6 @@ Partial Class usrCntlBH Me.Label23.TabIndex = 23 Me.Label23.Text = "Firmen (Debitoren):" ' - 'MyListBox1 - ' - Me.MyListBox1._value = "" - Me.MyListBox1.FormattingEnabled = True - Me.MyListBox1.Location = New System.Drawing.Point(699, 55) - Me.MyListBox1.Name = "MyListBox1" - Me.MyListBox1.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple - Me.MyListBox1.Size = New System.Drawing.Size(142, 212) - Me.MyListBox1.TabIndex = 7 - ' - 'cboSort - ' - Me.cboSort._allowedValuesFreiText = Nothing - Me.cboSort._allowFreiText = False - Me.cboSort._value = "" - Me.cboSort.FormattingEnabled = True - Me.cboSort.Location = New System.Drawing.Point(207, 205) - Me.cboSort.Name = "cboSort" - Me.cboSort.Size = New System.Drawing.Size(132, 21) - Me.cboSort.TabIndex = 22 - ' 'Label22 ' Me.Label22.AutoSize = True @@ -678,30 +723,6 @@ Partial Class usrCntlBH Me.Panel3.Size = New System.Drawing.Size(133, 50) Me.Panel3.TabIndex = 17 ' - 'txtBagatellgrenzeBei - ' - Me.txtBagatellgrenzeBei._DateTimeOnly = False - Me.txtBagatellgrenzeBei._numbersOnly = False - Me.txtBagatellgrenzeBei._numbersOnlyKommastellen = "" - Me.txtBagatellgrenzeBei._Prozent = False - Me.txtBagatellgrenzeBei._ShortDateNew = True - Me.txtBagatellgrenzeBei._ShortDateOnly = False - Me.txtBagatellgrenzeBei._TimeOnly = False - Me.txtBagatellgrenzeBei._value = "" - Me.txtBagatellgrenzeBei._Waehrung = True - Me.txtBagatellgrenzeBei._WaehrungZeichen = True - Me.txtBagatellgrenzeBei.Enabled = False - Me.txtBagatellgrenzeBei.ForeColor = System.Drawing.Color.Black - Me.txtBagatellgrenzeBei.Location = New System.Drawing.Point(38, 25) - Me.txtBagatellgrenzeBei.MaxLength = 10 - Me.txtBagatellgrenzeBei.MaxLineLength = -1 - Me.txtBagatellgrenzeBei.MaxLines_Warning = "" - Me.txtBagatellgrenzeBei.MaxLines_Warning_Label = Nothing - Me.txtBagatellgrenzeBei.Name = "txtBagatellgrenzeBei" - Me.txtBagatellgrenzeBei.Size = New System.Drawing.Size(79, 20) - Me.txtBagatellgrenzeBei.TabIndex = 1 - Me.txtBagatellgrenzeBei.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' 'Label19 ' Me.Label19.AutoSize = True @@ -722,17 +743,6 @@ Partial Class usrCntlBH Me.cbxBagatellgrenze.Text = "Bagatellgrenze" Me.cbxBagatellgrenze.UseVisualStyleBackColor = True ' - 'MyComboBox1 - ' - Me.MyComboBox1._allowedValuesFreiText = Nothing - Me.MyComboBox1._allowFreiText = False - Me.MyComboBox1._value = "" - Me.MyComboBox1.FormattingEnabled = True - Me.MyComboBox1.Location = New System.Drawing.Point(532, 55) - Me.MyComboBox1.Name = "MyComboBox1" - Me.MyComboBox1.Size = New System.Drawing.Size(132, 21) - Me.MyComboBox1.TabIndex = 7 - ' 'Panel2 ' Me.Panel2.BackColor = System.Drawing.Color.WhiteSmoke @@ -778,50 +788,6 @@ Partial Class usrCntlBH Me.Label18.TabIndex = 17 Me.Label18.Text = "bis:" ' - 'txtOPUmsatzBetragBis - ' - Me.txtOPUmsatzBetragBis._DateTimeOnly = False - Me.txtOPUmsatzBetragBis._numbersOnly = False - Me.txtOPUmsatzBetragBis._numbersOnlyKommastellen = "" - Me.txtOPUmsatzBetragBis._Prozent = False - Me.txtOPUmsatzBetragBis._ShortDateNew = False - Me.txtOPUmsatzBetragBis._ShortDateOnly = False - Me.txtOPUmsatzBetragBis._TimeOnly = False - Me.txtOPUmsatzBetragBis._value = "" - Me.txtOPUmsatzBetragBis._Waehrung = True - Me.txtOPUmsatzBetragBis._WaehrungZeichen = True - Me.txtOPUmsatzBetragBis.ForeColor = System.Drawing.Color.Black - Me.txtOPUmsatzBetragBis.Location = New System.Drawing.Point(131, 48) - Me.txtOPUmsatzBetragBis.MaxLineLength = -1 - Me.txtOPUmsatzBetragBis.MaxLines_Warning = "" - Me.txtOPUmsatzBetragBis.MaxLines_Warning_Label = Nothing - Me.txtOPUmsatzBetragBis.Name = "txtOPUmsatzBetragBis" - Me.txtOPUmsatzBetragBis.Size = New System.Drawing.Size(60, 20) - Me.txtOPUmsatzBetragBis.TabIndex = 18 - Me.txtOPUmsatzBetragBis.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' - 'txtOPUmsatzBetragVon - ' - Me.txtOPUmsatzBetragVon._DateTimeOnly = False - Me.txtOPUmsatzBetragVon._numbersOnly = False - Me.txtOPUmsatzBetragVon._numbersOnlyKommastellen = "" - Me.txtOPUmsatzBetragVon._Prozent = False - Me.txtOPUmsatzBetragVon._ShortDateNew = False - Me.txtOPUmsatzBetragVon._ShortDateOnly = False - Me.txtOPUmsatzBetragVon._TimeOnly = False - Me.txtOPUmsatzBetragVon._value = "" - Me.txtOPUmsatzBetragVon._Waehrung = True - Me.txtOPUmsatzBetragVon._WaehrungZeichen = True - Me.txtOPUmsatzBetragVon.ForeColor = System.Drawing.Color.Black - Me.txtOPUmsatzBetragVon.Location = New System.Drawing.Point(38, 48) - Me.txtOPUmsatzBetragVon.MaxLineLength = -1 - Me.txtOPUmsatzBetragVon.MaxLines_Warning = "" - Me.txtOPUmsatzBetragVon.MaxLines_Warning_Label = Nothing - Me.txtOPUmsatzBetragVon.Name = "txtOPUmsatzBetragVon" - Me.txtOPUmsatzBetragVon.Size = New System.Drawing.Size(60, 20) - Me.txtOPUmsatzBetragVon.TabIndex = 16 - Me.txtOPUmsatzBetragVon.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' 'Label16 ' Me.Label16.AutoSize = True @@ -831,50 +797,6 @@ Partial Class usrCntlBH Me.Label16.TabIndex = 2 Me.Label16.Text = "bis:" ' - 'txtOPUmsatzBis - ' - Me.txtOPUmsatzBis._DateTimeOnly = False - Me.txtOPUmsatzBis._numbersOnly = False - Me.txtOPUmsatzBis._numbersOnlyKommastellen = "" - Me.txtOPUmsatzBis._Prozent = False - Me.txtOPUmsatzBis._ShortDateNew = True - Me.txtOPUmsatzBis._ShortDateOnly = False - Me.txtOPUmsatzBis._TimeOnly = False - Me.txtOPUmsatzBis._value = "" - Me.txtOPUmsatzBis._Waehrung = False - Me.txtOPUmsatzBis._WaehrungZeichen = True - Me.txtOPUmsatzBis.ForeColor = System.Drawing.Color.Black - Me.txtOPUmsatzBis.Location = New System.Drawing.Point(131, 25) - Me.txtOPUmsatzBis.MaxLength = 10 - Me.txtOPUmsatzBis.MaxLineLength = -1 - Me.txtOPUmsatzBis.MaxLines_Warning = "" - Me.txtOPUmsatzBis.MaxLines_Warning_Label = Nothing - Me.txtOPUmsatzBis.Name = "txtOPUmsatzBis" - Me.txtOPUmsatzBis.Size = New System.Drawing.Size(60, 20) - Me.txtOPUmsatzBis.TabIndex = 4 - ' - 'txtOPUmsatzVon - ' - Me.txtOPUmsatzVon._DateTimeOnly = False - Me.txtOPUmsatzVon._numbersOnly = False - Me.txtOPUmsatzVon._numbersOnlyKommastellen = "" - Me.txtOPUmsatzVon._Prozent = False - Me.txtOPUmsatzVon._ShortDateNew = True - Me.txtOPUmsatzVon._ShortDateOnly = False - Me.txtOPUmsatzVon._TimeOnly = False - Me.txtOPUmsatzVon._value = "" - Me.txtOPUmsatzVon._Waehrung = False - Me.txtOPUmsatzVon._WaehrungZeichen = True - Me.txtOPUmsatzVon.ForeColor = System.Drawing.Color.Black - Me.txtOPUmsatzVon.Location = New System.Drawing.Point(38, 25) - Me.txtOPUmsatzVon.MaxLength = 10 - Me.txtOPUmsatzVon.MaxLineLength = -1 - Me.txtOPUmsatzVon.MaxLines_Warning = "" - Me.txtOPUmsatzVon.MaxLines_Warning_Label = Nothing - Me.txtOPUmsatzVon.Name = "txtOPUmsatzVon" - Me.txtOPUmsatzVon.Size = New System.Drawing.Size(60, 20) - Me.txtOPUmsatzVon.TabIndex = 1 - ' 'Label15 ' Me.Label15.AutoSize = True @@ -913,28 +835,6 @@ Partial Class usrCntlBH Me.Label14.TabIndex = 14 Me.Label14.Text = "bis:" ' - 'txtOPRisikoBetragBis - ' - Me.txtOPRisikoBetragBis._DateTimeOnly = False - Me.txtOPRisikoBetragBis._numbersOnly = False - Me.txtOPRisikoBetragBis._numbersOnlyKommastellen = "" - Me.txtOPRisikoBetragBis._Prozent = False - Me.txtOPRisikoBetragBis._ShortDateNew = False - Me.txtOPRisikoBetragBis._ShortDateOnly = False - Me.txtOPRisikoBetragBis._TimeOnly = False - Me.txtOPRisikoBetragBis._value = "" - Me.txtOPRisikoBetragBis._Waehrung = True - Me.txtOPRisikoBetragBis._WaehrungZeichen = True - Me.txtOPRisikoBetragBis.ForeColor = System.Drawing.Color.Black - Me.txtOPRisikoBetragBis.Location = New System.Drawing.Point(416, 110) - Me.txtOPRisikoBetragBis.MaxLineLength = -1 - Me.txtOPRisikoBetragBis.MaxLines_Warning = "" - Me.txtOPRisikoBetragBis.MaxLines_Warning_Label = Nothing - Me.txtOPRisikoBetragBis.Name = "txtOPRisikoBetragBis" - Me.txtOPRisikoBetragBis.Size = New System.Drawing.Size(70, 20) - Me.txtOPRisikoBetragBis.TabIndex = 15 - Me.txtOPRisikoBetragBis.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' 'Button3 ' Me.Button3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center @@ -949,28 +849,6 @@ Partial Class usrCntlBH Me.Button3.Text = " Excel" Me.Button3.UseVisualStyleBackColor = True ' - 'txtOPRisikoBetragVon - ' - Me.txtOPRisikoBetragVon._DateTimeOnly = False - Me.txtOPRisikoBetragVon._numbersOnly = False - Me.txtOPRisikoBetragVon._numbersOnlyKommastellen = "" - Me.txtOPRisikoBetragVon._Prozent = False - Me.txtOPRisikoBetragVon._ShortDateNew = False - Me.txtOPRisikoBetragVon._ShortDateOnly = False - Me.txtOPRisikoBetragVon._TimeOnly = False - Me.txtOPRisikoBetragVon._value = "" - Me.txtOPRisikoBetragVon._Waehrung = True - Me.txtOPRisikoBetragVon._WaehrungZeichen = True - Me.txtOPRisikoBetragVon.ForeColor = System.Drawing.Color.Black - Me.txtOPRisikoBetragVon.Location = New System.Drawing.Point(308, 110) - Me.txtOPRisikoBetragVon.MaxLineLength = -1 - Me.txtOPRisikoBetragVon.MaxLines_Warning = "" - Me.txtOPRisikoBetragVon.MaxLines_Warning_Label = Nothing - Me.txtOPRisikoBetragVon.Name = "txtOPRisikoBetragVon" - Me.txtOPRisikoBetragVon.Size = New System.Drawing.Size(70, 20) - Me.txtOPRisikoBetragVon.TabIndex = 13 - Me.txtOPRisikoBetragVon.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' 'Label13 ' Me.Label13.AutoSize = True @@ -989,48 +867,6 @@ Partial Class usrCntlBH Me.Label12.TabIndex = 10 Me.Label12.Text = "bis:" ' - 'txtOPKdNrBis - ' - Me.txtOPKdNrBis._DateTimeOnly = False - Me.txtOPKdNrBis._numbersOnly = False - Me.txtOPKdNrBis._numbersOnlyKommastellen = "" - Me.txtOPKdNrBis._Prozent = False - Me.txtOPKdNrBis._ShortDateNew = False - Me.txtOPKdNrBis._ShortDateOnly = False - Me.txtOPKdNrBis._TimeOnly = False - Me.txtOPKdNrBis._value = Nothing - Me.txtOPKdNrBis._Waehrung = False - Me.txtOPKdNrBis._WaehrungZeichen = True - Me.txtOPKdNrBis.ForeColor = System.Drawing.Color.Black - Me.txtOPKdNrBis.Location = New System.Drawing.Point(416, 84) - Me.txtOPKdNrBis.MaxLineLength = -1 - Me.txtOPKdNrBis.MaxLines_Warning = "" - Me.txtOPKdNrBis.MaxLines_Warning_Label = Nothing - Me.txtOPKdNrBis.Name = "txtOPKdNrBis" - Me.txtOPKdNrBis.Size = New System.Drawing.Size(70, 20) - Me.txtOPKdNrBis.TabIndex = 11 - ' - 'txtOPKdNrVon - ' - Me.txtOPKdNrVon._DateTimeOnly = False - Me.txtOPKdNrVon._numbersOnly = False - Me.txtOPKdNrVon._numbersOnlyKommastellen = "" - Me.txtOPKdNrVon._Prozent = False - Me.txtOPKdNrVon._ShortDateNew = False - Me.txtOPKdNrVon._ShortDateOnly = False - Me.txtOPKdNrVon._TimeOnly = False - Me.txtOPKdNrVon._value = Nothing - Me.txtOPKdNrVon._Waehrung = False - Me.txtOPKdNrVon._WaehrungZeichen = True - Me.txtOPKdNrVon.ForeColor = System.Drawing.Color.Black - Me.txtOPKdNrVon.Location = New System.Drawing.Point(308, 84) - Me.txtOPKdNrVon.MaxLineLength = -1 - Me.txtOPKdNrVon.MaxLines_Warning = "" - Me.txtOPKdNrVon.MaxLines_Warning_Label = Nothing - Me.txtOPKdNrVon.Name = "txtOPKdNrVon" - Me.txtOPKdNrVon.Size = New System.Drawing.Size(70, 20) - Me.txtOPKdNrVon.TabIndex = 9 - ' 'Label11 ' Me.Label11.AutoSize = True @@ -1049,27 +885,6 @@ Partial Class usrCntlBH Me.Label9.TabIndex = 4 Me.Label9.Text = "Kunde (Namenseinschränkung):" ' - 'txtOPKdName - ' - Me.txtOPKdName._DateTimeOnly = False - Me.txtOPKdName._numbersOnly = False - Me.txtOPKdName._numbersOnlyKommastellen = "" - Me.txtOPKdName._Prozent = False - Me.txtOPKdName._ShortDateNew = False - Me.txtOPKdName._ShortDateOnly = False - Me.txtOPKdName._TimeOnly = False - Me.txtOPKdName._value = Nothing - Me.txtOPKdName._Waehrung = False - Me.txtOPKdName._WaehrungZeichen = True - Me.txtOPKdName.ForeColor = System.Drawing.Color.Black - Me.txtOPKdName.Location = New System.Drawing.Point(308, 55) - Me.txtOPKdName.MaxLineLength = -1 - Me.txtOPKdName.MaxLines_Warning = "" - Me.txtOPKdName.MaxLines_Warning_Label = Nothing - Me.txtOPKdName.Name = "txtOPKdName" - Me.txtOPKdName.Size = New System.Drawing.Size(178, 20) - Me.txtOPKdName.TabIndex = 5 - ' 'Label8 ' Me.Label8.AutoSize = True @@ -1099,7 +914,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, 978) + Me.tbcntr.Size = New System.Drawing.Size(964, 1036) Me.tbcntr.TabIndex = 25 ' 'TabPage5 @@ -1108,7 +923,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, 952) + Me.TabPage5.Size = New System.Drawing.Size(956, 1010) Me.TabPage5.TabIndex = 1 Me.TabPage5.Text = "IMEX" Me.TabPage5.UseVisualStyleBackColor = True @@ -1177,49 +992,140 @@ Partial Class usrCntlBH Me.Button7.Text = "Importieren" Me.Button7.UseVisualStyleBackColor = True ' - 'Label34 + 'Label37 ' - 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(13, 836) - Me.Label34.Name = "Label34" - Me.Label34.Size = New System.Drawing.Size(298, 18) - Me.Label34.TabIndex = 14 - Me.Label34.Text = "Abfertigungsverbot" + 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, 640) + Me.Label37.Name = "Label37" + Me.Label37.Size = New System.Drawing.Size(144, 17) + Me.Label37.TabIndex = 16 + Me.Label37.Text = "USt-Voranmeldung" ' - 'GroupBox8 + 'GroupBox9 ' - Me.GroupBox8.Controls.Add(Me.Label36) - 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(12, 848) - Me.GroupBox8.Name = "GroupBox8" - Me.GroupBox8.Size = New System.Drawing.Size(847, 69) - Me.GroupBox8.TabIndex = 15 - Me.GroupBox8.TabStop = False + Me.GroupBox9.Controls.Add(Me.Label41) + Me.GroupBox9.Controls.Add(Me.Button11) + Me.GroupBox9.Controls.Add(Me.Label40) + Me.GroupBox9.Controls.Add(Me.Button10) + Me.GroupBox9.Controls.Add(Me.txtStichtag) + 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, 660) + Me.GroupBox9.Name = "GroupBox9" + Me.GroupBox9.Size = New System.Drawing.Size(847, 67) + Me.GroupBox9.TabIndex = 17 + Me.GroupBox9.TabStop = False ' - 'Label35 + 'Label38 ' - Me.Label35.Location = New System.Drawing.Point(145, 30) - Me.Label35.Name = "Label35" - Me.Label35.Size = New System.Drawing.Size(327, 17) - Me.Label35.TabIndex = 3 - Me.Label35.Text = "Liefert eine Liste der Kunden mit Abfertigungsverbot." + Me.Label38.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Label38.AutoSize = True + Me.Label38.Location = New System.Drawing.Point(143, 39) + Me.Label38.Name = "Label38" + Me.Label38.Size = New System.Drawing.Size(81, 13) + Me.Label38.TabIndex = 2 + Me.Label38.Text = "Sicherheit 3470" ' - 'Button8 + 'Button9 ' - Me.Button8.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center - Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button8.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Button8.Image = Global.SDL.My.Resources.Resources.Excel_logo - Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button8.Location = New System.Drawing.Point(4, 21) - Me.Button8.Name = "Button8" - Me.Button8.Size = New System.Drawing.Size(121, 31) - Me.Button8.TabIndex = 8 - Me.Button8.Text = " Excel" - Me.Button8.UseVisualStyleBackColor = True + Me.Button9.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Button9.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center + Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button9.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button9.Image = Global.SDL.My.Resources.Resources.Excel_logo + Me.Button9.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button9.Location = New System.Drawing.Point(6, 30) + Me.Button9.Name = "Button9" + Me.Button9.Size = New System.Drawing.Size(121, 31) + Me.Button9.TabIndex = 7 + Me.Button9.Text = " Excel" + Me.Button9.UseVisualStyleBackColor = True + ' + 'Label39 + ' + Me.Label39.AutoSize = True + Me.Label39.Location = New System.Drawing.Point(4, 13) + Me.Label39.Name = "Label39" + Me.Label39.Size = New System.Drawing.Size(49, 13) + Me.Label39.TabIndex = 22 + Me.Label39.Text = "Stichtag:" + ' + 'Label40 + ' + Me.Label40.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Label40.AutoSize = True + Me.Label40.Location = New System.Drawing.Point(424, 39) + Me.Label40.Name = "Label40" + Me.Label40.Size = New System.Drawing.Size(100, 13) + Me.Label40.TabIndex = 23 + Me.Label40.Text = "VZ Verag (2866-68)" + ' + 'Button10 + ' + Me.Button10.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Button10.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center + Me.Button10.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button10.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button10.Image = Global.SDL.My.Resources.Resources.Excel_logo + Me.Button10.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button10.Location = New System.Drawing.Point(287, 30) + Me.Button10.Name = "Button10" + Me.Button10.Size = New System.Drawing.Size(121, 31) + Me.Button10.TabIndex = 24 + Me.Button10.Text = " Excel" + Me.Button10.UseVisualStyleBackColor = True + ' + 'Label41 + ' + Me.Label41.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Label41.AutoSize = True + Me.Label41.Location = New System.Drawing.Point(720, 39) + Me.Label41.Name = "Label41" + Me.Label41.Size = New System.Drawing.Size(81, 13) + Me.Label41.TabIndex = 25 + Me.Label41.Text = "VZ RMC (2865)" + ' + 'Button11 + ' + Me.Button11.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Button11.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center + Me.Button11.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button11.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button11.Image = Global.SDL.My.Resources.Resources.Excel_logo + Me.Button11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button11.Location = New System.Drawing.Point(583, 30) + Me.Button11.Name = "Button11" + Me.Button11.Size = New System.Drawing.Size(121, 31) + Me.Button11.TabIndex = 26 + Me.Button11.Text = " Excel" + Me.Button11.UseVisualStyleBackColor = True + ' + 'txtStichtag + ' + Me.txtStichtag._DateTimeOnly = False + Me.txtStichtag._numbersOnly = False + Me.txtStichtag._numbersOnlyKommastellen = "" + Me.txtStichtag._numbersOnlyTrennzeichen = True + Me.txtStichtag._Prozent = False + Me.txtStichtag._ShortDateNew = True + Me.txtStichtag._ShortDateOnly = False + Me.txtStichtag._TimeOnly = False + Me.txtStichtag._TimeOnly_Seconds = False + Me.txtStichtag._value = "" + Me.txtStichtag._Waehrung = False + Me.txtStichtag._WaehrungZeichen = True + Me.txtStichtag.ForeColor = System.Drawing.Color.Black + Me.txtStichtag.Location = New System.Drawing.Point(67, 10) + Me.txtStichtag.MaxLength = 10 + Me.txtStichtag.MaxLineLength = -1 + Me.txtStichtag.MaxLines_Warning = "" + Me.txtStichtag.MaxLines_Warning_Label = Nothing + Me.txtStichtag.Name = "txtStichtag" + Me.txtStichtag.Size = New System.Drawing.Size(60, 20) + Me.txtStichtag.TabIndex = 21 ' 'cboAbfVerbFirma ' @@ -1232,14 +1138,276 @@ Partial Class usrCntlBH Me.cboAbfVerbFirma.Size = New System.Drawing.Size(132, 21) Me.cboAbfVerbFirma.TabIndex = 29 ' - 'Label36 + 'MyListBox1 ' - Me.Label36.AutoSize = True - Me.Label36.Location = New System.Drawing.Point(462, 30) - Me.Label36.Name = "Label36" - Me.Label36.Size = New System.Drawing.Size(35, 13) - Me.Label36.TabIndex = 30 - Me.Label36.Text = "Firma:" + Me.MyListBox1._value = "" + Me.MyListBox1.FormattingEnabled = True + Me.MyListBox1.Location = New System.Drawing.Point(699, 55) + Me.MyListBox1.Name = "MyListBox1" + Me.MyListBox1.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple + Me.MyListBox1.Size = New System.Drawing.Size(142, 212) + Me.MyListBox1.TabIndex = 7 + ' + 'cboSort + ' + Me.cboSort._allowedValuesFreiText = Nothing + Me.cboSort._allowFreiText = False + Me.cboSort._value = "" + Me.cboSort.FormattingEnabled = True + Me.cboSort.Location = New System.Drawing.Point(207, 205) + Me.cboSort.Name = "cboSort" + Me.cboSort.Size = New System.Drawing.Size(132, 21) + Me.cboSort.TabIndex = 22 + ' + 'txtBagatellgrenzeBei + ' + Me.txtBagatellgrenzeBei._DateTimeOnly = False + Me.txtBagatellgrenzeBei._numbersOnly = False + Me.txtBagatellgrenzeBei._numbersOnlyKommastellen = "" + Me.txtBagatellgrenzeBei._numbersOnlyTrennzeichen = True + Me.txtBagatellgrenzeBei._Prozent = False + Me.txtBagatellgrenzeBei._ShortDateNew = True + Me.txtBagatellgrenzeBei._ShortDateOnly = False + Me.txtBagatellgrenzeBei._TimeOnly = False + Me.txtBagatellgrenzeBei._TimeOnly_Seconds = False + Me.txtBagatellgrenzeBei._value = "" + Me.txtBagatellgrenzeBei._Waehrung = True + Me.txtBagatellgrenzeBei._WaehrungZeichen = True + Me.txtBagatellgrenzeBei.Enabled = False + Me.txtBagatellgrenzeBei.ForeColor = System.Drawing.Color.Black + Me.txtBagatellgrenzeBei.Location = New System.Drawing.Point(38, 25) + Me.txtBagatellgrenzeBei.MaxLength = 10 + Me.txtBagatellgrenzeBei.MaxLineLength = -1 + Me.txtBagatellgrenzeBei.MaxLines_Warning = "" + Me.txtBagatellgrenzeBei.MaxLines_Warning_Label = Nothing + Me.txtBagatellgrenzeBei.Name = "txtBagatellgrenzeBei" + Me.txtBagatellgrenzeBei.Size = New System.Drawing.Size(79, 20) + Me.txtBagatellgrenzeBei.TabIndex = 1 + Me.txtBagatellgrenzeBei.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'MyComboBox1 + ' + Me.MyComboBox1._allowedValuesFreiText = Nothing + Me.MyComboBox1._allowFreiText = False + Me.MyComboBox1._value = "" + Me.MyComboBox1.FormattingEnabled = True + Me.MyComboBox1.Location = New System.Drawing.Point(532, 55) + Me.MyComboBox1.Name = "MyComboBox1" + Me.MyComboBox1.Size = New System.Drawing.Size(132, 21) + Me.MyComboBox1.TabIndex = 7 + ' + 'txtOPUmsatzBetragBis + ' + Me.txtOPUmsatzBetragBis._DateTimeOnly = False + Me.txtOPUmsatzBetragBis._numbersOnly = False + Me.txtOPUmsatzBetragBis._numbersOnlyKommastellen = "" + Me.txtOPUmsatzBetragBis._numbersOnlyTrennzeichen = True + Me.txtOPUmsatzBetragBis._Prozent = False + Me.txtOPUmsatzBetragBis._ShortDateNew = False + Me.txtOPUmsatzBetragBis._ShortDateOnly = False + Me.txtOPUmsatzBetragBis._TimeOnly = False + Me.txtOPUmsatzBetragBis._TimeOnly_Seconds = False + Me.txtOPUmsatzBetragBis._value = "" + Me.txtOPUmsatzBetragBis._Waehrung = True + Me.txtOPUmsatzBetragBis._WaehrungZeichen = True + Me.txtOPUmsatzBetragBis.ForeColor = System.Drawing.Color.Black + Me.txtOPUmsatzBetragBis.Location = New System.Drawing.Point(131, 48) + Me.txtOPUmsatzBetragBis.MaxLineLength = -1 + Me.txtOPUmsatzBetragBis.MaxLines_Warning = "" + Me.txtOPUmsatzBetragBis.MaxLines_Warning_Label = Nothing + Me.txtOPUmsatzBetragBis.Name = "txtOPUmsatzBetragBis" + Me.txtOPUmsatzBetragBis.Size = New System.Drawing.Size(60, 20) + Me.txtOPUmsatzBetragBis.TabIndex = 18 + Me.txtOPUmsatzBetragBis.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'txtOPUmsatzBetragVon + ' + Me.txtOPUmsatzBetragVon._DateTimeOnly = False + Me.txtOPUmsatzBetragVon._numbersOnly = False + Me.txtOPUmsatzBetragVon._numbersOnlyKommastellen = "" + Me.txtOPUmsatzBetragVon._numbersOnlyTrennzeichen = True + Me.txtOPUmsatzBetragVon._Prozent = False + Me.txtOPUmsatzBetragVon._ShortDateNew = False + Me.txtOPUmsatzBetragVon._ShortDateOnly = False + Me.txtOPUmsatzBetragVon._TimeOnly = False + Me.txtOPUmsatzBetragVon._TimeOnly_Seconds = False + Me.txtOPUmsatzBetragVon._value = "" + Me.txtOPUmsatzBetragVon._Waehrung = True + Me.txtOPUmsatzBetragVon._WaehrungZeichen = True + Me.txtOPUmsatzBetragVon.ForeColor = System.Drawing.Color.Black + Me.txtOPUmsatzBetragVon.Location = New System.Drawing.Point(38, 48) + Me.txtOPUmsatzBetragVon.MaxLineLength = -1 + Me.txtOPUmsatzBetragVon.MaxLines_Warning = "" + Me.txtOPUmsatzBetragVon.MaxLines_Warning_Label = Nothing + Me.txtOPUmsatzBetragVon.Name = "txtOPUmsatzBetragVon" + Me.txtOPUmsatzBetragVon.Size = New System.Drawing.Size(60, 20) + Me.txtOPUmsatzBetragVon.TabIndex = 16 + Me.txtOPUmsatzBetragVon.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'txtOPUmsatzBis + ' + Me.txtOPUmsatzBis._DateTimeOnly = False + Me.txtOPUmsatzBis._numbersOnly = False + Me.txtOPUmsatzBis._numbersOnlyKommastellen = "" + Me.txtOPUmsatzBis._numbersOnlyTrennzeichen = True + Me.txtOPUmsatzBis._Prozent = False + Me.txtOPUmsatzBis._ShortDateNew = True + Me.txtOPUmsatzBis._ShortDateOnly = False + Me.txtOPUmsatzBis._TimeOnly = False + Me.txtOPUmsatzBis._TimeOnly_Seconds = False + Me.txtOPUmsatzBis._value = "" + Me.txtOPUmsatzBis._Waehrung = False + Me.txtOPUmsatzBis._WaehrungZeichen = True + Me.txtOPUmsatzBis.ForeColor = System.Drawing.Color.Black + Me.txtOPUmsatzBis.Location = New System.Drawing.Point(131, 25) + Me.txtOPUmsatzBis.MaxLength = 10 + Me.txtOPUmsatzBis.MaxLineLength = -1 + Me.txtOPUmsatzBis.MaxLines_Warning = "" + Me.txtOPUmsatzBis.MaxLines_Warning_Label = Nothing + Me.txtOPUmsatzBis.Name = "txtOPUmsatzBis" + Me.txtOPUmsatzBis.Size = New System.Drawing.Size(60, 20) + Me.txtOPUmsatzBis.TabIndex = 4 + ' + 'txtOPUmsatzVon + ' + Me.txtOPUmsatzVon._DateTimeOnly = False + Me.txtOPUmsatzVon._numbersOnly = False + Me.txtOPUmsatzVon._numbersOnlyKommastellen = "" + Me.txtOPUmsatzVon._numbersOnlyTrennzeichen = True + Me.txtOPUmsatzVon._Prozent = False + Me.txtOPUmsatzVon._ShortDateNew = True + Me.txtOPUmsatzVon._ShortDateOnly = False + Me.txtOPUmsatzVon._TimeOnly = False + Me.txtOPUmsatzVon._TimeOnly_Seconds = False + Me.txtOPUmsatzVon._value = "" + Me.txtOPUmsatzVon._Waehrung = False + Me.txtOPUmsatzVon._WaehrungZeichen = True + Me.txtOPUmsatzVon.ForeColor = System.Drawing.Color.Black + Me.txtOPUmsatzVon.Location = New System.Drawing.Point(38, 25) + Me.txtOPUmsatzVon.MaxLength = 10 + Me.txtOPUmsatzVon.MaxLineLength = -1 + Me.txtOPUmsatzVon.MaxLines_Warning = "" + Me.txtOPUmsatzVon.MaxLines_Warning_Label = Nothing + Me.txtOPUmsatzVon.Name = "txtOPUmsatzVon" + Me.txtOPUmsatzVon.Size = New System.Drawing.Size(60, 20) + Me.txtOPUmsatzVon.TabIndex = 1 + ' + 'txtOPRisikoBetragBis + ' + Me.txtOPRisikoBetragBis._DateTimeOnly = False + Me.txtOPRisikoBetragBis._numbersOnly = False + Me.txtOPRisikoBetragBis._numbersOnlyKommastellen = "" + Me.txtOPRisikoBetragBis._numbersOnlyTrennzeichen = True + Me.txtOPRisikoBetragBis._Prozent = False + Me.txtOPRisikoBetragBis._ShortDateNew = False + Me.txtOPRisikoBetragBis._ShortDateOnly = False + Me.txtOPRisikoBetragBis._TimeOnly = False + Me.txtOPRisikoBetragBis._TimeOnly_Seconds = False + Me.txtOPRisikoBetragBis._value = "" + Me.txtOPRisikoBetragBis._Waehrung = True + Me.txtOPRisikoBetragBis._WaehrungZeichen = True + Me.txtOPRisikoBetragBis.ForeColor = System.Drawing.Color.Black + Me.txtOPRisikoBetragBis.Location = New System.Drawing.Point(416, 110) + Me.txtOPRisikoBetragBis.MaxLineLength = -1 + Me.txtOPRisikoBetragBis.MaxLines_Warning = "" + Me.txtOPRisikoBetragBis.MaxLines_Warning_Label = Nothing + Me.txtOPRisikoBetragBis.Name = "txtOPRisikoBetragBis" + Me.txtOPRisikoBetragBis.Size = New System.Drawing.Size(70, 20) + Me.txtOPRisikoBetragBis.TabIndex = 15 + Me.txtOPRisikoBetragBis.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'txtOPRisikoBetragVon + ' + Me.txtOPRisikoBetragVon._DateTimeOnly = False + Me.txtOPRisikoBetragVon._numbersOnly = False + Me.txtOPRisikoBetragVon._numbersOnlyKommastellen = "" + Me.txtOPRisikoBetragVon._numbersOnlyTrennzeichen = True + Me.txtOPRisikoBetragVon._Prozent = False + Me.txtOPRisikoBetragVon._ShortDateNew = False + Me.txtOPRisikoBetragVon._ShortDateOnly = False + Me.txtOPRisikoBetragVon._TimeOnly = False + Me.txtOPRisikoBetragVon._TimeOnly_Seconds = False + Me.txtOPRisikoBetragVon._value = "" + Me.txtOPRisikoBetragVon._Waehrung = True + Me.txtOPRisikoBetragVon._WaehrungZeichen = True + Me.txtOPRisikoBetragVon.ForeColor = System.Drawing.Color.Black + Me.txtOPRisikoBetragVon.Location = New System.Drawing.Point(308, 110) + Me.txtOPRisikoBetragVon.MaxLineLength = -1 + Me.txtOPRisikoBetragVon.MaxLines_Warning = "" + Me.txtOPRisikoBetragVon.MaxLines_Warning_Label = Nothing + Me.txtOPRisikoBetragVon.Name = "txtOPRisikoBetragVon" + Me.txtOPRisikoBetragVon.Size = New System.Drawing.Size(70, 20) + Me.txtOPRisikoBetragVon.TabIndex = 13 + Me.txtOPRisikoBetragVon.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'txtOPKdNrBis + ' + Me.txtOPKdNrBis._DateTimeOnly = False + Me.txtOPKdNrBis._numbersOnly = False + Me.txtOPKdNrBis._numbersOnlyKommastellen = "" + Me.txtOPKdNrBis._numbersOnlyTrennzeichen = True + Me.txtOPKdNrBis._Prozent = False + Me.txtOPKdNrBis._ShortDateNew = False + Me.txtOPKdNrBis._ShortDateOnly = False + Me.txtOPKdNrBis._TimeOnly = False + Me.txtOPKdNrBis._TimeOnly_Seconds = False + Me.txtOPKdNrBis._value = Nothing + Me.txtOPKdNrBis._Waehrung = False + Me.txtOPKdNrBis._WaehrungZeichen = True + Me.txtOPKdNrBis.ForeColor = System.Drawing.Color.Black + Me.txtOPKdNrBis.Location = New System.Drawing.Point(416, 84) + Me.txtOPKdNrBis.MaxLineLength = -1 + Me.txtOPKdNrBis.MaxLines_Warning = "" + Me.txtOPKdNrBis.MaxLines_Warning_Label = Nothing + Me.txtOPKdNrBis.Name = "txtOPKdNrBis" + Me.txtOPKdNrBis.Size = New System.Drawing.Size(70, 20) + Me.txtOPKdNrBis.TabIndex = 11 + ' + 'txtOPKdNrVon + ' + Me.txtOPKdNrVon._DateTimeOnly = False + Me.txtOPKdNrVon._numbersOnly = False + Me.txtOPKdNrVon._numbersOnlyKommastellen = "" + Me.txtOPKdNrVon._numbersOnlyTrennzeichen = True + Me.txtOPKdNrVon._Prozent = False + Me.txtOPKdNrVon._ShortDateNew = False + Me.txtOPKdNrVon._ShortDateOnly = False + Me.txtOPKdNrVon._TimeOnly = False + Me.txtOPKdNrVon._TimeOnly_Seconds = False + Me.txtOPKdNrVon._value = Nothing + Me.txtOPKdNrVon._Waehrung = False + Me.txtOPKdNrVon._WaehrungZeichen = True + Me.txtOPKdNrVon.ForeColor = System.Drawing.Color.Black + Me.txtOPKdNrVon.Location = New System.Drawing.Point(308, 84) + Me.txtOPKdNrVon.MaxLineLength = -1 + Me.txtOPKdNrVon.MaxLines_Warning = "" + Me.txtOPKdNrVon.MaxLines_Warning_Label = Nothing + Me.txtOPKdNrVon.Name = "txtOPKdNrVon" + Me.txtOPKdNrVon.Size = New System.Drawing.Size(70, 20) + Me.txtOPKdNrVon.TabIndex = 9 + ' + 'txtOPKdName + ' + Me.txtOPKdName._DateTimeOnly = False + Me.txtOPKdName._numbersOnly = False + Me.txtOPKdName._numbersOnlyKommastellen = "" + Me.txtOPKdName._numbersOnlyTrennzeichen = True + Me.txtOPKdName._Prozent = False + Me.txtOPKdName._ShortDateNew = False + Me.txtOPKdName._ShortDateOnly = False + Me.txtOPKdName._TimeOnly = False + Me.txtOPKdName._TimeOnly_Seconds = False + Me.txtOPKdName._value = Nothing + Me.txtOPKdName._Waehrung = False + Me.txtOPKdName._WaehrungZeichen = True + Me.txtOPKdName.ForeColor = System.Drawing.Color.Black + Me.txtOPKdName.Location = New System.Drawing.Point(308, 55) + Me.txtOPKdName.MaxLineLength = -1 + Me.txtOPKdName.MaxLines_Warning = "" + Me.txtOPKdName.MaxLines_Warning_Label = Nothing + Me.txtOPKdName.Name = "txtOPKdName" + Me.txtOPKdName.Size = New System.Drawing.Size(178, 20) + Me.txtOPKdName.TabIndex = 5 ' 'usrCntlBH ' @@ -1249,11 +1417,13 @@ Partial Class usrCntlBH Me.Controls.Add(Me.tbcntr) Me.Controls.Add(Me.pnl) Me.Name = "usrCntlBH" - Me.Size = New System.Drawing.Size(964, 1030) + Me.Size = New System.Drawing.Size(964, 1088) Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() Me.TabPage1.ResumeLayout(False) Me.TabPage1.PerformLayout() + Me.GroupBox8.ResumeLayout(False) + Me.GroupBox8.PerformLayout() Me.GroupBox7.ResumeLayout(False) Me.GroupBox5.ResumeLayout(False) Me.GroupBox5.PerformLayout() @@ -1276,8 +1446,8 @@ Partial Class usrCntlBH Me.TabPage5.PerformLayout() Me.GroupBox6.ResumeLayout(False) Me.GroupBox6.PerformLayout() - Me.GroupBox8.ResumeLayout(False) - Me.GroupBox8.PerformLayout() + Me.GroupBox9.ResumeLayout(False) + Me.GroupBox9.PerformLayout() Me.ResumeLayout(False) End Sub @@ -1370,4 +1540,14 @@ Partial Class usrCntlBH Friend WithEvents Label35 As Label Friend WithEvents Label36 As Label Friend WithEvents cboAbfVerbFirma As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents Label37 As Label + Friend WithEvents GroupBox9 As GroupBox + Friend WithEvents Label38 As Label + Friend WithEvents Button9 As Button + Friend WithEvents Label41 As Label + Friend WithEvents Button11 As Button + Friend WithEvents Label40 As Label + Friend WithEvents Button10 As Button + Friend WithEvents txtStichtag As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label39 As Label End Class diff --git a/SDL/buchhaltung/usrCntlBH.vb b/SDL/buchhaltung/usrCntlBH.vb index a03f55aa..239879c0 100644 --- a/SDL/buchhaltung/usrCntlBH.vb +++ b/SDL/buchhaltung/usrCntlBH.vb @@ -691,4 +691,67 @@ Public Class usrCntlBH Me.Cursor = Cursors.Default End Sub + + Private Sub Button9_Click(sender As Object, e As EventArgs) Handles Button9.Click + + + If txtStichtag.Text <> "" AndAlso Not IsNumeric(txtStichtag.Text) Then MsgBox("Stichtag nicht korrekt!") : Exit Sub + + Dim SQLStichtag = "" + If txtStichtag.Text <> "" Then + Try : DateTime.ParseExact(txtStichtag._value, "dd.MM.yyyy", culture) + Catch ex As Exception : MsgBox("Stichtag nicht korrekt!") : Exit Sub : End Try + SQLStichtag = "And (UStVAn_ReDatVon <='" & txtStichtag._value & "' and tblUStVAntrag.UStVAn_ReDatBis >= '" & txtStichtag._value & "')" + End If + + Dim sqlStr = "SELECT tblUStVAntrag.UStVAn_ID, tblUStVAntrag.UStVAn_KuNr, tblUStVAntrag.UStVAn_ReDatVon, tblUStVAntrag.UStVAn_ReDatBis, tblUStVAntrag.UStVAn_Ausstellungsdatum, tblUStVAntrag.UStVAn_LandNr, tblUStVAntrag.UStVAn_3470, Adressen.Ordnungsbegriff, Adressen.LandKz + FROM tblUStVAntrag + INNER JOIN Adressen ON tblUStVAntrag.UStVAn_KuNr = Adressen.AdressenNr + WHERE tblUStVAntrag.UStVAn_3470 Is Not Null" & SQLStichtag + + + Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL") + + cProgramFunctions.genExcelFromDT_NEW(dt, {"G1:G" & (dt.Rows.Count + 1)}) + + Me.Cursor = Cursors.Default + End Sub + + Private Sub Button10_Click(sender As Object, e As EventArgs) Handles Button10.Click, Button11.Click + + If txtStichtag.Text <> "" AndAlso Not IsNumeric(txtStichtag.Text) Then MsgBox("Stichtag nicht korrekt!") : Exit Sub + + Dim SQLStichtag = "" + Dim SQLKdNr = "" + If sender Is Button10 Then + SQLKdNr = " and [UStVAn_KuNr] Not Between 150000 And 155999" + Else + SQLKdNr = " and [UStVAn_KuNr] Between 150000 And 155999" + End If + + If txtStichtag.Text <> "" Then + Try : DateTime.ParseExact(txtStichtag._value, "dd.MM.yyyy", culture) + Catch ex As Exception : MsgBox("Stichtag nicht korrekt!") : Exit Sub : End Try + SQLStichtag = " And (UStVAn_ReDatVon <='" & txtStichtag._value & "' and tblUStVAntrag.UStVAn_ReDatBis >= '" & txtStichtag._value & "')" + End If + + Dim sqlStr = "SELECT tblUStVAntrag.UStVAn_ID, tblUStVAntrag.UStVAn_KuNr, tblUStVAntrag.UStVAn_ReDatVon, tblUStVAntrag.UStVAn_ReDatBis, tblUStVAntrag.UStVAn_Ausstellungsdatum, + tblUStVAntrag.UStVAn_LandNr, tblUStVAntrag.UStVAn_VZDatum, tblUStVAntrag.UStVAn_VZBetrag, tblUStVAntrag.UStVAn_RZBetragVZ, Adressen.Ordnungsbegriff, Adressen.LandKz, + isnull([UStVEr_USteuerbetragEUR],0) AS Erstattungsbetrag, + case when ([UStVAn_VZBetrag]-isnull([UStVAn_RZBetragVZ],0)-isnull([UStVEr_USteuerbetragEUR],0))>0 then (([UStVAn_VZBetrag]-isnull([UStVAn_RZBetragVZ],0))-isnull([UStVEr_USteuerbetragEUR],0)) else 0 End AS UStVAn_VZBetragAktuell + FROM tblUStVAntrag + INNER JOIN [tblUStVErstattung] ON [tblUStVErstattung].[UStVAn_ID] = tblUStVAntrag .[UStVAn_ID] + INNER JOIN Adressen ON tblUStVAntrag.UStVAn_KuNr = Adressen.AdressenNr + WHERE tblUStVAntrag.UStVAn_VZBetrag Is Not Null" & SQLStichtag & SQLKdNr + + + Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL") + + cProgramFunctions.genExcelFromDT_NEW(dt, {"H1:H" & (dt.Rows.Count + 1), "I1:I" & (dt.Rows.Count + 1), "L1:L" & (dt.Rows.Count + 1), "M1:M" & (dt.Rows.Count + 1)}) + + Me.Cursor = Cursors.Default + + End Sub + + End Class diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index 79602c6d..3f6df46d 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -2817,6 +2817,7 @@ Public Class usrCntlKundenuebersicht cBonitaetsauskunft.ba_CreditSaveBonitaetsIndex = Nothing cBonitaetsauskunft.ba_CreditSaveRisikoklasse = Nothing + cBonitaetsauskunft.ba_KundenNr = (kdNr) cBonitaetsauskunft.ba_Datum = Now() @@ -2848,6 +2849,7 @@ Public Class usrCntlKundenuebersicht cBonitaetsauskunft.ba_Hoechstkredit = 0 End If + cBonitaetsauskunft.ba_UID = company.vatNo cBonitaetsauskunft.ba_Bankverbindung = company.csBank cBonitaetsauskunft.ba_Zahlungsweise = "" cBonitaetsauskunft.ba_GFName = company.csCEO @@ -2992,6 +2994,14 @@ Public Class usrCntlKundenuebersicht setCreditSafeEntry(company, pdfObject, kdNr) End If + If company.vatNo <> "" AndAlso checkNullStr(ADRESSE.UstIdKz) = "" AndAlso checkNullStr(ADRESSE.UstIdNr) = "" Then + 'set and check uid nr + + + End If + + + End Sub diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index d5c0755a..0b6b8ffd 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -2106,9 +2106,9 @@ Public Class frmMDMDatenverarbetiung RG.Buchungsjahr = cRKSV.getGJ(RG.RechnungsDatum) - Dim sqlstr As String = "SELECT '135' as leistungsNr, [contractPartner] as ProductCode, sum([netAmount]) as netamount ,sum([VATamount]) as Vatamount ,sum([totalAmount]) as amountInclVAT FROM Kreditkarten INNER JOIN tblAsfinagMaut ON Kreditkarten.KartenNr = tblAsfinagMaut.cardnumber Where Kreditkarten.AdressenNr= '" & KD.KundenNr & "' and tblAsfinagMaut.VATamount <> 0 Group by [contractPartner] + Dim sqlstr As String = "SELECT '135' as leistungsNr, 'MAUT AT lt. Auslage' as ProductCode, sum([netAmount]) as netamount ,sum([VATamount]) as Vatamount ,sum([totalAmount]) as amountInclVAT FROM Kreditkarten INNER JOIN tblAsfinagMaut ON Kreditkarten.KartenNr = tblAsfinagMaut.cardnumber Where Kreditkarten.AdressenNr= '" & KD.KundenNr & "' and tblAsfinagMaut.VATamount <> 0 group by Kreditkarten.AdressenNr UNION - SELECT '153' as leistungsNr, [contractPartner] as ProductCode, sum([netAmount]) as netamount ,sum([VATamount]) as Vatamount ,sum([totalAmount]) as amountInclVAT FROM Kreditkarten INNER JOIN tblAsfinagMaut ON Kreditkarten.KartenNr = tblAsfinagMaut.cardnumber Where Kreditkarten.AdressenNr= '" & KD.KundenNr & "' and tblAsfinagMaut.VATamount = 0 Group by [contractPartner]" + SELECT '153' as leistungsNr, 'MAUT AT lt. Auslage' as ProductCode, sum([netAmount]) as netamount ,sum([VATamount]) as Vatamount ,sum([totalAmount]) as amountInclVAT FROM Kreditkarten INNER JOIN tblAsfinagMaut ON Kreditkarten.KartenNr = tblAsfinagMaut.cardnumber Where Kreditkarten.AdressenNr= '" & KD.KundenNr & "' and tblAsfinagMaut.VATamount = 0 group by Kreditkarten.AdressenNr" Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL") @@ -2795,7 +2795,7 @@ Public Class frmMDMDatenverarbetiung Return False End If For Each row As DataRow In dt.Rows - Dim maut As New cAsfinagMaut() + Dim maut As New VERAG_PROG_ALLGEMEIN.cAsfinagMaut() maut.cardnumber = row.Item("CardNumber") maut.licenceplate = IIf(Not IsDBNull(row.Item("vehicleLicensePlate")), row.Item("vehicleLicensePlate"), row.Item("InfoField")) maut.turnoverdate = row.Item("DeliveryDate") diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cBonitaetsauskunft.vb b/VERAG_PROG_ALLGEMEIN/Classes/cBonitaetsauskunft.vb index 3da314fe..72881bd5 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cBonitaetsauskunft.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cBonitaetsauskunft.vb @@ -32,6 +32,7 @@ Public Class cBonitaetsauskunft Property ba_datenarchivId As Object = Nothing Property ba_Geschaeftszweck As Object = Nothing Property ba_GSName As Object = Nothing + Property ba_UID As String = "" Dim SQL As New SQL @@ -75,6 +76,7 @@ Public Class cBonitaetsauskunft 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)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ba_UID", ba_UID)) Return list End Function diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb index 723a4ac6..870f0218 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb @@ -22,6 +22,7 @@ Public Class cMitarbeiter Property mit_durchwahl As String = "" Property mit_telefonnr As String = "" Property mit_email As String = "" + Property mit_emailprivat As String = "" Property mit_mobiltel As String = "" Property mit_allowAnruf As Boolean Property mit_info As String = "" @@ -202,6 +203,7 @@ Public Class cMitarbeiter list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_Sprachkentnisse", mit_Sprachkentnisse)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_homeoffice", mit_homeoffice)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_timasNichtStempeln", mit_timasNichtStempeln)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_emailprivat", mit_emailprivat)) Return list @@ -401,6 +403,7 @@ Public Class cMitarbeiter If Not dr.Item("mit_Sprachkentnisse") Is DBNull.Value Then Me.mit_Sprachkentnisse = dr.Item("mit_Sprachkentnisse") Me.mit_homeoffice = dr.Item("mit_homeoffice") Me.mit_timasNichtStempeln = dr.Item("mit_timasNichtStempeln") + If Not dr.Item("mit_emailprivat") Is DBNull.Value Then Me.mit_emailprivat = dr.Item("mit_emailprivat") Catch ex As Exception diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb index 9797d9a5..d1bc466d 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb @@ -608,9 +608,7 @@ Public Class cCreditSafeAPI Public Property csBusinessPurpose As String Public Property csShareholder As String Public Property csCEO As String - Public Property csTurnover As String - Public Property language As String Public Property csBank As String diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb index 7aff3256..145626e9 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb @@ -256,7 +256,7 @@ Public Class cTimasAPI success = json.UpdateString("importSign", "Import from Aviso") success = json.UpdateString("login", mitarbeiter.mit_username) success = json.UpdateBool("loginActive", 1) - success = json.UpdateString("email", mitarbeiter.mit_email) + success = json.UpdateString("email", IIf(mitarbeiter.mit_emailprivat <> "", mitarbeiter.mit_emailprivat, mitarbeiter.mit_email)) success = json.UpdateString("street", mitarbeiter.mit_strasse) success = json.UpdateString("city", mitarbeiter.mit_ort) success = json.UpdateString("zipcode", mitarbeiter.mit_plz) diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj index 1d09c22f..042c97b0 100644 --- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj +++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj @@ -21,7 +21,7 @@ full true true - bin\Debug\ + ..\..\..\VERAG_PROG_ALLGEMEIN\bin\Debug\ VERAG_PROG_ALLGEMEIN.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 @@ -73,67 +73,70 @@ ProgAllg.pfx - + False - ..\..\..\dll\ChillKat64\neu 2023\chilkatdotnet47-9.5.0-x64\ChilkatDotNet47.dll + F:\PROGRAMMIERUNG\dll\ChillKat64\neu 2023\chilkatdotnet47-9.5.0-x64\ChilkatDotNet47.dll - + False - ..\..\..\AVISO\Aviso\packages\ClosedXML.0.95.4\lib\net46\ClosedXML.dll + F:\PROGRAMMIERUNG\dll\closedxml\Neuer Ordner\ClosedXML.dll - + False - ..\..\..\dll\Dynamsoft\8.3.3\Dynamsoft.Forms.Viewer.dll + F:\PROGRAMMIERUNG\dll\Dynamsoft\8.3.3\Dynamsoft.Forms.Viewer.dll - + False - ..\..\..\dll\Dynamsoft\8.3.3\Dynamsoft.ImageCore.dll + F:\PROGRAMMIERUNG\dll\Dynamsoft\8.3.3\Dynamsoft.ImageCore.dll - + False - ..\..\..\dll\Dynamsoft\8.3.3\Dynamsoft.PDF.dll + F:\PROGRAMMIERUNG\dll\Dynamsoft\8.3.3\Dynamsoft.PDF.dll - + False - ..\..\..\dll\Dynamsoft\8.3.3\Dynamsoft.Twain.dll + F:\PROGRAMMIERUNG\dll\Dynamsoft\8.3.3\Dynamsoft.Twain.dll - + False - ..\..\..\dll\Dynamsoft\8.3.3\Dynamsoft.WPF.Viewer.dll + F:\PROGRAMMIERUNG\dll\Dynamsoft\8.3.3\Dynamsoft.WPF.Viewer.dll - - ..\..\..\dll\Ghostscript.NET.dll + + False + F:\PROGRAMMIERUNG\dll\Ghostscript.NET.dll + + + F:\PROGRAMMIERUNG\dll\Interop.Therefore.API.dll + True False - ..\..\..\dll\itextsharp.dll + F:\PROGRAMMIERUNG\dll\itextsharp.dll - - ..\..\..\dll\McDull.Windows.Forms.dll + + False + F:\PROGRAMMIERUNG\dll\McDull.Windows.Forms.dll - + + False True + F:\PROGRAMMIERUNG\dll\Microsoft.Office.Interop.Outlook.dll - - ..\..\..\dll\NetSpell.SpellChecker.DLL - - - ..\..\..\dll\NumericBox.dll - - - ..\..\..\dll\RichTextBoxEx.dll + + False + F:\PROGRAMMIERUNG\dll\NetSpell.SpellChecker.DLL False - ..\..\..\dll\Spire.PDF\2023\Spire.License.dll + F:\PROGRAMMIERUNG\dll\Spire.PDF\2023\Spire.License.dll - + False - ..\..\..\dll\Spire.PDF\2023\Spire.Pdf.dll + F:\PROGRAMMIERUNG\dll\Spire.PDF\2023\Spire.Pdf.dll - + False - ..\..\..\dll\Spire.PDF\2023\Spire.PdfViewer.Forms.dll + F:\PROGRAMMIERUNG\dll\Spire.PDF\2023\Spire.PdfViewer.Forms.dll @@ -1199,17 +1202,6 @@ - - - {37687F89-8603-4E42-A5F4-4FBAB011D5F3} - 3 - 0 - 0 - tlbimp - False - True - -