diff --git a/SDL/App.config b/SDL/App.config index 2b5eadde..5c9a5f0b 100644 --- a/SDL/App.config +++ b/SDL/App.config @@ -37,7 +37,7 @@ - + @@ -152,17 +152,17 @@ - - + + - - + + - - + + diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index ebcbc507..e74b065e 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -2227,7 +2227,7 @@ Public Class cFakturierung If RECHNUNG.SteuerfreierGesamtbetrag > 0 Then - desc.AddApplicableTradeTax(Convert.ToDecimal(RECHNUNG.SteuerfreierGesamtbetrag), 0, TaxTypes.VAT, TaxCategoryCodes.Z) + desc.AddApplicableTradeTax(Convert.ToDecimal(RECHNUNG.SteuerfreierGesamtbetrag), 0, 0, TaxTypes.VAT, TaxCategoryCodes.Z) End If If RECHNUNG.SteuerpflichtigerGesamtbetrag > 0 Then @@ -2596,7 +2596,7 @@ Public Class cFakturierung If Gesamt_RG_BetragSteuerfrei > 0 Then - desc.AddApplicableTradeTax(Convert.ToDecimal(Gesamt_RG_BetragSteuerfrei), 0, TaxTypes.VAT, TaxCategoryCodes.Z) + desc.AddApplicableTradeTax(Convert.ToDecimal(Gesamt_RG_BetragSteuerfrei), 0, 0, TaxTypes.VAT, TaxCategoryCodes.Z) End If If Gesamt_RG_BetragSteuerpflichtig > 0 Then @@ -2620,7 +2620,7 @@ Public Class cFakturierung Public Shared Function GetCountryCodeFromLandKZ(LandKZ As String, easi As ElectronicAddressSchemeIdentifiers) As CountryCodes - If LandKZ = "" Then Return CountryCodes.Unknown + If LandKZ = "" Then Return Nothing Dim landKZISO2 = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getISO2Land(LandKZ) Dim cc As CountryCodes @@ -2642,7 +2642,7 @@ Public Class cFakturierung Case "CZ" : cc = CountryCodes.CZ : easi = ElectronicAddressSchemeIdentifiers.CzechRepublicVatNumber Case "DK" : cc = CountryCodes.DK Case "DZ" : cc = CountryCodes.DZ - Case "ES" : cc = CountryCodes.ES + Case "ES" : cc = CountryCodes.ES : easi = ElectronicAddressSchemeIdentifiers.AgenciaEspaOlaDeAdministraciNTributaria Case "FR" : cc = CountryCodes.FR : easi = ElectronicAddressSchemeIdentifiers.FrenchVatNumber Case "FN" : cc = CountryCodes.FI Case "HR" : cc = CountryCodes.HR : easi = ElectronicAddressSchemeIdentifiers.CroatiaVatNumber @@ -2662,7 +2662,7 @@ Public Class cFakturierung Case "SK" : cc = CountryCodes.SK : easi = ElectronicAddressSchemeIdentifiers.SlovakiaVatNumber Case Else - cc = CountryCodes.Unknown + cc = Nothing End Select diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index 7439e5e4..d256e296 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -123,9 +123,11 @@ False ..\..\..\dll\SharpSSH\DiffieHellman.dll - - False - F:\PROGRAMMIERUNG\dll\OpenXML\DocumentFormat.OpenXml.dll + + ..\packages\DocumentFormat.OpenXml.3.0.1\lib\net46\DocumentFormat.OpenXml.dll + + + ..\packages\DocumentFormat.OpenXml.Framework.3.0.1\lib\net46\DocumentFormat.OpenXml.Framework.dll ..\..\..\DISPO\DISPO\packages\DS.Documents.DX.Windows.7.2.2\lib\net461\DS.Documents.DX.Windows.dll @@ -395,8 +397,8 @@ False ..\..\..\dll\RKAesIcm.dll - - ..\..\..\Aviso\AVISO\packages\ZUGFeRD-csharp.16.0.2\lib\net48\s2industries.ZUGFeRD.dll + + ..\packages\ZUGFeRD-csharp.17.4.0\lib\net48\s2industries.ZUGFeRD.dll @@ -410,11 +412,13 @@ - - ..\..\..\AVISO\Aviso\packages\System.IO.FileSystem.Primitives.4.0.1\lib\net46\System.IO.FileSystem.Primitives.dll + + ..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll + True + True - - ..\..\..\AVISO\Aviso\packages\System.IO.Packaging.4.0.0\lib\net46\System.IO.Packaging.dll + + ..\packages\System.IO.Packaging.4.5.0\lib\net46\System.IO.Packaging.dll diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.vb b/SDL/buchhaltung/frmBU_Mahnlauf.vb index 88308a30..e9c25687 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.vb @@ -570,14 +570,27 @@ Public Class frmBU_Mahnlauf rpt.txtLeistung.Text = cFakturierung.checkNull(rpt.Fields.Item("OP_Typ").Value) rpt.Label15.Text = cFakturierung.checkNull(rpt.Fields.Item("Rechnungsdatum").Value) - If (CDate(rpt.Fields.Item("Faelligkeit").Value) > CDate(Now.ToShortDateString) And cFakturierung.checkNull(rpt.Fields.Item("Ausstand").Value, 0) > 0) Or cFakturierung.checkNull(rpt.Fields.Item("Ausstand").Value, 0) <= 0 Then - rpt.Label16.Text = "" - rpt.Label15.ForeColor = Color.Black + If Not Firma_ID = 19 Then + If (CDate(rpt.Fields.Item("Faelligkeit").Value) > CDate(Now.ToShortDateString) And cFakturierung.checkNull(rpt.Fields.Item("Ausstand").Value, 0) > 0) Or cFakturierung.checkNull(rpt.Fields.Item("Ausstand").Value, 0) <= 0 Then + rpt.Label16.Text = "" + rpt.Label15.ForeColor = Color.Black + Else + rpt.Label16.Text = cFakturierung.checkNull(rpt.Fields.Item("Faelligkeit").Value) + rpt.Label15.ForeColor = Color.DarkRed + End If Else rpt.Label16.Text = cFakturierung.checkNull(rpt.Fields.Item("Faelligkeit").Value) - rpt.Label15.ForeColor = Color.DarkRed + If (CDate(rpt.Fields.Item("Faelligkeit").Value) > CDate(Now.ToShortDateString) And cFakturierung.checkNull(rpt.Fields.Item("Ausstand").Value, 0) > 0) Or cFakturierung.checkNull(rpt.Fields.Item("Ausstand").Value, 0) <= 0 Then + rpt.Label15.ForeColor = Color.Black + rpt.Label16.ForeColor = Color.Black + Else + rpt.Label15.ForeColor = Color.DarkRed + rpt.Label16.ForeColor = Color.DarkRed + End If End If + + rpt.Label17.Text = IIf(IsNumeric(cFakturierung.checkNull(rpt.Fields.Item("Rechnungsbetrag").Value)), CDbl(rpt.Fields.Item("Rechnungsbetrag").Value).ToString("N2", Globalization.CultureInfo.CurrentCulture), "") rpt.TextBox1.Text = cFakturierung.checkNull(rpt.Fields.Item("Bemerkung").Value) rpt.Label19.Text = IIf(IsNumeric(cFakturierung.checkNull(rpt.Fields.Item("Zahlung").Value)), CDbl(rpt.Fields.Item("Zahlung").Value).ToString("N2", Globalization.CultureInfo.CurrentCulture), "") diff --git a/SDL/kunden/frmGoMautBoxen_Bestellung.Designer.vb b/SDL/kunden/frmGoMautBoxen_Bestellung.Designer.vb index 61cde09b..ffd77e05 100644 --- a/SDL/kunden/frmGoMautBoxen_Bestellung.Designer.vb +++ b/SDL/kunden/frmGoMautBoxen_Bestellung.Designer.vb @@ -24,6 +24,9 @@ Partial Class frmGoMautBoxen_Bestellung Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGoMautBoxen_Bestellung)) Me.pnl = New System.Windows.Forms.Panel() + Me.lblPLZRegel = New System.Windows.Forms.Label() + Me.Label25 = New System.Windows.Forms.Label() + Me.cbxSprache = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label24 = New System.Windows.Forms.Label() Me.txtAnsprechpartner_NN = New System.Windows.Forms.TextBox() Me.txtAxles = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -84,6 +87,9 @@ Partial Class frmGoMautBoxen_Bestellung ' Me.pnl.BackColor = System.Drawing.Color.White Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnl.Controls.Add(Me.lblPLZRegel) + Me.pnl.Controls.Add(Me.Label25) + Me.pnl.Controls.Add(Me.cbxSprache) Me.pnl.Controls.Add(Me.Label24) Me.pnl.Controls.Add(Me.txtAnsprechpartner_NN) Me.pnl.Controls.Add(Me.txtAxles) @@ -143,11 +149,47 @@ Partial Class frmGoMautBoxen_Bestellung Me.pnl.Size = New System.Drawing.Size(827, 448) Me.pnl.TabIndex = 1 ' + 'lblPLZRegel + ' + Me.lblPLZRegel.AutoSize = True + Me.lblPLZRegel.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblPLZRegel.ForeColor = System.Drawing.Color.Red + Me.lblPLZRegel.Location = New System.Drawing.Point(248, 161) + Me.lblPLZRegel.Name = "lblPLZRegel" + Me.lblPLZRegel.Size = New System.Drawing.Size(0, 13) + Me.lblPLZRegel.TabIndex = 83 + ' + 'Label25 + ' + Me.Label25.AutoSize = True + Me.Label25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label25.Location = New System.Drawing.Point(515, 135) + Me.Label25.Name = "Label25" + Me.Label25.Size = New System.Drawing.Size(50, 13) + Me.Label25.TabIndex = 82 + Me.Label25.Text = "Sprache:" + ' + 'cbxSprache + ' + Me.cbxSprache._allowedValuesFreiText = Nothing + Me.cbxSprache._allowFreiText = True + Me.cbxSprache._value = "" + Me.cbxSprache.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.cbxSprache.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cbxSprache.DropDownWidth = 200 + Me.cbxSprache.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.cbxSprache.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxSprache.FormattingEnabled = True + Me.cbxSprache.Location = New System.Drawing.Point(621, 129) + Me.cbxSprache.Name = "cbxSprache" + Me.cbxSprache.Size = New System.Drawing.Size(152, 21) + Me.cbxSprache.TabIndex = 81 + ' 'Label24 ' Me.Label24.AutoSize = True Me.Label24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label24.Location = New System.Drawing.Point(509, 83) + Me.Label24.Location = New System.Drawing.Point(515, 83) Me.Label24.Name = "Label24" Me.Label24.Size = New System.Drawing.Size(56, 13) Me.Label24.TabIndex = 80 @@ -396,7 +438,7 @@ Partial Class frmGoMautBoxen_Bestellung ' Me.Label15.AutoSize = True Me.Label15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label15.Location = New System.Drawing.Point(509, 60) + Me.Label15.Location = New System.Drawing.Point(516, 61) Me.Label15.Name = "Label15" Me.Label15.Size = New System.Drawing.Size(55, 13) Me.Label15.TabIndex = 60 @@ -536,7 +578,7 @@ Partial Class frmGoMautBoxen_Bestellung Me.lblWarning.AutoSize = True Me.lblWarning.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblWarning.ForeColor = System.Drawing.Color.Red - Me.lblWarning.Location = New System.Drawing.Point(3, 8) + Me.lblWarning.Location = New System.Drawing.Point(6, 33) Me.lblWarning.Name = "lblWarning" Me.lblWarning.Size = New System.Drawing.Size(0, 13) Me.lblWarning.TabIndex = 47 @@ -589,7 +631,7 @@ Partial Class frmGoMautBoxen_Bestellung ' Me.Label13.AutoSize = True Me.Label13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label13.Location = New System.Drawing.Point(516, 11) + Me.Label13.Location = New System.Drawing.Point(513, 11) Me.Label13.Name = "Label13" Me.Label13.Size = New System.Drawing.Size(57, 13) Me.Label13.TabIndex = 31 @@ -689,7 +731,7 @@ Partial Class frmGoMautBoxen_Bestellung 'txtEmail ' Me.txtEmail.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtEmail.Location = New System.Drawing.Point(620, 125) + Me.txtEmail.Location = New System.Drawing.Point(620, 106) Me.txtEmail.MaxLength = 40 Me.txtEmail.Name = "txtEmail" Me.txtEmail.Size = New System.Drawing.Size(194, 20) @@ -699,7 +741,7 @@ Partial Class frmGoMautBoxen_Bestellung ' Me.Label11.AutoSize = True Me.Label11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label11.Location = New System.Drawing.Point(515, 128) + Me.Label11.Location = New System.Drawing.Point(515, 106) Me.Label11.Name = "Label11" Me.Label11.Size = New System.Drawing.Size(39, 13) Me.Label11.TabIndex = 29 @@ -836,4 +878,7 @@ Partial Class frmGoMautBoxen_Bestellung Friend WithEvents Label23 As Label Friend WithEvents Label24 As Label Friend WithEvents txtAnsprechpartner_NN As TextBox + Friend WithEvents Label25 As Label + Friend WithEvents cbxSprache As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents lblPLZRegel As Label End Class diff --git a/SDL/kunden/frmGoMautBoxen_Bestellung.vb b/SDL/kunden/frmGoMautBoxen_Bestellung.vb index 6d286254..f19a9445 100644 --- a/SDL/kunden/frmGoMautBoxen_Bestellung.vb +++ b/SDL/kunden/frmGoMautBoxen_Bestellung.vb @@ -1,4 +1,5 @@  +Imports javax.xml.bind.annotation Imports VERAG_PROG_ALLGEMEIN Public Class frmGoMautBoxen_Bestellung @@ -13,6 +14,7 @@ Public Class frmGoMautBoxen_Bestellung Public addnew = False Dim changed As Boolean = False Dim ready As Boolean = False + Dim Land2ISOcode As String = "" Sub New(kundenNr) @@ -43,49 +45,17 @@ Public Class frmGoMautBoxen_Bestellung lblWarning.Text = "" - If kunde Is Nothing And kundenNr < 0 Then - lblWarning.Text = "Bitte Kunden-Nr eingeben." + If Not checkValues() Then + btnNew.DialogResult = DialogResult.None Exit Sub - End If - - - If cbxKK.SelectedValue = "" Then - lblWarning.Text = "Bitte Kreditkarten-Nr eingeben." - Exit Sub - End If - - Dim licensePlate As String = txtLicensePlate.Text - - If Not String.IsNullOrEmpty(licensePlate) Then - For i As Integer = 0 To licensePlate.Length - 1 - Dim ch As Char = licensePlate(i) - If Not (Char.IsDigit(ch) OrElse (ch >= "A"c AndAlso ch <= "Z"c) OrElse ch = " "c OrElse ch = "-"c) Then - MessageBox.Show("Ungültiges Zeichen: " & ch, "Eingabeprüfung", MessageBoxButtons.OK, MessageBoxIcon.Information) - btnNew.DialogResult = DialogResult.None - Exit Sub - Exit For - End If - Next + Else + btnNew.DialogResult = DialogResult.OK End If Dim cardNum As String = cbxKK.SelectedValue - If Not String.IsNullOrEmpty(cardNum) Then - Dim mainPart As String = cardNum.Substring(0, cardNum.Length - 1) - Dim checkDigit As Char = cardNum(cardNum.Length - 1) - - If checkDigit <> fktMod10(mainPart) Then - MessageBox.Show("CardNum ungültig. Prüfziffernfehler!", "Eingabeprüfung", MessageBoxButtons.OK, MessageBoxIcon.Error) - btnNew.DialogResult = DialogResult.None - Exit Sub - End If - End If - - - btnNew.DialogResult = DialogResult.OK - txtLicensePlate.Text = txtLicensePlate.Text.ToUpper.Trim - Dim LicenseNat As String = setLand(MyComboBox3._value) + Dim LicenseNat As String = getLand(MyComboBox3._value) 'Label5.ForeColor = Color.Black 'lblErfassung.ForeColor = Color.Black @@ -100,10 +70,8 @@ Public Class frmGoMautBoxen_Bestellung LandBez = LandBez.Trim() End If - - If Not SQL.doSQL("INSERT INTO VERAG.dbo.tblGOBOXBestellungen (gb_adressNr,gb_transactionTyp,gb_company1,gb_company2,gb_companyStreet,gb_companyStreetNr,gb_companyPostalcode,gb_companyCity,gb_companyCountryISO,gb_companyCountry,gb_companyTel,gb_companyFax,gb_salutation,gb_title,gb_firstname,gb_lastname,gb_email,gb_personLanguage,gb_licensePlate,gb_licensePlateNat,gb_vehicleTyp,gb_Axles,gb_CardNum,gb_CardValidMonth,gb_CardValidYear) - VALUES (" & kunde.KundenNr & ",'" & MyComboBox1._value & "','" & txtName.Text & "','" & txtName2.Text & "','" & txtStrasse.Text & "','" & txtStasseNr.Text & "','" & txtPlz.Text & "','" & txtOrt.Text & "','" & setLand(cbxLandKz._value) & "','" & LandBez & "','" & txtTel.Text & "','" & txtFax.Text & "','" & txtAnsprechpartnerAnrede.Text & "','" & txtTitle.Text & "','" & txtAnsprechpartner_VN.Text & "','" & txtAnsprechpartner_NN.Text & "','" & txtEmail.Text & "','','" & txtLicensePlate.Text & "','" & LicenseNat & "','" & txtFahrzeugtyp.Text & "','" & txtAxles.Text & "','" & cardNum & "','" & txtMonat.Text & "','" & txtJahr.Text & "')", "FMZOLL") Then + VALUES (" & kunde.KundenNr & ",'" & MyComboBox1._value & "','" & txtName.Text & "','" & txtName2.Text & "','" & txtStrasse.Text & "','" & txtStasseNr.Text & "','" & txtPlz.Text & "','" & txtOrt.Text & "','" & getLand(cbxLandKz._value) & "','" & LandBez & "','" & txtTel.Text & "','" & txtFax.Text & "','" & txtAnsprechpartnerAnrede.Text & "','" & txtTitle.Text & "','" & txtAnsprechpartner_VN.Text & "','" & txtAnsprechpartner_NN.Text & "','" & txtEmail.Text & "','','" & txtLicensePlate.Text & "','" & LicenseNat & "','" & txtFahrzeugtyp.Text & "','" & txtAxles.Text & "','" & cardNum & "','" & txtMonat.Text & "','" & txtJahr.Text & "')", "FMZOLL") Then MsgBox("Fehler beim Anlegen!") Else MsgBox("Bestellung wurde angelegt!") @@ -159,15 +127,6 @@ Public Class frmGoMautBoxen_Bestellung End Sub - - Sub BindingTableColumnChanged(sender As Object, e As System.Data.DataColumnChangeEventArgs) - If ready Then - lblSachbearb.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME - lblAenderung.Text = Now.ToString("dd.MM.yyyy HH:mm") - changed = True - End If - End Sub - Private Function fktMod10(ByVal number As String) As Char Dim sum As Integer = 0 Dim doubleDigit As Boolean = True @@ -210,17 +169,25 @@ Public Class frmGoMautBoxen_Bestellung Private Sub frmLKWDetails_Load(sender As Object, e As EventArgs) Handles Me.Load - 'TODO: wieder aktivierten!!! - 'If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MAUTBOXEN_bearbeiten", Me) Then - ' MsgBox("Keine Berechtigung!") - ' Me.Close() - 'End If + If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_MAUTBOXEN_bearbeiten", Me) Then + MsgBox("Keine Berechtigung!") + Me.Close() + End If KdSearchBox1.initKdBox(Me) - MyComboBox1.Items.Add(New MyListItem("N", "N")) + MyComboBox1.Items.Add(New MyListItem("N", "N")) '"N" -> Neue Bestellung MyComboBox1.changeItem("N") + cbxSprache.Items.Add(New MyListItem("", "")) + cbxSprache.Items.Add(New MyListItem("deutsch", "DE")) + cbxSprache.Items.Add(New MyListItem("englisch", "EN")) + cbxSprache.Items.Add(New MyListItem("italienisch", "IT")) + cbxSprache.Items.Add(New MyListItem("kroatisch", "HR")) + cbxSprache.Items.Add(New MyListItem("tschechisch", "CZ")) + cbxSprache.Items.Add(New MyListItem("ungarisch", "HU")) + MyComboBox1.changeItem("") + If kundenNr > 0 Then Me.KdSearchBox1.KdNr = kundenNr KdSearchBox1.Enabled = False @@ -242,6 +209,132 @@ Public Class frmGoMautBoxen_Bestellung initKunde() End Sub + Private Sub setDefaultValues() + + 'Anzahl der Achsen des Zugfahrzeuges. Fahrzeuge mit mehr als 4 Achsen sind mit 4 zu deklarieren. + If txtAxles.Text = "" Then + txtAxles.Text = "2" + End If + + 'Fahrzeugtyp (Busse und Wohnmobile sind als "Bus", alle anderen mautpflichtigen Fahrzeuge als "LKW" zu deklarieren). + If txtFahrzeugtyp.Text = "" Then + txtFahrzeugtyp.Text = "LKW" + End If + + 'Firmenadresse: Strasse; Sollte es keine Strasseninformation geben, so ist dieses Feld mit einem "-" zu füllen. + If txtStrasse.Text = "" Then + txtStrasse.Text = "-" + End If + + 'Firmenadresse: Hausnummer; Sollte es keine Hausnummer geben, so ist dieses Feld mit einem "-" zu füllen. + If txtStasseNr.Text = "" Then + txtStasseNr.Text = "-" + End If + + + End Sub + + Private Function checkValues() As Boolean + + If kunde Is Nothing And kundenNr < 0 Then + lblWarning.Text = "Bitte Kunden-Nr eingeben." + Return False + End If + + + If cbxKK.SelectedValue = "" Then + lblWarning.Text = "Bitte Kreditkarten-Nr eingeben." + Return False + End If + + + Dim PLZRegel As Integer = 0 + Select Case Land2ISOcode + Case "BE" : PLZRegel = 2 + Case "DZ", "DK", "DE", "FI", "FR", "GR", "IR", "IS", "IT", "HR", "KW", "LI", "LU", "MC", "NO", "AT", "RU", "CH", "RS", "SI", "ES", "TN", "TR", "UA", "HU", "CY" : PLZRegel = 4 + Case "GB" : PLZRegel = 5 + Case "NL", "PL", "PT", "SE", "SK", "CZ" : PLZRegel = 9 + + End Select + + 'PLZ-Regel PLZ-RegelBeschreibung + '1 Maximale Länge; keine Leerzeichen + '2 Numerisch; Maximale Länge; keine Leerzeichen + '3 Exakte Länge; keine Leerzeichen + '4 Numerisch; exakte Länge; keine Leerzeichen + '5 Maximale Länge + '6 Numerisch; maximale Länge + '7 Exakte Länge + '8 Numerisch; exakte Länge + '9 Länder-spezifisch (siehe PostleitzahlFormat) + + Dim laengePLZ As Integer = 0 + + Select Case Land2ISOcode + + Case "IS" : laengePLZ = 3 + Case "BE", "DK", "LI", "LU", "NO", "AT", "CH", "SI", "TN", "HU", "CY" : laengePLZ = 4 + Case "DZ", "DE", "FI", "FR", "GR", "IR", "IL", "IT", "HR", "KW", "MC", "RS", "ES", "TR", "UA" : laengePLZ = 5 + Case "NL", "PL", "RU", "SE", "SK", "CZ" : laengePLZ = 6 + Case "PT" : laengePLZ = 8 + Case "GB" : laengePLZ = 9 + End Select + + + Dim PLZFormat As String = "" + If PLZRegel = 9 Then + Select Case Land2ISOcode + Case "NL" : PLZFormat = "NNNN AA" + Case "PL" : PLZFormat = "NN-NNN" + Case "PT" : PLZFormat = "NNNN NNN oder NNNN" + Case "SE", "SK", "CZ" : PLZFormat = "NNN NN" + End Select + ElseIf PLZRegel = 2 Then + lblPLZRegel.Text = "Numerisch; keine LZ Max. Länge: " & laengePLZ + ElseIf PLZRegel = 4 Then + lblPLZRegel.Text = " Numerisch; keine LZ, genaue Länge: " & laengePLZ + ElseIf PLZRegel = 5 Then + lblPLZRegel.Text = "Max. Länge: " & laengePLZ + End If + + If PLZFormat <> "" Then lblPLZRegel.Text &= PLZFormat + + If txtPlz.Text <> "" AndAlso txtPlz.Text <> "-" Then + If laengePLZ > 0 AndAlso (txtPlz.Text.Length <> laengePLZ AndAlso PLZRegel = 4) OrElse (txtPlz.Text.Length > laengePLZ AndAlso (PLZRegel = 2 OrElse PLZRegel = 5)) Then + lblWarning.Text = "Die PLZ für " & Land2ISOcode & IIf(PLZRegel = 2 Or PLZRegel = 5, " darf max. ", " muss genau ") & laengePLZ & " Stellen besitzen!" + Return False + End If + End If + + Dim licensePlate As String = txtLicensePlate.Text + + If Not String.IsNullOrEmpty(licensePlate) Then + For i As Integer = 0 To licensePlate.Length - 1 + Dim ch As Char = licensePlate(i) + If Not (Char.IsDigit(ch) OrElse (ch >= "A"c AndAlso ch <= "Z"c) OrElse ch = " "c OrElse ch = "-"c) Then + MessageBox.Show("Ungültiges Zeichen: " & ch, "Eingabeprüfung", MessageBoxButtons.OK, MessageBoxIcon.Information) + Return False + Exit For + + End If + Next + End If + + Dim cardNum As String = cbxKK.SelectedValue + + If Not String.IsNullOrEmpty(cardNum) Then + Dim mainPart As String = cardNum.Substring(0, cardNum.Length - 1) + Dim checkDigit As Char = cardNum(cardNum.Length - 1) + + If checkDigit <> fktMod10(mainPart) Then + MessageBox.Show("CardNum ungültig. Prüfziffernfehler!", "Eingabeprüfung", MessageBoxButtons.OK, MessageBoxIcon.Error) + Return False + End If + End If + + Return True + End Function + Private Sub initKunde() @@ -292,16 +385,16 @@ Public Class frmGoMautBoxen_Bestellung End If End If - If cbxLandKz.SelectedValue <> "" Then setLand(cbxLandKz.SelectedValue) - + If cbxLandKz._value <> "" Then getLand(cbxLandKz._value, True) + setDefaultValues() End Sub - Private Function setLand(landkz As String) As String + Private Function getLand(landkz As String, Optional setISO2Global As Boolean = False) As String - Dim LandISO2 + Dim LandISO2 As String = "" If landkz.Length = 2 Then LandISO2 = landkz ElseIf landkz.Length = 3 Then @@ -310,6 +403,11 @@ Public Class frmGoMautBoxen_Bestellung LandISO2 = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getISO2LandFromISO1Land(landkz) End If + If setISO2Global Then + Land2ISOcode = LandISO2 + + End If + Return LandISO2 'MyComboBox3.changeItem(LandISO2) 'License plate Nationality @@ -368,6 +466,11 @@ Public Class frmGoMautBoxen_Bestellung End Sub + Private Sub cbxLandKz_SelectedValueChanged(sender As Object, e As EventArgs) Handles cbxLandKz.SelectedValueChanged + If cbxLandKz._value <> "" Then getLand(cbxLandKz._value, True) + lblPLZRegel.Text = "" + End Sub + '------------------------------------------------------------------------------------------------------------------------------------------------------------- '------------------------------------------------------------------------------------------------------------------------------------------------------------- '------------------------------------------------------------------------------------------------------------------------------------------------------------- diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index a1ce2e52..7a5acc48 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -53,7 +53,6 @@ Partial Class frmKundenblatt Me.txtInfotext = New System.Windows.Forms.Label() Me.tbFirmendaten = New System.Windows.Forms.TabPage() Me.Panel4 = New System.Windows.Forms.Panel() - Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull() Me.tbcntrMain = New System.Windows.Forms.TabControl() Me.tbAllgemein = New System.Windows.Forms.TabPage() Me.FlatButton6 = New VERAG_PROG_ALLGEMEIN.FlatButton() @@ -150,10 +149,8 @@ Partial Class frmKundenblatt Me.lblLetzterSA_SDL = New System.Windows.Forms.Label() Me.rtbVermerke = New System.Windows.Forms.RichTextBox() Me.tbSDLKarten = New System.Windows.Forms.TabPage() - Me.usrcntlKarten = New SDL.usrCntlKartenDaten() Me.tbLKW = New System.Windows.Forms.TabPage() Me.pnlLKWRight = New System.Windows.Forms.Panel() - Me.UsrCntlLKW1 = New SDL.usrCntlLKW() Me.pnlLKW = New System.Windows.Forms.Panel() Me.dgvLKW = New System.Windows.Forms.DataGridView() Me.pnlLKWBottom = New System.Windows.Forms.Panel() @@ -185,7 +182,6 @@ Partial Class frmKundenblatt Me.tbBesuchsberichte = New System.Windows.Forms.TabPage() Me.tbFremdrechnungen = New System.Windows.Forms.TabPage() Me.tbOfferte = New System.Windows.Forms.TabPage() - Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte() Me.tbUSTV = New System.Windows.Forms.TabPage() Me.tbcntrUSTV = New System.Windows.Forms.TabControl() Me.tbUSTVDokumente = New System.Windows.Forms.TabPage() @@ -196,7 +192,6 @@ Partial Class frmKundenblatt Me.scanUSTVFABest = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() Me.scanUSTVVollmachten = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() Me.tbUSTVAntrage = New System.Windows.Forms.TabPage() - Me.UsrCntlUSTV = New SDL.usrCntlUSTV() Me.tbFIBU = New System.Windows.Forms.TabPage() Me.lblZNB_verrechnet = New System.Windows.Forms.Label() Me.lblZNB_offen = New System.Windows.Forms.Label() @@ -246,6 +241,11 @@ Partial Class frmKundenblatt Me.tbiKartenverwaltung = New System.Windows.Forms.ToolStripMenuItem() Me.tbiLKW = New System.Windows.Forms.ToolStripMenuItem() Me.tbiVERAGCard = New System.Windows.Forms.ToolStripMenuItem() + Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull() + Me.usrcntlKarten = New SDL.usrCntlKartenDaten() + Me.UsrCntlLKW1 = New SDL.usrCntlLKW() + Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte() + Me.UsrCntlUSTV = New SDL.usrCntlUSTV() Me.pnlInfo.SuspendLayout() Me.tbFirmendaten.SuspendLayout() Me.Panel4.SuspendLayout() @@ -334,7 +334,7 @@ Partial Class frmKundenblatt Me.tbFirmendaten.Location = New System.Drawing.Point(4, 25) Me.tbFirmendaten.Name = "tbFirmendaten" Me.tbFirmendaten.Padding = New System.Windows.Forms.Padding(3) - Me.tbFirmendaten.Size = New System.Drawing.Size(1644, 1492) + Me.tbFirmendaten.Size = New System.Drawing.Size(1644, 1509) Me.tbFirmendaten.TabIndex = 3 Me.tbFirmendaten.Text = "Firmendaten" ' @@ -344,19 +344,9 @@ Partial Class frmKundenblatt Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel4.Location = New System.Drawing.Point(3, 3) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(1638, 1486) + Me.Panel4.Size = New System.Drawing.Size(1638, 1503) Me.Panel4.TabIndex = 0 ' - 'UsrcntlKundeBearbeitenFull1 - ' - Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White - Me.UsrcntlKundeBearbeitenFull1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0) - Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1" - Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1638, 1486) - Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0 - ' 'tbcntrMain ' Me.tbcntrMain.Appearance = System.Windows.Forms.TabAppearance.FlatButtons @@ -374,7 +364,7 @@ Partial Class frmKundenblatt Me.tbcntrMain.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrMain.Name = "tbcntrMain" Me.tbcntrMain.SelectedIndex = 0 - Me.tbcntrMain.Size = New System.Drawing.Size(1652, 1521) + Me.tbcntrMain.Size = New System.Drawing.Size(1652, 1538) Me.tbcntrMain.TabIndex = 3 ' 'tbAllgemein @@ -600,7 +590,7 @@ Partial Class frmKundenblatt Me.TabPage2.Location = New System.Drawing.Point(4, 22) Me.TabPage2.Name = "TabPage2" Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(710, 878) + Me.TabPage2.Size = New System.Drawing.Size(710, 895) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Umsatzbericht" Me.TabPage2.UseVisualStyleBackColor = True @@ -645,7 +635,7 @@ Partial Class frmKundenblatt Me.dgvUmsaetze.RowHeadersDefaultCellStyle = DataGridViewCellStyle8 Me.dgvUmsaetze.RowHeadersVisible = False Me.dgvUmsaetze.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 850) + Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 884) Me.dgvUmsaetze.TabIndex = 182 ' 'Label13 @@ -693,7 +683,7 @@ Partial Class frmKundenblatt Me.TabPage3.Controls.Add(Me.dgvUmsatzNachLeistngsNr) Me.TabPage3.Location = New System.Drawing.Point(4, 22) Me.TabPage3.Name = "TabPage3" - Me.TabPage3.Size = New System.Drawing.Size(710, 878) + Me.TabPage3.Size = New System.Drawing.Size(710, 895) Me.TabPage3.TabIndex = 2 Me.TabPage3.Text = "Umsatz nach LeistungsNr" Me.TabPage3.UseVisualStyleBackColor = True @@ -749,7 +739,7 @@ Partial Class frmKundenblatt Me.dgvUmsatzNachLeistngsNr.RowHeadersDefaultCellStyle = DataGridViewCellStyle12 Me.dgvUmsatzNachLeistngsNr.RowHeadersVisible = False Me.dgvUmsatzNachLeistngsNr.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvUmsatzNachLeistngsNr.Size = New System.Drawing.Size(705, 889) + Me.dgvUmsatzNachLeistngsNr.Size = New System.Drawing.Size(705, 923) Me.dgvUmsatzNachLeistngsNr.TabIndex = 183 ' 'lblAdressenzusatz @@ -1164,7 +1154,7 @@ Partial Class frmKundenblatt Me.tbZoll.Location = New System.Drawing.Point(4, 25) Me.tbZoll.Name = "tbZoll" Me.tbZoll.Padding = New System.Windows.Forms.Padding(3) - Me.tbZoll.Size = New System.Drawing.Size(1644, 1492) + Me.tbZoll.Size = New System.Drawing.Size(1644, 1509) Me.tbZoll.TabIndex = 9 Me.tbZoll.Text = "ZOLL" Me.tbZoll.UseVisualStyleBackColor = True @@ -1176,7 +1166,7 @@ Partial Class frmKundenblatt Me.tbcntrZOLL.Location = New System.Drawing.Point(3, 3) Me.tbcntrZOLL.Name = "tbcntrZOLL" Me.tbcntrZOLL.SelectedIndex = 0 - Me.tbcntrZOLL.Size = New System.Drawing.Size(1638, 1486) + Me.tbcntrZOLL.Size = New System.Drawing.Size(1638, 1503) Me.tbcntrZOLL.TabIndex = 0 ' 'tabZoll_Artikel @@ -1184,7 +1174,7 @@ Partial Class frmKundenblatt Me.tabZoll_Artikel.Location = New System.Drawing.Point(4, 22) Me.tabZoll_Artikel.Name = "tabZoll_Artikel" Me.tabZoll_Artikel.Padding = New System.Windows.Forms.Padding(3) - Me.tabZoll_Artikel.Size = New System.Drawing.Size(1630, 1460) + Me.tabZoll_Artikel.Size = New System.Drawing.Size(1630, 1477) Me.tabZoll_Artikel.TabIndex = 1 Me.tabZoll_Artikel.Text = "Artikel" Me.tabZoll_Artikel.UseVisualStyleBackColor = True @@ -1195,7 +1185,7 @@ Partial Class frmKundenblatt Me.tbMdm.Location = New System.Drawing.Point(4, 25) Me.tbMdm.Name = "tbMdm" Me.tbMdm.Padding = New System.Windows.Forms.Padding(3) - Me.tbMdm.Size = New System.Drawing.Size(1644, 1492) + Me.tbMdm.Size = New System.Drawing.Size(1644, 1509) Me.tbMdm.TabIndex = 10 Me.tbMdm.Text = "MDM" Me.tbMdm.UseVisualStyleBackColor = True @@ -1214,7 +1204,7 @@ Partial Class frmKundenblatt Me.tbcntrMDM.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrMDM.Name = "tbcntrMDM" Me.tbcntrMDM.SelectedIndex = 0 - Me.tbcntrMDM.Size = New System.Drawing.Size(1638, 1486) + Me.tbcntrMDM.Size = New System.Drawing.Size(1638, 1503) Me.tbcntrMDM.TabIndex = 0 ' 'tbSDL @@ -1226,7 +1216,7 @@ Partial Class frmKundenblatt Me.tbSDL.Margin = New System.Windows.Forms.Padding(0) Me.tbSDL.Name = "tbSDL" Me.tbSDL.Padding = New System.Windows.Forms.Padding(3) - Me.tbSDL.Size = New System.Drawing.Size(1630, 1460) + Me.tbSDL.Size = New System.Drawing.Size(1630, 1477) Me.tbSDL.TabIndex = 5 Me.tbSDL.Text = "SDL-Leistungen" Me.tbSDL.UseVisualStyleBackColor = True @@ -1268,7 +1258,7 @@ Partial Class frmKundenblatt DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] Me.dgvSDLLeistungenFull.RowHeadersDefaultCellStyle = DataGridViewCellStyle21 Me.dgvSDLLeistungenFull.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1624, 1264) + Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1624, 1281) Me.dgvSDLLeistungenFull.TabIndex = 5 ' 'Panel6 @@ -1374,7 +1364,7 @@ Partial Class frmKundenblatt Me.Panel5.Controls.Add(Me.lblLetzterSA_SDL) Me.Panel5.Controls.Add(Me.rtbVermerke) Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel5.Location = New System.Drawing.Point(3, 1314) + Me.Panel5.Location = New System.Drawing.Point(3, 1331) Me.Panel5.Name = "Panel5" Me.Panel5.Size = New System.Drawing.Size(1624, 143) Me.Panel5.TabIndex = 177 @@ -1768,21 +1758,11 @@ Partial Class frmKundenblatt Me.tbSDLKarten.Location = New System.Drawing.Point(4, 22) Me.tbSDLKarten.Name = "tbSDLKarten" Me.tbSDLKarten.Padding = New System.Windows.Forms.Padding(3) - Me.tbSDLKarten.Size = New System.Drawing.Size(178, 39) + Me.tbSDLKarten.Size = New System.Drawing.Size(1630, 1477) Me.tbSDLKarten.TabIndex = 7 Me.tbSDLKarten.Text = "SDL-Kartenverwaltung" Me.tbSDLKarten.UseVisualStyleBackColor = True ' - 'usrcntlKarten - ' - Me.usrcntlKarten.Cursor = System.Windows.Forms.Cursors.Default - Me.usrcntlKarten.Dock = System.Windows.Forms.DockStyle.Fill - Me.usrcntlKarten.Location = New System.Drawing.Point(3, 3) - Me.usrcntlKarten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.usrcntlKarten.Name = "usrcntlKarten" - Me.usrcntlKarten.Size = New System.Drawing.Size(172, 33) - Me.usrcntlKarten.TabIndex = 0 - ' 'tbLKW ' Me.tbLKW.Controls.Add(Me.pnlLKWRight) @@ -1790,7 +1770,7 @@ Partial Class frmKundenblatt Me.tbLKW.Location = New System.Drawing.Point(4, 22) Me.tbLKW.Name = "tbLKW" Me.tbLKW.Padding = New System.Windows.Forms.Padding(3) - Me.tbLKW.Size = New System.Drawing.Size(178, 39) + Me.tbLKW.Size = New System.Drawing.Size(1630, 1477) Me.tbLKW.TabIndex = 4 Me.tbLKW.Text = "LKWs" Me.tbLKW.UseVisualStyleBackColor = True @@ -1802,22 +1782,9 @@ Partial Class frmKundenblatt Me.pnlLKWRight.Location = New System.Drawing.Point(309, 3) Me.pnlLKWRight.Name = "pnlLKWRight" Me.pnlLKWRight.Padding = New System.Windows.Forms.Padding(10, 0, 0, 0) - Me.pnlLKWRight.Size = New System.Drawing.Size(0, 33) + Me.pnlLKWRight.Size = New System.Drawing.Size(1318, 1454) Me.pnlLKWRight.TabIndex = 2 ' - 'UsrCntlLKW1 - ' - Me.UsrCntlLKW1.BackColor = System.Drawing.Color.White - Me.UsrCntlLKW1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.UsrCntlLKW1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.UsrCntlLKW1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlLKW1.Location = New System.Drawing.Point(10, 0) - Me.UsrCntlLKW1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.UsrCntlLKW1.MaximumSize = New System.Drawing.Size(1200, 1000) - Me.UsrCntlLKW1.Name = "UsrCntlLKW1" - Me.UsrCntlLKW1.Size = New System.Drawing.Size(0, 33) - Me.UsrCntlLKW1.TabIndex = 0 - ' 'pnlLKW ' Me.pnlLKW.Controls.Add(Me.dgvLKW) @@ -1826,7 +1793,7 @@ Partial Class frmKundenblatt Me.pnlLKW.Dock = System.Windows.Forms.DockStyle.Left Me.pnlLKW.Location = New System.Drawing.Point(3, 3) Me.pnlLKW.Name = "pnlLKW" - Me.pnlLKW.Size = New System.Drawing.Size(306, 33) + Me.pnlLKW.Size = New System.Drawing.Size(306, 1454) Me.pnlLKW.TabIndex = 3 ' 'dgvLKW @@ -1867,7 +1834,7 @@ Partial Class frmKundenblatt Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle25 Me.dgvLKW.RowHeadersVisible = False Me.dgvLKW.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvLKW.Size = New System.Drawing.Size(306, 0) + Me.dgvLKW.Size = New System.Drawing.Size(306, 1280) Me.dgvLKW.TabIndex = 2 ' 'pnlLKWBottom @@ -1879,7 +1846,7 @@ Partial Class frmKundenblatt Me.pnlLKWBottom.Controls.Add(Me.Button13) Me.pnlLKWBottom.Controls.Add(Me.lblErgebnisse) Me.pnlLKWBottom.Dock = System.Windows.Forms.DockStyle.Bottom - Me.pnlLKWBottom.Location = New System.Drawing.Point(0, -79) + Me.pnlLKWBottom.Location = New System.Drawing.Point(0, 1342) Me.pnlLKWBottom.Name = "pnlLKWBottom" Me.pnlLKWBottom.Size = New System.Drawing.Size(306, 112) Me.pnlLKWBottom.TabIndex = 3 @@ -2020,7 +1987,7 @@ Partial Class frmKundenblatt Me.tbVERAGCard.Location = New System.Drawing.Point(4, 22) Me.tbVERAGCard.Name = "tbVERAGCard" Me.tbVERAGCard.Padding = New System.Windows.Forms.Padding(3) - Me.tbVERAGCard.Size = New System.Drawing.Size(178, 39) + Me.tbVERAGCard.Size = New System.Drawing.Size(1630, 1477) Me.tbVERAGCard.TabIndex = 6 Me.tbVERAGCard.Text = "VERAG Card" Me.tbVERAGCard.UseVisualStyleBackColor = True @@ -2032,7 +1999,7 @@ Partial Class frmKundenblatt Me.Panel3.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel3.Location = New System.Drawing.Point(3, 3) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(172, 33) + Me.Panel3.Size = New System.Drawing.Size(1624, 1454) Me.Panel3.TabIndex = 0 ' 'tbDokumente @@ -2050,7 +2017,7 @@ Partial Class frmKundenblatt Me.tbDokumente.Controls.Add(Me.scanVertragVeragKd) Me.tbDokumente.Location = New System.Drawing.Point(4, 22) Me.tbDokumente.Name = "tbDokumente" - Me.tbDokumente.Size = New System.Drawing.Size(178, 39) + Me.tbDokumente.Size = New System.Drawing.Size(1630, 1477) Me.tbDokumente.TabIndex = 8 Me.tbDokumente.Text = "Dokumente" Me.tbDokumente.UseVisualStyleBackColor = True @@ -2250,7 +2217,7 @@ Partial Class frmKundenblatt Me.tbBesuchsberichte.Location = New System.Drawing.Point(4, 22) Me.tbBesuchsberichte.Name = "tbBesuchsberichte" Me.tbBesuchsberichte.Padding = New System.Windows.Forms.Padding(3) - Me.tbBesuchsberichte.Size = New System.Drawing.Size(178, 39) + Me.tbBesuchsberichte.Size = New System.Drawing.Size(1630, 1477) Me.tbBesuchsberichte.TabIndex = 9 Me.tbBesuchsberichte.Text = "Besuchsberichte" Me.tbBesuchsberichte.UseVisualStyleBackColor = True @@ -2259,7 +2226,7 @@ Partial Class frmKundenblatt ' Me.tbFremdrechnungen.Location = New System.Drawing.Point(4, 22) Me.tbFremdrechnungen.Name = "tbFremdrechnungen" - Me.tbFremdrechnungen.Size = New System.Drawing.Size(178, 39) + Me.tbFremdrechnungen.Size = New System.Drawing.Size(1630, 1477) Me.tbFremdrechnungen.TabIndex = 10 Me.tbFremdrechnungen.Text = "Fremdrechnungen" Me.tbFremdrechnungen.UseVisualStyleBackColor = True @@ -2270,27 +2237,17 @@ Partial Class frmKundenblatt Me.tbOfferte.Location = New System.Drawing.Point(4, 25) Me.tbOfferte.Margin = New System.Windows.Forms.Padding(2) Me.tbOfferte.Name = "tbOfferte" - Me.tbOfferte.Size = New System.Drawing.Size(1644, 1492) + Me.tbOfferte.Size = New System.Drawing.Size(1644, 1509) Me.tbOfferte.TabIndex = 11 Me.tbOfferte.Text = "Offerte" Me.tbOfferte.UseVisualStyleBackColor = True ' - 'UsrCntlOfferte1 - ' - Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White - Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0) - Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1) - Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" - Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1644, 1492) - Me.UsrCntlOfferte1.TabIndex = 0 - ' 'tbUSTV ' Me.tbUSTV.Controls.Add(Me.tbcntrUSTV) Me.tbUSTV.Location = New System.Drawing.Point(4, 25) Me.tbUSTV.Name = "tbUSTV" - Me.tbUSTV.Size = New System.Drawing.Size(1644, 1492) + Me.tbUSTV.Size = New System.Drawing.Size(1644, 1509) Me.tbUSTV.TabIndex = 12 Me.tbUSTV.Text = "USTV" Me.tbUSTV.UseVisualStyleBackColor = True @@ -2304,7 +2261,7 @@ Partial Class frmKundenblatt Me.tbcntrUSTV.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrUSTV.Name = "tbcntrUSTV" Me.tbcntrUSTV.SelectedIndex = 0 - Me.tbcntrUSTV.Size = New System.Drawing.Size(1644, 1492) + Me.tbcntrUSTV.Size = New System.Drawing.Size(1644, 1509) Me.tbcntrUSTV.TabIndex = 1 ' 'tbUSTVDokumente @@ -2317,7 +2274,7 @@ Partial Class frmKundenblatt Me.tbUSTVDokumente.Controls.Add(Me.scanUSTVVollmachten) Me.tbUSTVDokumente.Location = New System.Drawing.Point(4, 22) Me.tbUSTVDokumente.Name = "tbUSTVDokumente" - Me.tbUSTVDokumente.Size = New System.Drawing.Size(1636, 1466) + Me.tbUSTVDokumente.Size = New System.Drawing.Size(1636, 1483) Me.tbUSTVDokumente.TabIndex = 8 Me.tbUSTVDokumente.Text = "Dokumente" Me.tbUSTVDokumente.UseVisualStyleBackColor = True @@ -2418,19 +2375,11 @@ Partial Class frmKundenblatt Me.tbUSTVAntrage.Location = New System.Drawing.Point(4, 22) Me.tbUSTVAntrage.Name = "tbUSTVAntrage" Me.tbUSTVAntrage.Padding = New System.Windows.Forms.Padding(3) - Me.tbUSTVAntrage.Size = New System.Drawing.Size(184, 45) + Me.tbUSTVAntrage.Size = New System.Drawing.Size(1636, 1483) Me.tbUSTVAntrage.TabIndex = 9 Me.tbUSTVAntrage.Text = "USTV-Anträge" Me.tbUSTVAntrage.UseVisualStyleBackColor = True ' - 'UsrCntlUSTV - ' - Me.UsrCntlUSTV.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlUSTV.Location = New System.Drawing.Point(3, 3) - Me.UsrCntlUSTV.Name = "UsrCntlUSTV" - Me.UsrCntlUSTV.Size = New System.Drawing.Size(178, 39) - Me.UsrCntlUSTV.TabIndex = 0 - ' 'tbFIBU ' Me.tbFIBU.Controls.Add(Me.lblZNB_verrechnet) @@ -2448,7 +2397,7 @@ Partial Class frmKundenblatt Me.tbFIBU.Controls.Add(Me.txtFIBUKuerzel) Me.tbFIBU.Location = New System.Drawing.Point(4, 25) Me.tbFIBU.Name = "tbFIBU" - Me.tbFIBU.Size = New System.Drawing.Size(1644, 1492) + Me.tbFIBU.Size = New System.Drawing.Size(1644, 1509) Me.tbFIBU.TabIndex = 13 Me.tbFIBU.Text = "FIBU" Me.tbFIBU.UseVisualStyleBackColor = True @@ -2562,7 +2511,7 @@ Partial Class frmKundenblatt ' Me.btnFirmendatenFormularSpeichern.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnFirmendatenFormularSpeichern.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnFirmendatenFormularSpeichern.Location = New System.Drawing.Point(-1422, 3) + Me.btnFirmendatenFormularSpeichern.Location = New System.Drawing.Point(-2874, 3) Me.btnFirmendatenFormularSpeichern.Name = "btnFirmendatenFormularSpeichern" Me.btnFirmendatenFormularSpeichern.Size = New System.Drawing.Size(71, 52) Me.btnFirmendatenFormularSpeichern.TabIndex = 17 @@ -2594,7 +2543,7 @@ Partial Class frmKundenblatt Me.tbRechnungen.Controls.Add(Me.MyPanel1) Me.tbRechnungen.Location = New System.Drawing.Point(4, 25) Me.tbRechnungen.Name = "tbRechnungen" - Me.tbRechnungen.Size = New System.Drawing.Size(1644, 1492) + Me.tbRechnungen.Size = New System.Drawing.Size(1644, 1509) Me.tbRechnungen.TabIndex = 14 Me.tbRechnungen.Text = "Rechnungen" Me.tbRechnungen.UseVisualStyleBackColor = True @@ -2613,7 +2562,7 @@ Partial Class frmKundenblatt Me.dgvRg.ReadOnly = True Me.dgvRg.RowHeadersVisible = False Me.dgvRg.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvRg.Size = New System.Drawing.Size(1644, 1432) + Me.dgvRg.Size = New System.Drawing.Size(1644, 1449) Me.dgvRg.TabIndex = 3 ' 'MyPanel1 @@ -2840,7 +2789,7 @@ Partial Class frmKundenblatt ' Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24) Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM" - Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8 + Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4 Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4) Me.cntxtCntxtMDM.Text = "cntxtMDM" ' @@ -3002,13 +2951,64 @@ Partial Class frmKundenblatt Me.tbiVERAGCard.Size = New System.Drawing.Size(186, 22) Me.tbiVERAGCard.Text = "VERAG Card" ' + 'UsrcntlKundeBearbeitenFull1 + ' + Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White + Me.UsrcntlKundeBearbeitenFull1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0) + Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1" + Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1638, 1503) + Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0 + ' + 'usrcntlKarten + ' + Me.usrcntlKarten.Cursor = System.Windows.Forms.Cursors.Default + Me.usrcntlKarten.Dock = System.Windows.Forms.DockStyle.Fill + Me.usrcntlKarten.Location = New System.Drawing.Point(3, 3) + Me.usrcntlKarten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.usrcntlKarten.Name = "usrcntlKarten" + Me.usrcntlKarten.Size = New System.Drawing.Size(1624, 1454) + Me.usrcntlKarten.TabIndex = 0 + ' + 'UsrCntlLKW1 + ' + Me.UsrCntlLKW1.BackColor = System.Drawing.Color.White + Me.UsrCntlLKW1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.UsrCntlLKW1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.UsrCntlLKW1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlLKW1.Location = New System.Drawing.Point(10, 0) + Me.UsrCntlLKW1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.UsrCntlLKW1.MaximumSize = New System.Drawing.Size(1200, 1000) + Me.UsrCntlLKW1.Name = "UsrCntlLKW1" + Me.UsrCntlLKW1.Size = New System.Drawing.Size(1200, 1000) + Me.UsrCntlLKW1.TabIndex = 0 + ' + 'UsrCntlOfferte1 + ' + Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White + Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0) + Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1) + Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" + Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1644, 1509) + Me.UsrCntlOfferte1.TabIndex = 0 + ' + 'UsrCntlUSTV + ' + Me.UsrCntlUSTV.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlUSTV.Location = New System.Drawing.Point(3, 3) + Me.UsrCntlUSTV.Name = "UsrCntlUSTV" + Me.UsrCntlUSTV.Size = New System.Drawing.Size(1630, 1460) + Me.UsrCntlUSTV.TabIndex = 0 + ' 'frmKundenblatt ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScroll = True Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(1651, 1650) + Me.ClientSize = New System.Drawing.Size(1651, 1667) Me.Controls.Add(Me.lblAbfVerb) Me.Controls.Add(Me.btnAbfVerb) Me.Controls.Add(Me.tbcntrMain) diff --git a/SDL/kunden/frmKundenblatt.vb b/SDL/kunden/frmKundenblatt.vb index bf93e619..10ba0c73 100644 --- a/SDL/kunden/frmKundenblatt.vb +++ b/SDL/kunden/frmKundenblatt.vb @@ -2580,7 +2580,7 @@ Public Class frmKundenblatt 'CSV erzeugen: Dim SQL_String As String = "Select Top(1) 'S' As [Transaction Type], ''As Company1, ' ' As Company2, ' ' As CompanyStreet, ' ' As CompanyNumber, ' ' As CompanyCode, ' ' As CompanyCity, ' ' As CompanyCountry, ' ' As CompanyCountryAbbr, ' ' As CompanyTelephone, ' ' As CompanyTelefax, ' ' As Salutation, ' ' As Title, ' ' As FirstName, ' ' As LastName, ' ' As Email, ' ' As PersonLanguage, ' ' As [License plate], ' ' As [License plate Nationality], ' ' As VehicleType, ' ' As Axles, ' ' As [Stammnummer For Tripon Orders only], ' ' As CardNum, ' ' As CardValidMonth, ' ' As CardValidYear FROM [tblGOBOXBestellungen] UNION ALL - Select gb_transactionTyp, gb_company1, gb_company2, gb_companyStreet, gb_adressNr, gb_companyPostalcode, gb_companyCountry, gb_companyCountryISO, gb_companyCountryISO, gb_companyTel, gb_companyFax, gb_salutation, gb_title, gb_firstname, gb_lastname, gb_email, gb_personLanguage, gb_licensePlate, gb_licensePlateNat, gb_vehicleTyp, gb_Axles, '', gb_CardNum,RIGHT('00' + CAST(gb_CardValidMonth AS VARCHAR(2)), 2) , RIGHT('00' + CAST(gb_CardValidYear AS VARCHAR(2)), 2) + Select gb_transactionTyp, gb_company1, gb_company2, gb_companyStreet, gb_companyStreetNr, gb_companyPostalcode, gb_companyCity, gb_companyCountry, gb_companyCountryISO, gb_companyTel, gb_companyFax, gb_salutation, gb_title, gb_firstname, gb_lastname, gb_email, gb_personLanguage, gb_licensePlate, gb_licensePlateNat, gb_vehicleTyp, gb_Axles, '', gb_CardNum,RIGHT('00' + CAST(gb_CardValidMonth AS VARCHAR(2)), 2) , RIGHT('00' + CAST(gb_CardValidYear AS VARCHAR(2)), 2) From [tblGOBOXBestellungen] where gb_bestellNr = " & intBestellnummer & " and gb_transactionTyp = 'N' UNION SELECT TOP (1) 'E', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' FROM [tblGOBOXBestellungen]" diff --git a/SDL/packages.config b/SDL/packages.config index 624ab8ac..4d5c8907 100644 --- a/SDL/packages.config +++ b/SDL/packages.config @@ -1,7 +1,8 @@  - + + @@ -50,9 +51,9 @@ - - + + - + \ No newline at end of file