diff --git a/SDL/Fakturierung/cAutomailversand.vb b/SDL/Fakturierung/cAutomailversand.vb index a7a0d56f..2d9d9f2e 100644 --- a/SDL/Fakturierung/cAutomailversand.vb +++ b/SDL/Fakturierung/cAutomailversand.vb @@ -1,5 +1,4 @@ Imports System.IO -Imports jdk.nashorn.internal.objects.annotations Imports Microsoft.Office.Interop Imports VERAG_PROG_ALLGEMEIN @@ -105,6 +104,7 @@ Public Class cAutomailversand If SR_DT.Rows.Count = 0 Then Continue For Dim AD = New VERAG_PROG_ALLGEMEIN.cAdressen(row.Item("RechnungsKundenNr")) + Dim KDE_ERW = New VERAG_PROG_ALLGEMEIN.cKundenErweitert(row.Item("RechnungsKundenNr")) Dim FISKAL = New cFiskal_Daten(row.Item("RechnungsKundenNr")) If RechnungsNr = -1 Then @@ -159,34 +159,35 @@ Public Class cAutomailversand showError = mailoeffnen 'bei MailÖffnen fehler anzeigen! setEmailText(row, FirmaID, RechnungsNr, Mailsubject, HTMLMail, SammelrechungArt, dt, BelegartenNr) - If do_SR(row.Item("RechnungsKundenNr"), FirmaID, SammelrechungArt, Rechnungsdatum, RechnungsNr, DruckDatumZeit, MDMKopiedrucken, listPDFs,,,, showError, AbfertigungsNr, faktGruppe) Then - loadAndSetAnhaenge(SR_DT, ATTACHMENTS, listPDFs) + If do_SR(row.Item("RechnungsKundenNr"), FirmaID, SammelrechungArt, Rechnungsdatum, RechnungsNr, DruckDatumZeit, MDMKopiedrucken, listPDFs,,,, showError, AbfertigungsNr, faktGruppe) Then + loadAndSetAnhaenge(SR_DT, ATTACHMENTS, listPDFs,,, KDE_ERW.kde_merge_pdf) - If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then Mailsubject &= " TEST" + If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then Mailsubject &= " TEST" - If mailoeffnen Then - Dim Mail = createMail(Mailsubject, HTMLMail, ATTACHMENTS, MailTo, MailtoCC, MailtoBCC, FirmaID) - If setLog(SR_DT, row, FirmaID, SammelrechungArt, Rechnungsdatum,,,,,,, Mail) Then - Mail.Display() - End If + If mailoeffnen Then + Dim Mail = createMail(Mailsubject, HTMLMail, ATTACHMENTS, MailTo, MailtoCC, MailtoBCC, FirmaID) + If setLog(SR_DT, row, FirmaID, SammelrechungArt, Rechnungsdatum,,,,,,, Mail) Then + Mail.Display() + End If - Else + Else - Dim TextHTML = "" - TextHTML &= HTMLMail - TextHTML &= cFakturierung.getSignature("DE", FirmaID, True, True,,,,, True) - HTMLMail = "
" & TextHTML & "
" + Dim TextHTML = "" + TextHTML &= HTMLMail + TextHTML &= cFakturierung.getSignature("DE", FirmaID, True, True,,,,, True) + HTMLMail = "
" & TextHTML & "
" - If setLog(SR_DT, row, FirmaID, SammelrechungArt, Rechnungsdatum, ATTACHMENTS, Mailsubject, HTMLMail, MailTo, MailtoCC, MailtoBCC,,, FISKAL) Then - - End If + If setLog(SR_DT, row, FirmaID, SammelrechungArt, Rechnungsdatum, ATTACHMENTS, Mailsubject, HTMLMail, MailTo, MailtoCC, MailtoBCC,,, FISKAL) Then End If End If - End If + End If + + + Next Next @@ -238,9 +239,10 @@ Public Class cAutomailversand Dim AD As New cAdressen(r.Item("RechnungsKundenNr")) + Dim KDE_ERW As New cKundenErweitert(r.Item("RechnungsKundenNr")) Dim ATTACHMENTS As New List(Of cFakt_MailATTach) Dim RECHNUNG As New cRechnungsausgang(r.Item("RK_ID")) - Dim SPEDBUCH As New cSpeditionsbuch(RECHNUNG.FilialenNr, RECHNUNG.AbfertigungsNr, RECHNUNG.UnterNr) + Dim SPEDBUCH As New cSpeditionsbuch(RECHNUNG.FilialenNr, RECHNUNG.AbfertigungsNr, RECHNUNG.SpeditionsbuchUnterNr) FISKAL = New cFiskal_Daten(r.Item("RechnungsKundenNr")) @@ -263,19 +265,16 @@ Public Class cAutomailversand Continue For End If + Dim listPDFs As New List(Of String) 'EINZELBELEG ANFÃœGEN - If pathRG <> "" Then ATTACHMENTS.Add(New cFakt_MailATTach(pathRG, If(RECHNUNG.BelegartenKz = "AR", "Rechnung.pdf", "Gutschrift.pdf"))) + + If pathRG <> "" Then + listPDFs.Add(pathRG) + End If Dim Mailsubject As String = "" Dim HTMLMail As String = "" - - Dim listPDFs As New List(Of String) - - 'Dim showError As Boolean = False - 'showError = mailoeffnen 'bei MailÖffnen fehler anzeigen! - setEmailText(r, FirmaID, RECHNUNG.RechnungsNr, Mailsubject, HTMLMail, RECHNUNG.Sammelrechnung, dt, RECHNUNG.BelegartenNr, SPEDBUCH, RECHNUNG) - loadAndSetAnhaenge(dt, ATTACHMENTS, listPDFs, RECHNUNG, SPEDBUCH) If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then Mailsubject &= " TEST" @@ -531,26 +530,28 @@ Public Class cAutomailversand End Function - Private Sub loadAndSetAnhaenge(SR_DT As DataTable, ATTACHMENTS As List(Of cFakt_MailATTach), listPDFs As List(Of String), Optional RECHNUNG As cRechnungsausgang = Nothing, Optional SPEDBUCH As cSpeditionsbuch = Nothing) - + Private Sub loadAndSetAnhaenge(SR_DT As DataTable, ATTACHMENTS As List(Of cFakt_MailATTach), listPDFs As List(Of String), Optional RECHNUNG As cRechnungsausgang = Nothing, Optional SPEDBUCH As cSpeditionsbuch = Nothing, Optional mergeAllPDFS As Boolean = False) Dim zielPfadZusammenfassung = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("Attachment.pdf", ".pdf",, False, "Zusammenfassung") + Dim pdfAnhang_merge As Boolean = False - 'Rechnungsanhänge anfügen -> RECHNUNG SELBST - For Each l In listPDFs - ATTACHMENTS.Add(New cFakt_MailATTach(l, "")) - Next - + '----------------------------------------------------------------- EINZELRECHNUNGEN------------------------------------------------ If RECHNUNG IsNot Nothing Then - '----------------------------------------------------------------- EINZELRECHNUNGEN------------------------------------------------ + For Each l In listPDFs + ATTACHMENTS.Add(New cFakt_MailATTach(l, If(RECHNUNG.BelegartenKz = "AR", "Rechnung.pdf", "Gutschrift.pdf"))) + Next + Dim zsmf_ER As New List(Of String) RECHNUNG.LOAD_ANHAENGE() + For Each ANH In RECHNUNG.ANHAENGE Dim path = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(ANH.dsId) - If PDFS_zusammenfassen(path, RECHNUNG.FilialenNr, RECHNUNG.Firma_ID, False) Then + pdfAnhang_merge = PDFS_zusammenfassen(path, RECHNUNG.FilialenNr, RECHNUNG.Firma_ID, False) + + If pdfAnhang_merge Then If path <> "" Then If Not zsmf_ER.Any(Function(p) System.IO.Path.GetFileName(p.ToString).Equals(path, StringComparison.OrdinalIgnoreCase)) Then 'doppelte unterbinden! zsmf_ER.Add(path) @@ -593,6 +594,25 @@ Public Class cAutomailversand End If End If + If mergeAllPDFS Then 'also Beleg + Anhänge in Beleg + Dim Anhangsbezeichnung = If(RECHNUNG.BelegartenKz = "AR", "Invoice_", "Credit_Note_") + Dim zielPfadZusammenfassung2 = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(Anhangsbezeichnung & "Attachment.pdf", ".pdf",, False, "Zusammenfassung") + + If ATTACHMENTS.Count > 1 Then + Dim myList As New List(Of String) + + For Each a In ATTACHMENTS + myList.Add(a.Pfad) + Next + + If FormularManagerNEU.MergePdfFiles(myList, zielPfadZusammenfassung2) Then + ATTACHMENTS.Clear() : ATTACHMENTS.Add(New cFakt_MailATTach(zielPfadZusammenfassung2, "")) + End If + End If + + + End If + Else '----------------------------------------------------------------- SAMMELRECHNUNGEN------------------------------------------------ @@ -614,7 +634,9 @@ Public Class cAutomailversand Dim path = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(ANH.dsId) 'hier die LOGIK, was alles zusammengefasst werden soll! - If PDFS_zusammenfassen(path, FilialenNr, FIRMA_ID, True) Then + pdfAnhang_merge = PDFS_zusammenfassen(path, FilialenNr, FIRMA_ID, True) + + If pdfAnhang_merge Then If path <> "" Then If Not zsmf_SR.Any(Function(p) System.IO.Path.GetFileName(p.ToString).Equals(path, StringComparison.OrdinalIgnoreCase)) Then 'doppelte unterbinden! zsmf_SR.Add(path) @@ -641,6 +663,29 @@ Public Class cAutomailversand Next + + + 'nicht bei SR! + + 'If mergeAllPDFS Then 'also Beleg + Anhänge in Beleg + ' Dim Anhangsbezeichnung = "SR_" + ' Dim zielPfadZusammenfassung2 = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(Anhangsbezeichnung & "Attachment.pdf", ".pdf",, False, "Zusammenfassung") + + ' If ATTACHMENTS.Count > 1 Then + ' Dim myList As New List(Of String) + + ' For Each a In ATTACHMENTS + ' myList.Add(a.Pfad) + ' Next + + ' If FormularManagerNEU.MergePdfFiles(myList, zielPfadZusammenfassung2) Then + ' ATTACHMENTS.Clear() : ATTACHMENTS.Add(New cFakt_MailATTach(zielPfadZusammenfassung2, "")) + ' End If + ' End If + + + 'End If + End If @@ -766,6 +811,8 @@ Public Class cAutomailversand For Each r As DataRow In SR_DT.Rows AbfertigungsNr = IIf(Not IsDBNull(r.Item("AbfertigungsNr")) AndAlso IsNumeric(r.Item("AbfertigungsNr")), CInt(r.Item("AbfertigungsNr")), 0) FilialenNr = IIf(Not IsDBNull(r.Item("FilialenNr")) AndAlso IsNumeric(r.Item("FilialenNr")), CInt(r.Item("FilialenNr")), 0) + UnterNr = IIf(Not IsDBNull(r.Item("SpeditionsbuchUnterNr")) AndAlso IsNumeric(r.Item("SpeditionsbuchUnterNr")), CInt(r.Item("SpeditionsbuchUnterNr")), 0) + Next End If @@ -834,45 +881,44 @@ Public Class cAutomailversand End If If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, EMail_subject, EMail_HTML, accountToSend, False, False, EMails_CC, EMails_BCC, attachList,, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "d.breimaier@verag.ag", accountToSend)) Then - API.UPDTAE_OK() + API.UPDTAE_OK() - If RECHNUNG IsNot Nothing Then - RECHNUNG.Automailversand_sent = Now() - RECHNUNG.SAVE() + If RECHNUNG IsNot Nothing Then + RECHNUNG.Automailversand_sent = Now() + RECHNUNG.SAVE() - Else - sql.doSQL("update Rechnungsausgang set Automailversand_sent = getDate() where Rechnungsausgang.Firma_ID = '" & FirmaID & "' And Rechnungsausgang.Sammelrechnung = '" & Sammelrechnungsart & "' And CONVERT(DATE,Rechnungsausgang.Rechnungsdatum,104) = '" & Rechnungsdatum.ToShortDateString & "' - And isnull(Rechnungsausgang.Automailversand,0) = 1 And RechnungsNr > 0 And RechnungsKundenNr = " & row.Item("RechnungsKundenNr") & " And Status = 4 And Automailversand_sent is null", "FMZOLL") - End If - - '---------------------TODO ! ---------------------------- - createMailFISKAL(SPEDBUCH, FISKAL, False, FirmaID, row.Item("RechnungsKundenNr"), row.Item("RechnungsLandKz")) - '---------------------TODO ! ---------------------------- - - mailcreated = True Else - API.UPDTAE_ERR() - - 'Bei FEHLER EINZELRECHNUNG VON STATUS 4 auf 2 zurücksetzen! - - If RECHNUNG IsNot Nothing Then - RECHNUNG.Automailversand_sent = Nothing - RECHNUNG.Status = 2 - RECHNUNG.SAVE() - Else - 'Bei FEHLER SAMMELRECHNUNG VON STATUS 4 auf 2 zurücksetzen! - sql.doSQL("update Rechnungsausgang set Status = 2, Automailversand_sent = NULL where Rechnungsausgang.Firma_ID = '" & FirmaID & "' And Rechnungsausgang.Sammelrechnung = '" & Sammelrechnungsart & "' And CONVERT(DATE,Rechnungsausgang.Rechnungsdatum,104) = '" & Rechnungsdatum.ToShortDateString & "' - And isnull(Rechnungsausgang.Automailversand,0) = 1 And RechnungsNr > 0 And RechnungsKundenNr = " & row.Item("RechnungsKundenNr") & " And Status = 4", "FMZOLL") - End If - - Return mailcreated - + sql.doSQL("update Rechnungsausgang set Automailversand_sent = getDate() where Rechnungsausgang.Firma_ID = '" & FirmaID & "' And Rechnungsausgang.Sammelrechnung = '" & Sammelrechnungsart & "' And CONVERT(DATE,Rechnungsausgang.Rechnungsdatum,104) = '" & Rechnungsdatum.ToShortDateString & "' + And isnull(Rechnungsausgang.Automailversand,0) = 1 And RechnungsNr > 0 And RechnungsKundenNr = " & row.Item("RechnungsKundenNr") & " And Status = 4 And Automailversand_sent is null", "FMZOLL") End If + '---------------------TODO ! ---------------------------- + createMailFISKAL(SPEDBUCH, FISKAL, False, FirmaID, row.Item("RechnungsKundenNr"), row.Item("RechnungsLandKz")) + '---------------------TODO ! ---------------------------- + + mailcreated = True + Else + API.UPDTAE_ERR() + + 'Bei FEHLER EINZELRECHNUNG VON STATUS 4 auf 2 zurücksetzen! + + If RECHNUNG IsNot Nothing Then + RECHNUNG.Automailversand_sent = Nothing + RECHNUNG.Status = 2 + RECHNUNG.SAVE() + Else + 'Bei FEHLER SAMMELRECHNUNG VON STATUS 4 auf 2 zurücksetzen! + sql.doSQL("update Rechnungsausgang set Status = 2, Automailversand_sent = NULL where Rechnungsausgang.Firma_ID = '" & FirmaID & "' And Rechnungsausgang.Sammelrechnung = '" & Sammelrechnungsart & "' And CONVERT(DATE,Rechnungsausgang.Rechnungsdatum,104) = '" & Rechnungsdatum.ToShortDateString & "' + And isnull(Rechnungsausgang.Automailversand,0) = 1 And RechnungsNr > 0 And RechnungsKundenNr = " & row.Item("RechnungsKundenNr") & " And Status = 4", "FMZOLL") + End If + + Return mailcreated End If - Return mailcreated + End If + + Return mailcreated End Function @@ -893,6 +939,8 @@ Public Class cAutomailversand accountToSend = "finanz@imex-group.at" Case 11 accountToSend = "versand@verag.com" + Case 26 + accountToSend = "Invoice@verag-unisped.uk" Case Else accountToSend = "rechnungsversand@verag.ag" End Select diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index 0543de8d..96e3fc82 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -3144,7 +3144,7 @@ Public Class cFakturierung Dim lineTotalAmont = sumNetto 'Der Gesamtbetrag der Umsatzsteuer für die Rechnung, 'IIf(RECHNUNG.SteuerpflichtigerGesamtbetrag <> 0, Math.Round(Convert.ToDecimal(RECHNUNG.SteuerpflichtigerGesamtbetrag) / (100 + steuerProzenFaktor) * steuerProzenFaktor, 2), 0) ?????????????????? - Dim taxTotalAmount = IIf(RECHNUNG.SteuerpflichtigerGesamtbetrag <> 0, Math.Round(Convert.ToDecimal(RECHNUNG.SteuerpflichtigerGesamtbetrag) / (100 + steuerProzenFaktor) * steuerProzenFaktor, 2), 0) + Dim taxTotalAmount = IIf(RECHNUNG.SteuerpflichtigerGesamtbetrag <> 0, Math.Round(Convert.ToDecimal(RECHNUNG.SteuerpflichtigerGesamtbetrag) / (100 + steuerProzenFaktor) * steuerProzenFaktor, 2, MidpointRounding.AwayFromZero), 0) ' Die Gesamtsumme der Rechnung ohne Umsatzsteuer ' RECHNUNG.SteuerfreierGesamtbetrag + RECHNUNG.SteuerpflichtigerGesamtbetrag + 0 - 0 Dim taxBasisAmount = Convert.ToDecimal(RECHNUNG.SteuerfreierGesamtbetrag + RECHNUNG.SteuerpflichtigerGesamtbetrag + 0 - 0 - taxTotalAmount) 'Der Gesamtbetrag der Rechnung mit Umsatzsteuer diff --git a/SDL/Fakturierung/frmAbrechnungsMaske.Designer.vb b/SDL/Fakturierung/frmAbrechnungsMaske.Designer.vb index 4bb9a5e5..c3ae395e 100644 --- a/SDL/Fakturierung/frmAbrechnungsMaske.Designer.vb +++ b/SDL/Fakturierung/frmAbrechnungsMaske.Designer.vb @@ -229,15 +229,15 @@ Partial Class frmAbrechnungsMaske ' 'btn_doMailAutoversand ' - Me.btn_doMailAutoversand.BackgroundImage = Global.SDL.My.Resources.Resources.zauberstab - Me.btn_doMailAutoversand.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btn_doMailAutoversand.BackgroundImage = Global.SDL.My.Resources.Resources.auto_mailversand_small + Me.btn_doMailAutoversand.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch Me.btn_doMailAutoversand.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btn_doMailAutoversand.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btn_doMailAutoversand.Location = New System.Drawing.Point(293, 21) + Me.btn_doMailAutoversand.Location = New System.Drawing.Point(286, 10) Me.btn_doMailAutoversand.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3) Me.btn_doMailAutoversand.Name = "btn_doMailAutoversand" Me.btn_doMailAutoversand.Padding = New System.Windows.Forms.Padding(20, 0, 0, 0) - Me.btn_doMailAutoversand.Size = New System.Drawing.Size(40, 25) + Me.btn_doMailAutoversand.Size = New System.Drawing.Size(60, 36) Me.btn_doMailAutoversand.TabIndex = 29 Me.btn_doMailAutoversand.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.btn_doMailAutoversand.UseVisualStyleBackColor = True @@ -288,7 +288,7 @@ Partial Class frmAbrechnungsMaske Me.cboPrinter.FormattingEnabled = True Me.cboPrinter.Location = New System.Drawing.Point(133, 52) Me.cboPrinter.Name = "cboPrinter" - Me.cboPrinter.Size = New System.Drawing.Size(200, 21) + Me.cboPrinter.Size = New System.Drawing.Size(201, 21) Me.cboPrinter.TabIndex = 25 ' 'Button9 @@ -364,7 +364,7 @@ Partial Class frmAbrechnungsMaske Me.btnWiederholeRgDruck.BackgroundImage = Global.SDL.My.Resources.Resources.print_rg Me.btnWiederholeRgDruck.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.btnWiederholeRgDruck.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnWiederholeRgDruck.Location = New System.Drawing.Point(406, 9) + Me.btnWiederholeRgDruck.Location = New System.Drawing.Point(437, 9) Me.btnWiederholeRgDruck.Name = "btnWiederholeRgDruck" Me.btnWiederholeRgDruck.Size = New System.Drawing.Size(53, 36) Me.btnWiederholeRgDruck.TabIndex = 11 @@ -373,7 +373,7 @@ Partial Class frmAbrechnungsMaske 'Label4 ' Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) - Me.Label4.Location = New System.Drawing.Point(399, 46) + Me.Label4.Location = New System.Drawing.Point(430, 46) Me.Label4.Name = "Label4" Me.Label4.Size = New System.Drawing.Size(67, 26) Me.Label4.TabIndex = 12 @@ -408,7 +408,7 @@ Partial Class frmAbrechnungsMaske Me.Button3.BackgroundImage = Global.SDL.My.Resources.Resources.moneybag1 Me.Button3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button3.Location = New System.Drawing.Point(347, 9) + Me.Button3.Location = New System.Drawing.Point(378, 9) Me.Button3.Name = "Button3" Me.Button3.Size = New System.Drawing.Size(53, 36) Me.Button3.TabIndex = 9 @@ -417,7 +417,7 @@ Partial Class frmAbrechnungsMaske 'Label3 ' Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) - Me.Label3.Location = New System.Drawing.Point(344, 46) + Me.Label3.Location = New System.Drawing.Point(375, 46) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(56, 26) Me.Label3.TabIndex = 10 @@ -530,7 +530,7 @@ Partial Class frmAbrechnungsMaske 'cbxGutschriftenAnVerag ' Me.cbxGutschriftenAnVerag.AutoSize = True - Me.cbxGutschriftenAnVerag.Location = New System.Drawing.Point(348, 44) + Me.cbxGutschriftenAnVerag.Location = New System.Drawing.Point(332, 44) Me.cbxGutschriftenAnVerag.Name = "cbxGutschriftenAnVerag" Me.cbxGutschriftenAnVerag.Size = New System.Drawing.Size(128, 17) Me.cbxGutschriftenAnVerag.TabIndex = 54 @@ -544,16 +544,16 @@ Partial Class frmAbrechnungsMaske Me.cboRechnungsdruck._value = "" Me.cboRechnungsdruck.DropDownWidth = 120 Me.cboRechnungsdruck.FormattingEnabled = True - Me.cboRechnungsdruck.Location = New System.Drawing.Point(453, 23) + Me.cboRechnungsdruck.Location = New System.Drawing.Point(442, 23) Me.cboRechnungsdruck.Margin = New System.Windows.Forms.Padding(2) Me.cboRechnungsdruck.Name = "cboRechnungsdruck" - Me.cboRechnungsdruck.Size = New System.Drawing.Size(83, 21) + Me.cboRechnungsdruck.Size = New System.Drawing.Size(94, 21) Me.cboRechnungsdruck.TabIndex = 53 ' 'Label14 ' Me.Label14.AutoSize = True - Me.Label14.Location = New System.Drawing.Point(345, 26) + Me.Label14.Location = New System.Drawing.Point(329, 26) Me.Label14.Name = "Label14" Me.Label14.Size = New System.Drawing.Size(108, 13) Me.Label14.TabIndex = 52 @@ -564,7 +564,7 @@ Partial Class frmAbrechnungsMaske Me.cbx.AutoSize = True Me.cbx.Checked = True Me.cbx.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbx.Location = New System.Drawing.Point(348, 61) + Me.cbx.Location = New System.Drawing.Point(332, 61) Me.cbx.Name = "cbx" Me.cbx.Size = New System.Drawing.Size(181, 17) Me.cbx.TabIndex = 34 @@ -577,16 +577,16 @@ Partial Class frmAbrechnungsMaske Me.cboER_SR._allowFreiText = False Me.cboER_SR._value = "" Me.cboER_SR.FormattingEnabled = True - Me.cboER_SR.Location = New System.Drawing.Point(453, 3) + Me.cboER_SR.Location = New System.Drawing.Point(442, 3) Me.cboER_SR.Margin = New System.Windows.Forms.Padding(2) Me.cboER_SR.Name = "cboER_SR" - Me.cboER_SR.Size = New System.Drawing.Size(83, 21) + Me.cboER_SR.Size = New System.Drawing.Size(94, 21) Me.cboER_SR.TabIndex = 33 ' 'Label5 ' Me.Label5.AutoSize = True - Me.Label5.Location = New System.Drawing.Point(345, 6) + Me.Label5.Location = New System.Drawing.Point(329, 6) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(103, 13) Me.Label5.TabIndex = 32 diff --git a/SDL/Fakturierung/frmFaktEmail.vb b/SDL/Fakturierung/frmFaktEmail.vb index 97089548..4acc7e90 100644 --- a/SDL/Fakturierung/frmFaktEmail.vb +++ b/SDL/Fakturierung/frmFaktEmail.vb @@ -89,6 +89,7 @@ Public Class frmFaktEmail End Select Dim AD As VERAG_PROG_ALLGEMEIN.cAdressen + Dim KD_ERW As VERAG_PROG_ALLGEMEIN.cKundenErweitert Dim FISKAL As cFiskal_Daten = Nothing @@ -154,6 +155,7 @@ Public Class frmFaktEmail AD = New VERAG_PROG_ALLGEMEIN.cAdressen(RECHNUNG.RechnungsKundenNr) FISKAL = New cFiskal_Daten(RECHNUNG.RechnungsKundenNr) + KD_ERW = New VERAG_PROG_ALLGEMEIN.cKundenErweitert(RECHNUNG.RechnungsKundenNr) If printOriginalRg Is Nothing Then cbxOriginalPrint.Visible = False @@ -168,6 +170,10 @@ Public Class frmFaktEmail If AD.AdressenNr = 1001688 Then cbxExcelEvolog.Checked = True 'EVOLOG If AD.AdressenNr = 800020 Then cbxTransFerry.Checked = True 'TRANS FERRY 360 + If cbxMergePDF.Enabled AndAlso KD_ERW IsNot Nothing Then + cbxMergePDF.Checked = KD_ERW.kde_merge_pdf + End If + If (AD.AdressenNr.ToString.Substring(0, 2) = 15 Or AD.AdressenNr.ToString.Substring(0, 2) = 18) AndAlso cbxMergePDF.Enabled = True Then cbxMergePDF.Checked = True If AD.E_Mail IsNot Nothing AndAlso AD.E_Mail <> "" Then lkl.Text = """" & AD.E_Mail & """ anfügen" : lkl.Tag = AD.E_Mail @@ -541,6 +547,8 @@ Public Class frmFaktEmail accountToSent = "mmdabrechnung@verag.ag" 'bewusst falsch geschrieben!!!! Case 7 accountToSent = "rechnung@atilla-spedition.com" + Case 26 + accountToSent = "Invoice@verag-unisped.uk" Case Else accountToSent = "rechnungsversand@verag.ag" End Select @@ -681,6 +689,8 @@ Public Class frmFaktEmail accountToSent = "mmdabrechnung@verag.ag" 'bewusst falsch geschrieben!!!! Case 7 accountToSent = "rechnung@atilla-spedition.com" + Case 26 + accountToSent = "Invoice@verag-unisped.uk" Case Else accountToSent = "rechnungsversand@verag.ag" diff --git a/SDL/Fakturierung/frmFaktSammelRgDrucken.Designer.vb b/SDL/Fakturierung/frmFaktSammelRgDrucken.Designer.vb index e52444f2..6017197e 100644 --- a/SDL/Fakturierung/frmFaktSammelRgDrucken.Designer.vb +++ b/SDL/Fakturierung/frmFaktSammelRgDrucken.Designer.vb @@ -447,16 +447,17 @@ Partial Class frmFaktSammelRgDrucken 'Button7 ' Me.Button7.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.Button7.BackgroundImage = Global.SDL.My.Resources.Resources.email_big + Me.Button7.BackColor = System.Drawing.Color.White + Me.Button7.BackgroundImage = Global.SDL.My.Resources.Resources.auto_mailversand_small Me.Button7.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button7.ImageAlign = System.Drawing.ContentAlignment.BottomRight Me.Button7.Location = New System.Drawing.Point(12, 55) Me.Button7.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3) Me.Button7.Name = "Button7" - Me.Button7.Size = New System.Drawing.Size(106, 37) + Me.Button7.Size = New System.Drawing.Size(96, 37) Me.Button7.TabIndex = 37 - Me.Button7.UseVisualStyleBackColor = True + Me.Button7.UseVisualStyleBackColor = False ' 'Button6 ' diff --git a/SDL/Fakturierung/frmFaktSammelRgDrucken.vb b/SDL/Fakturierung/frmFaktSammelRgDrucken.vb index 55bcea78..a4daa1e8 100644 --- a/SDL/Fakturierung/frmFaktSammelRgDrucken.vb +++ b/SDL/Fakturierung/frmFaktSammelRgDrucken.vb @@ -1,5 +1,4 @@ -Imports DocumentFormat.OpenXml.Drawing.Diagrams -Imports Microsoft.Office.Interop +Imports Microsoft.Office.Interop Public Class frmFaktSammelRgDrucken @@ -989,9 +988,6 @@ Public Class frmFaktSammelRgDrucken End Sub - - - Private Sub btnNurAbf_Click(sender As Object, e As EventArgs) Handles btnNurImport.Click, btnNurExport.Click Dim where As String = "" diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb index a57a6ecf..805345f5 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb @@ -1917,6 +1917,11 @@ Public Class usrCntlFaktAbrechnung If r.Cells("clmnDsId").Value = RG_AH.dsId Or r.Cells("clmnAnhId").Value = 0 Then 'anh_id = 0 --> Anhang ohne AVISO-Bezug DirectCast(r.Cells("optAnhSel"), DataGridViewCheckBoxCell).Value = -1 End If + + If r.Cells("clmnBezeichnung").Value.ToString.ToLower.Contains("handelsrechnung") AndAlso kdFirmaRechnungAn.KdData_KUNDE_ERW IsNot Nothing AndAlso kdFirmaRechnungAn.KdData_KUNDE_ERW.kde_autoselect_handelsrechnung Then 'anh_id = 0 --> Anhang ohne AVISO-Bezug + DirectCast(r.Cells("optAnhSel"), DataGridViewCheckBoxCell).Value = 1 + End If + Next Next '----------------------------- @@ -1929,7 +1934,7 @@ Public Class usrCntlFaktAbrechnung Dim func As New cMDMFunctionsAllgemein() Dim dt = SQL.loadDgvBySql("SELECT UStVPo_daId, UStVPo_ID,UStVPo_SchnittstellenNr, UStVPo_ReNr, UStVPo_ReDat FROM tblUStVPositionen where UStVAn_ID='" & SPEDBUCH.ErfassungsNr & "' /* AND UStVPo_SchnittstellenNr <> 1 */ " & IIf(isVZ, " And UStVPo_VZ = 1 And UStVPo_VZ_RKID Is null", "") & " order by UStVPo_ID", "FMZOLL") - Dim USTV As New cUSTVAntrag(SPEDBUCH.ErfassungsNr) + Dim USTV As New cUSTVAntrag(SPEDBUCH.ErfassungsNr) Dim Antrag_LandKz = "" If USTV.UStVAn_ID > 0 Then Antrag_LandKz = SQL.DLookup("LandKz", "[Länderverzeichnis für die Außenhandelsstatistik]", "Landnr='" & USTV.UStVAn_LandNr & "'", "FMZOLL") @@ -5558,7 +5563,7 @@ mwst: 'STATUS 3-_> Sammel-Rg gedruckt 'STATUS 4-_> ? irgendwas mit SR 6 Maut/Diesel?? - If cboSammelrechnung._value = 0 AndAlso lblDruckDatum.Text = "" AndAlso RD_DRUCK = 2 Then ' (RECHNUNG.Status <> 4 ANDAlso RECHNUNG.Status <> 0) WARUM NOCHMALS?? + If cboSammelrechnung._value = 0 AndAlso lblDruckDatum.Text = "" AndAlso (RD_DRUCK = 2 Or RD_DRUCK = 5) Then ' (RECHNUNG.Status <> 4 ANDAlso RECHNUNG.Status <> 0) WARUM NOCHMALS?? If RECHNUNG IsNot Nothing AndAlso (RECHNUNG.Status <> 0 AndAlso RECHNUNG.Status <> 2) Then Return enableAUTOMAIL = False Else @@ -5574,7 +5579,14 @@ mwst: Else - If RECHNUNG.Rechnung_an = 0 Then Return enableAUTOMAIL + 'If RECHNUNG.Rechnung_an = 0 Then + ' Return enableAUTOMAIL + 'End If + + If cboRechnungAn._value = "" Then + Return enableAUTOMAIL + End If + If cboSammelrechnung._value <> 0 Then Return enableAUTOMAIL @@ -5586,26 +5598,26 @@ mwst: Dim RD_DRUCK = -1 Dim AD As cAdressen - Select Case RECHNUNG.Rechnung_an - Case 1 - If RECHNUNG.AbsenderKundenNr Is Nothing Then Return enableAUTOMAIL - AD = New cAdressen(RECHNUNG.AbsenderKundenNr) - RD_DRUCK = If(AD.Rechnungsdruck, -1) - Case 2 - If RECHNUNG.EmpfängerKundenNr Is Nothing Then Return enableAUTOMAIL - AD = New cAdressen(RECHNUNG.EmpfängerKundenNr) - RD_DRUCK = If(AD.Rechnungsdruck, -1) - Case 3 - If RECHNUNG.VermittlerKundenNr Is Nothing Then Return enableAUTOMAIL - AD = New cAdressen(RECHNUNG.VermittlerKundenNr) - RD_DRUCK = If(AD.Rechnungsdruck, -1) - Case 4 - If RECHNUNG.AvisiererKundenNr Is Nothing Then Return enableAUTOMAIL - AD = New cAdressen(RECHNUNG.AvisiererKundenNr) - RD_DRUCK = If(AD.Rechnungsdruck, -1) - Case Else - Return enableAUTOMAIL - End Select + Select Case cboRechnungAn._value + Case "1" + If RECHNUNG.AbsenderKundenNr Is Nothing Then Return enableAUTOMAIL + AD = New cAdressen(RECHNUNG.AbsenderKundenNr) + RD_DRUCK = If(AD.Rechnungsdruck, -1) + Case "2" + If RECHNUNG.EmpfängerKundenNr Is Nothing Then Return enableAUTOMAIL + AD = New cAdressen(RECHNUNG.EmpfängerKundenNr) + RD_DRUCK = If(AD.Rechnungsdruck, -1) + Case "3" + If RECHNUNG.VermittlerKundenNr Is Nothing Then Return enableAUTOMAIL + AD = New cAdressen(RECHNUNG.VermittlerKundenNr) + RD_DRUCK = If(AD.Rechnungsdruck, -1) + Case "4" + If RECHNUNG.AvisiererKundenNr Is Nothing Then Return enableAUTOMAIL + AD = New cAdressen(RECHNUNG.AvisiererKundenNr) + RD_DRUCK = If(AD.Rechnungsdruck, -1) + Case Else + Return enableAUTOMAIL + End Select 'BEI EINZELRECHNUNG WIRD STATUS 0 und 2 geprüft diff --git a/SDL/My Project/Resources.Designer.vb b/SDL/My Project/Resources.Designer.vb index 635501b6..22f5e90c 100644 --- a/SDL/My Project/Resources.Designer.vb +++ b/SDL/My Project/Resources.Designer.vb @@ -310,6 +310,26 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property auto_mailversand() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("auto_mailversand", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property auto_mailversand_small() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("auto_mailversand_small", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/SDL/My Project/Resources.resx b/SDL/My Project/Resources.resx index 3ece8c65..8808797a 100644 --- a/SDL/My Project/Resources.resx +++ b/SDL/My Project/Resources.resx @@ -985,4 +985,10 @@ ..\Resources\Kostenkalkulation_UNI.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\auto_mailversand.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\auto_mailversand_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/SDL/Resources/auto_mailversand.png b/SDL/Resources/auto_mailversand.png new file mode 100644 index 00000000..a4a07a1b Binary files /dev/null and b/SDL/Resources/auto_mailversand.png differ diff --git a/SDL/Resources/auto_mailversand_small.png b/SDL/Resources/auto_mailversand_small.png new file mode 100644 index 00000000..7a3fb8c5 Binary files /dev/null and b/SDL/Resources/auto_mailversand_small.png differ diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index 1918dc18..facb9532 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -5487,6 +5487,8 @@ Always + + diff --git a/SDL/Speditionsbuch/Nacherfassung/rptSpeditionsbericht_HandlingAussenstellen.Designer.vb b/SDL/Speditionsbuch/Nacherfassung/rptSpeditionsbericht_HandlingAussenstellen.Designer.vb index b8af43de..074b0bea 100644 --- a/SDL/Speditionsbuch/Nacherfassung/rptSpeditionsbericht_HandlingAussenstellen.Designer.vb +++ b/SDL/Speditionsbuch/Nacherfassung/rptSpeditionsbericht_HandlingAussenstellen.Designer.vb @@ -50,6 +50,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.Line5 = New GrapeCity.ActiveReports.SectionReportModel.Line() Me.Label12 = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.txtUebersicht = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.txtUebersichtAuflistung = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.GroupHeader1 = New GrapeCity.ActiveReports.SectionReportModel.GroupHeader() Me.Label7 = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.Line4 = New GrapeCity.ActiveReports.SectionReportModel.Line() @@ -92,6 +93,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen CType(Me.lblSumBarzahlungsbetrag, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label12, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtUebersicht, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtUebersichtAuflistung, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label7, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label6, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label8, System.ComponentModel.ISupportInitialize).BeginInit() @@ -125,6 +127,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.lblPosNr.HyperLink = Nothing Me.lblPosNr.Left = 0.01811025! Me.lblPosNr.Name = "lblPosNr" + Me.lblPosNr.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(0, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.lblPosNr.Style = "font-size: 8pt; font-weight: bold; text-align: left; ddo-char-set: 1" Me.lblPosNr.Text = "4801 17000000 0" Me.lblPosNr.Top = 0.03149607! @@ -136,6 +139,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.lblAbfertigungsart.HyperLink = Nothing Me.lblAbfertigungsart.Left = 1.829921! Me.lblAbfertigungsart.Name = "lblAbfertigungsart" + Me.lblAbfertigungsart.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(0, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.lblAbfertigungsart.Style = "font-size: 8pt; font-weight: normal; text-align: left; ddo-char-set: 1" Me.lblAbfertigungsart.Text = "eigene ATLAS / Handling" Me.lblAbfertigungsart.Top = 0.03149606! @@ -147,6 +151,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.lblAbfDatum.HyperLink = Nothing Me.lblAbfDatum.Left = 0.9507875! Me.lblAbfDatum.Name = "lblAbfDatum" + Me.lblAbfDatum.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(0, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.lblAbfDatum.Style = "font-size: 8pt; font-weight: normal; text-align: left; ddo-char-set: 1" Me.lblAbfDatum.Text = "01.01.2017" Me.lblAbfDatum.Top = 0.03307087! @@ -158,6 +163,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.lblAnzahl.HyperLink = Nothing Me.lblAnzahl.Left = 1.556693! Me.lblAnzahl.Name = "lblAnzahl" + Me.lblAnzahl.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(0, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.lblAnzahl.Style = "font-size: 8pt; font-weight: normal; text-align: left; ddo-char-set: 1" Me.lblAnzahl.Text = "1" Me.lblAnzahl.Top = 0.03149607! @@ -170,7 +176,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.lblEndEmpf.Left = 3.634646! Me.lblEndEmpf.MultiLine = False Me.lblEndEmpf.Name = "lblEndEmpf" - Me.lblEndEmpf.Padding = New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0) + Me.lblEndEmpf.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.lblEndEmpf.Style = "font-size: 8pt; font-weight: normal; text-align: left; text-justify: auto; ddo-ch" & "ar-set: 1" Me.lblEndEmpf.Text = "VERAG" @@ -183,7 +189,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.lblEndEmpfKdNr.HyperLink = Nothing Me.lblEndEmpfKdNr.Left = 3.158662! Me.lblEndEmpfKdNr.Name = "lblEndEmpfKdNr" - Me.lblEndEmpfKdNr.Padding = New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0) + Me.lblEndEmpfKdNr.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.lblEndEmpfKdNr.Style = "font-size: 8pt; font-weight: normal; text-align: left; text-justify: auto; ddo-ch" & "ar-set: 1" Me.lblEndEmpfKdNr.Text = "1000001 VERAG" @@ -209,7 +215,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.lblHandlingsgebuehr.HyperLink = Nothing Me.lblHandlingsgebuehr.Left = 5.608268! Me.lblHandlingsgebuehr.Name = "lblHandlingsgebuehr" - Me.lblHandlingsgebuehr.Padding = New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0) + Me.lblHandlingsgebuehr.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.lblHandlingsgebuehr.Style = "font-size: 8pt; font-weight: normal; text-align: right; text-justify: auto; ddo-c" & "har-set: 1" Me.lblHandlingsgebuehr.Text = "1.000,00" @@ -222,7 +228,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.lblzuKassierenHandling.HyperLink = Nothing Me.lblzuKassierenHandling.Left = 6.229134! Me.lblzuKassierenHandling.Name = "lblzuKassierenHandling" - Me.lblzuKassierenHandling.Padding = New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0) + Me.lblzuKassierenHandling.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.lblzuKassierenHandling.Style = "font-size: 8pt; font-weight: normal; text-align: right; text-justify: auto; ddo-c" & "har-set: 1" Me.lblzuKassierenHandling.Text = "1.000,00" @@ -235,7 +241,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.lblBarzahlungsbetrag.HyperLink = Nothing Me.lblBarzahlungsbetrag.Left = 6.854331! Me.lblBarzahlungsbetrag.Name = "lblBarzahlungsbetrag" - Me.lblBarzahlungsbetrag.Padding = New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0) + Me.lblBarzahlungsbetrag.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.lblBarzahlungsbetrag.Style = "font-size: 8pt; font-weight: normal; text-align: right; text-justify: auto; ddo-c" & "har-set: 1" Me.lblBarzahlungsbetrag.Text = "1.000,00" @@ -253,6 +259,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.Label28.HyperLink = Nothing Me.Label28.Left = 2.451181! Me.Label28.Name = "Label28" + Me.Label28.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(0, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.Label28.Style = "font-size: 8pt; font-weight: bold; text-align: center; ddo-char-set: 1" Me.Label28.Text = "VERAG Spediton AG" Me.Label28.Top = 0.08622044! @@ -287,6 +294,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.lblDat.HyperLink = Nothing Me.lblDat.Left = 0.01023622! Me.lblDat.Name = "lblDat" + Me.lblDat.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(0, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.lblDat.Style = "font-size: 8pt; text-align: left" Me.lblDat.Text = "Mittwoch, 02.11.2016" Me.lblDat.Top = 0.08622044! @@ -315,6 +323,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.Label3.HyperLink = Nothing Me.Label3.Left = 5.032284! Me.Label3.Name = "Label3" + Me.Label3.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(0, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.Label3.Style = "font-size: 8pt; font-weight: normal; text-align: right; vertical-align: middle; d" & "do-char-set: 1" Me.Label3.Text = "Sachbearbeiter:" @@ -327,6 +336,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.lblUeberschrift.HyperLink = Nothing Me.lblUeberschrift.Left = 0.01023622! Me.lblUeberschrift.Name = "lblUeberschrift" + Me.lblUeberschrift.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(0, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.lblUeberschrift.Style = "font-size: 12pt; font-weight: bold; text-align: left; ddo-char-set: 1" Me.lblUeberschrift.Text = "HANDLING / FRONT-OFFICE" Me.lblUeberschrift.Top = 0.1858268! @@ -338,6 +348,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.lblSachbearbeiter.HyperLink = Nothing Me.lblSachbearbeiter.Left = 5.032284! Me.lblSachbearbeiter.Name = "lblSachbearbeiter" + Me.lblSachbearbeiter.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(0, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.lblSachbearbeiter.Style = "font-size: 8pt; font-weight: bold; text-align: right; vertical-align: middle; ddo" & "-char-set: 1" Me.lblSachbearbeiter.Text = "Hanslmayr Hubert" @@ -346,8 +357,8 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen ' 'ReportFooter1 ' - Me.ReportFooter1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Label10, Me.lblGesGesSumAnzahl, Me.Line8, Me.Line9, Me.lblSumHandlingsgebuehr, Me.lblSumzuKassierenHandling, Me.lblSumBarzahlungsbetrag, Me.Line5, Me.Label12, Me.txtUebersicht}) - Me.ReportFooter1.Height = 0.838189! + Me.ReportFooter1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Label10, Me.lblGesGesSumAnzahl, Me.Line8, Me.Line9, Me.lblSumHandlingsgebuehr, Me.lblSumzuKassierenHandling, Me.lblSumBarzahlungsbetrag, Me.Line5, Me.Label12, Me.txtUebersicht, Me.txtUebersichtAuflistung}) + Me.ReportFooter1.Height = 1.140469! Me.ReportFooter1.KeepTogether = True Me.ReportFooter1.Name = "ReportFooter1" ' @@ -357,6 +368,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.Label10.HyperLink = Nothing Me.Label10.Left = 0.361811! Me.Label10.Name = "Label10" + Me.Label10.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(0, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.Label10.Style = "font-size: 7pt; font-weight: bold; text-align: left; ddo-char-set: 1" Me.Label10.Text = " Abfertigungen" Me.Label10.Top = 0.2110237! @@ -368,6 +380,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.lblGesGesSumAnzahl.HyperLink = Nothing Me.lblGesGesSumAnzahl.Left = 0.003937068! Me.lblGesGesSumAnzahl.Name = "lblGesGesSumAnzahl" + Me.lblGesGesSumAnzahl.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(0, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.lblGesGesSumAnzahl.Style = "font-size: 7pt; font-weight: bold; text-align: right; ddo-char-set: 1" Me.lblGesGesSumAnzahl.Text = "0000" Me.lblGesGesSumAnzahl.Top = 0.2110237! @@ -405,7 +418,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.lblSumHandlingsgebuehr.HyperLink = Nothing Me.lblSumHandlingsgebuehr.Left = 5.608268! Me.lblSumHandlingsgebuehr.Name = "lblSumHandlingsgebuehr" - Me.lblSumHandlingsgebuehr.Padding = New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0) + Me.lblSumHandlingsgebuehr.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.lblSumHandlingsgebuehr.Style = "font-size: 8pt; font-weight: normal; text-align: right; text-justify: auto; ddo-c" & "har-set: 1" Me.lblSumHandlingsgebuehr.Text = "1.000,00" @@ -418,7 +431,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.lblSumzuKassierenHandling.HyperLink = Nothing Me.lblSumzuKassierenHandling.Left = 6.229135! Me.lblSumzuKassierenHandling.Name = "lblSumzuKassierenHandling" - Me.lblSumzuKassierenHandling.Padding = New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0) + Me.lblSumzuKassierenHandling.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.lblSumzuKassierenHandling.Style = "font-size: 8pt; font-weight: normal; text-align: right; text-justify: auto; ddo-c" & "har-set: 1" Me.lblSumzuKassierenHandling.Text = "1.000,00" @@ -431,7 +444,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.lblSumBarzahlungsbetrag.HyperLink = Nothing Me.lblSumBarzahlungsbetrag.Left = 6.854331! Me.lblSumBarzahlungsbetrag.Name = "lblSumBarzahlungsbetrag" - Me.lblSumBarzahlungsbetrag.Padding = New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0) + Me.lblSumBarzahlungsbetrag.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.lblSumBarzahlungsbetrag.Style = "font-size: 8pt; font-weight: normal; text-align: right; text-justify: auto; ddo-c" & "har-set: 1" Me.lblSumBarzahlungsbetrag.Text = "1.000,00" @@ -457,7 +470,8 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.Label12.HyperLink = Nothing Me.Label12.Left = 0! Me.Label12.Name = "Label12" - Me.Label12.Style = "font-size: 7pt; font-weight: bold; text-align: left; text-decoration: underline; " & + Me.Label12.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(0, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) + Me.Label12.Style = "font-size: 8pt; font-weight: bold; text-align: left; text-decoration: underline; " & "ddo-char-set: 1" Me.Label12.Text = "Übersicht:" Me.Label12.Top = 0.4807087! @@ -468,11 +482,23 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.txtUebersicht.Height = 0.2! Me.txtUebersicht.Left = 0! Me.txtUebersicht.Name = "txtUebersicht" + Me.txtUebersicht.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(0, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.txtUebersicht.Style = "font-family: Microsoft Sans Serif; font-size: 8.25pt; ddo-char-set: 1" Me.txtUebersicht.Text = Nothing Me.txtUebersicht.Top = 0.638189! Me.txtUebersicht.Width = 7.47441! ' + 'txtUebersichtAuflistung + ' + Me.txtUebersichtAuflistung.Height = 0.2! + Me.txtUebersichtAuflistung.Left = 0! + Me.txtUebersichtAuflistung.Name = "txtUebersichtAuflistung" + Me.txtUebersichtAuflistung.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(0, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) + Me.txtUebersichtAuflistung.Style = "font-family: Microsoft Sans Serif; font-size: 8.25pt; ddo-char-set: 1" + Me.txtUebersichtAuflistung.Text = Nothing + Me.txtUebersichtAuflistung.Top = 0.838189! + Me.txtUebersichtAuflistung.Width = 7.47441! + ' 'GroupHeader1 ' Me.GroupHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Label7, Me.Line4, Me.Label6, Me.Label8, Me.Label4, Me.Label5, Me.Line12, Me.Label1, Me.Label2, Me.lblAbfArtUeberschrift}) @@ -485,6 +511,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.Label7.HyperLink = Nothing Me.Label7.Left = 1.559449! Me.Label7.Name = "Label7" + Me.Label7.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(0, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.Label7.Style = "background-color: #003680; color: White; font-size: 8pt; font-weight: bold; text-" & "align: left; vertical-align: middle; ddo-char-set: 1" Me.Label7.Text = "Anz." @@ -510,6 +537,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.Label6.HyperLink = Nothing Me.Label6.Left = 5.611023! Me.Label6.Name = "Label6" + Me.Label6.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(0, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.Label6.Style = "background-color: #003680; color: White; font-size: 7pt; font-weight: bold; text-" & "align: right; vertical-align: middle; ddo-char-set: 1" Me.Label6.Text = "Handling" @@ -522,6 +550,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.Label8.HyperLink = Nothing Me.Label8.Left = 3.161418! Me.Label8.Name = "Label8" + Me.Label8.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(0, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.Label8.Style = "background-color: #003680; color: White; font-size: 8pt; font-weight: bold; text-" & "align: left; text-justify: auto; vertical-align: middle; ddo-char-set: 1" Me.Label8.Text = "Empfänger" @@ -534,6 +563,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.Label4.HyperLink = Nothing Me.Label4.Left = 1.832677! Me.Label4.Name = "Label4" + Me.Label4.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(0, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.Label4.Style = "background-color: #003680; color: White; font-size: 8pt; font-weight: bold; text-" & "align: left; text-justify: auto; vertical-align: middle; ddo-char-set: 1" Me.Label4.Text = "Abfertigungsart" @@ -546,6 +576,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.Label5.HyperLink = Nothing Me.Label5.Left = 0.01299213! Me.Label5.Name = "Label5" + Me.Label5.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(0, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.Label5.Style = "background-color: #003680; color: White; font-size: 8pt; font-weight: bold; text-" & "align: left; vertical-align: middle; ddo-char-set: 1" Me.Label5.Text = "Abfertigung" @@ -571,6 +602,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.Label1.HyperLink = Nothing Me.Label1.Left = 6.23189! Me.Label1.Name = "Label1" + Me.Label1.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(0, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.Label1.Style = "background-color: #003680; color: White; font-size: 7pt; font-weight: bold; text-" & "align: right; vertical-align: middle; ddo-char-set: 1" Me.Label1.Text = "zu kassieren" @@ -583,6 +615,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.Label2.HyperLink = Nothing Me.Label2.Left = 6.857087! Me.Label2.Name = "Label2" + Me.Label2.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(0, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.Label2.Style = "background-color: #003680; color: White; font-size: 7pt; font-weight: bold; text-" & "align: right; vertical-align: middle; ddo-char-set: 1" Me.Label2.Text = "(kassiert)" @@ -595,6 +628,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.lblAbfArtUeberschrift.HyperLink = Nothing Me.lblAbfArtUeberschrift.Left = 0! Me.lblAbfArtUeberschrift.Name = "lblAbfArtUeberschrift" + Me.lblAbfArtUeberschrift.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(0, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.lblAbfArtUeberschrift.Style = "background-color: DimGray; color: White; font-size: 10pt; font-weight: bold; text" & "-align: left; vertical-align: middle; ddo-char-set: 1" Me.lblAbfArtUeberschrift.Text = "1 - ZA" @@ -612,6 +646,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.Label9.HyperLink = Nothing Me.Label9.Left = 0.3610249! Me.Label9.Name = "Label9" + Me.Label9.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(0, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.Label9.Style = "font-size: 7pt; font-weight: bold; text-align: left; ddo-char-set: 1" Me.Label9.Text = " Abfertigungen" Me.Label9.Top = 0.08914042! @@ -623,6 +658,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.lblGesSumAnzahl.HyperLink = Nothing Me.lblGesSumAnzahl.Left = 0.00315094! Me.lblGesSumAnzahl.Name = "lblGesSumAnzahl" + Me.lblGesSumAnzahl.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(0, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.lblGesSumAnzahl.Style = "font-size: 7pt; font-weight: bold; text-align: right; ddo-char-set: 1" Me.lblGesSumAnzahl.Text = "0000" Me.lblGesSumAnzahl.Top = 0.08914042! @@ -660,7 +696,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.lblGesHandlingsgebuehr.HyperLink = Nothing Me.lblGesHandlingsgebuehr.Left = 5.607481! Me.lblGesHandlingsgebuehr.Name = "lblGesHandlingsgebuehr" - Me.lblGesHandlingsgebuehr.Padding = New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0) + Me.lblGesHandlingsgebuehr.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.lblGesHandlingsgebuehr.Style = "font-size: 8pt; font-weight: normal; text-align: right; text-justify: auto; ddo-c" & "har-set: 1" Me.lblGesHandlingsgebuehr.Text = "1.000,00" @@ -673,7 +709,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.lblGeszuKassierenHandling.HyperLink = Nothing Me.lblGeszuKassierenHandling.Left = 6.228348! Me.lblGeszuKassierenHandling.Name = "lblGeszuKassierenHandling" - Me.lblGeszuKassierenHandling.Padding = New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0) + Me.lblGeszuKassierenHandling.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.lblGeszuKassierenHandling.Style = "font-size: 8pt; font-weight: normal; text-align: right; text-justify: auto; ddo-c" & "har-set: 1" Me.lblGeszuKassierenHandling.Text = "1.000,00" @@ -686,7 +722,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.lblGesBarzahlungsbetrag.HyperLink = Nothing Me.lblGesBarzahlungsbetrag.Left = 6.853545! Me.lblGesBarzahlungsbetrag.Name = "lblGesBarzahlungsbetrag" - Me.lblGesBarzahlungsbetrag.Padding = New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0) + Me.lblGesBarzahlungsbetrag.Padding = CType(New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0), GrapeCity.ActiveReports.PaddingEx) Me.lblGesBarzahlungsbetrag.Style = "font-size: 8pt; font-weight: normal; text-align: right; text-justify: auto; ddo-c" & "har-set: 1" Me.lblGesBarzahlungsbetrag.Text = "1.000,00" @@ -710,12 +746,12 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Me.Sections.Add(Me.GroupFooter1) Me.Sections.Add(Me.PageFooter) Me.Sections.Add(Me.ReportFooter1) - Me.StyleSheet.Add(New DDCssLib.StyleSheetRule("font-family: Arial; font-style: normal; text-decoration: none; font-weight: norma" & - "l; font-size: 10pt; color: Black; ddo-char-set: 204", "Normal")) - Me.StyleSheet.Add(New DDCssLib.StyleSheetRule("font-size: 16pt; font-weight: bold", "Heading1", "Normal")) - Me.StyleSheet.Add(New DDCssLib.StyleSheetRule("font-family: Times New Roman; font-size: 14pt; font-weight: bold; font-style: ita" & - "lic", "Heading2", "Normal")) - Me.StyleSheet.Add(New DDCssLib.StyleSheetRule("font-size: 13pt; font-weight: bold", "Heading3", "Normal")) + Me.StyleSheet.Add(CType(New DDCssLib.StyleSheetRule("font-family: Arial; font-style: normal; text-decoration: none; font-weight: norma" & + "l; font-size: 10pt; color: Black; ddo-char-set: 204", "Normal"), DDCssLib.StyleSheetRule)) + Me.StyleSheet.Add(CType(New DDCssLib.StyleSheetRule("font-size: 16pt; font-weight: bold", "Heading1", "Normal"), DDCssLib.StyleSheetRule)) + Me.StyleSheet.Add(CType(New DDCssLib.StyleSheetRule("font-family: Times New Roman; font-size: 14pt; font-weight: bold; font-style: ita" & + "lic", "Heading2", "Normal"), DDCssLib.StyleSheetRule)) + Me.StyleSheet.Add(CType(New DDCssLib.StyleSheetRule("font-size: 13pt; font-weight: bold", "Heading3", "Normal"), DDCssLib.StyleSheetRule)) CType(Me.lblPosNr, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblAbfertigungsart, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblAbfDatum, System.ComponentModel.ISupportInitialize).EndInit() @@ -739,6 +775,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen CType(Me.lblSumBarzahlungsbetrag, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label12, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtUebersicht, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtUebersichtAuflistung, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label7, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label6, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label8, System.ComponentModel.ISupportInitialize).EndInit() @@ -806,4 +843,5 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen Public WithEvents lblGesBarzahlungsbetrag As GrapeCity.ActiveReports.SectionReportModel.Label Private WithEvents Label12 As GrapeCity.ActiveReports.SectionReportModel.Label Public WithEvents txtUebersicht As GrapeCity.ActiveReports.SectionReportModel.TextBox + Public WithEvents txtUebersichtAuflistung As GrapeCity.ActiveReports.SectionReportModel.TextBox End Class diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb index 4d6dbd8b..2f66f69c 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb @@ -1751,6 +1751,7 @@ Public Class usrCntlSpeditionsBuchSuche ' Dim gesgesAbfBez = "" Dim SumText = "" + Dim SumTextAbf = "" AddHandler rpt.Detail.Format, Sub() ' rpt.lblVon.Text = CDate(rpt.Fields.Item("von").Value).ToShortDateString ' rpt.lblLKWNr.Text = CDate(rpt.Fields.Item("bis").Value).ToShortDateString @@ -1855,7 +1856,7 @@ Public Class usrCntlSpeditionsBuchSuche sb.AppendLine(String.Format("{0,-15} {1,6} {2,12} {3,15} {4,15}", "Grenzstelle", "Anz", "zu kassieren", "kassiert", "Handling")) - sb.AppendLine(New String("-"c, 65)) + sb.AppendLine(New String("-"c, 70)) For Each r_ As DataRow In dt_summen.Rows @@ -1873,6 +1874,18 @@ Public Class usrCntlSpeditionsBuchSuche rpt.txtUebersicht.Font = New Font("Consolas", 10) rpt.txtUebersicht.Text = SumText + + Dim sb_ueber As New System.Text.StringBuilder + rpt.txtUebersichtAuflistung.Font = New Font("Consolas", 10) + + sb_ueber.AppendLine(String.Format("{0,-6} {1,6} ", "Anz", "Abfertigungsart")) + sb_ueber.AppendLine(New String("-"c, 70)) + + SumTextAbf = sb_ueber.ToString() + + rpt.txtUebersicht.Text &= vbNewLine & vbNewLine & vbNewLine & vbNewLine & SumTextAbf + + Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Case "AMBAR" rpt.lblSumBarzahlungsbetrag.Visible = False @@ -1885,6 +1898,7 @@ Public Class usrCntlSpeditionsBuchSuche rpt.lblAbfArtUeberschrift.Text = checkNull(rpt.Fields.Item("Abfertigungsart").Value) & " - " & checkNull(rpt.Fields.Item("Abfertigungsbezeichnung").Value) bezeichnung = rpt.lblAbfArtUeberschrift.Text + gesAnz = 0 gesBar = 0 geshandling = 0 @@ -1897,8 +1911,9 @@ Public Class usrCntlSpeditionsBuchSuche rpt.lblGeszuKassierenHandling.Text = geszukassBAR.ToString("N2") rpt.lblGesHandlingsgebuehr.Text = geshandling.ToString("N2") - 'SumText &= gesAnz.ToString("N0") & vbTab & bezeichnung & vbNewLine - + rpt.txtUebersichtAuflistung.Font = New Font("Consolas", 10) + 'rpt.txtUebersichtAuflistung.Text &= gesAnz.ToString("N0").PadLeft(8) & " " & bezeichnung & vbNewLine + rpt.txtUebersichtAuflistung.Text &= gesAnz.ToString("N0") & vbTab & bezeichnung & vbNewLine Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/cATLAS_EZA_IMPORT.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/cATLAS_EZA_IMPORT.vb index 02f67778..01edc467 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/cATLAS_EZA_IMPORT.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/cATLAS_EZA_IMPORT.vb @@ -1,10 +1,7 @@ -Imports DAKOSY_Worker -Imports Tamir -Imports Tamir.SharpSsh +Imports System.Globalization +Imports DAKOSY_Worker Imports Microsoft.Office.Interop Imports VERAG_PROG_ALLGEMEIN -Imports javax.xml.bind.annotation -Imports System.Globalization Public Class cATLAS_EZA_IMPORT @@ -187,7 +184,8 @@ Public Class cATLAS_EZA_IMPORT cnt += 1 Next Catch ex As Exception - MsgBox("Fehler beim Einlesen der Excel-Datei!" & vbNewLine & vbNewLine & ex.Message & ex.StackTrace) + 'MsgBox("Fehler beim Einlesen der Excel-Datei!" & vbNewLine & vbNewLine & ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Fehler beim Einlesen der Excel-Datei!" & vbNewLine & ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) Me.Cursor = Cursors.Default Return False End Try @@ -213,7 +211,8 @@ Public Class cATLAS_EZA_IMPORT Catch ex As Exception ' Me.Cursor = Cursors.Default - MsgBox("FEHLER! Datei im richtigen Format?" & vbNewLine & vbNewLine & ex.Message & ex.StackTrace) + 'MsgBox("FEHLER! Datei im richtigen Format?" & vbNewLine & vbNewLine & ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("FEHLER! Datei im richtigen Format?" & vbNewLine & ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) ' Return False End Try End With @@ -389,7 +388,8 @@ Public Class cATLAS_EZA_IMPORT Next Catch ex As Exception - MsgBox("Fehler beim Einlesen der Excel-Datei!" & vbNewLine & vbNewLine & ex.Message & ex.StackTrace) + 'MsgBox("Fehler beim Einlesen der Excel-Datei!" & vbNewLine & vbNewLine & ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Fehler beim Einlesen der Excel-Datei!" & vbNewLine & ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) Me.Cursor = Cursors.Default Return False End Try @@ -414,7 +414,8 @@ Public Class cATLAS_EZA_IMPORT Catch ex As Exception ' Me.Cursor = Cursors.Default - MsgBox("FEHLER! Datei im richtigen Format?" & vbNewLine & vbNewLine & ex.Message & ex.StackTrace) + 'MsgBox("FEHLER! Datei im richtigen Format?" & vbNewLine & vbNewLine & ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("FEHLER! Datei im richtigen Format?" & vbNewLine & ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) ' Return False End Try End With @@ -664,7 +665,7 @@ Public Class cATLAS_EZA_IMPORT End If Next Catch ex As Exception - MsgBox("Fehler beim Einlesen der Excel-Datei!" & vbNewLine & vbNewLine & ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Fehler beim Einlesen der Excel-Datei!" & vbNewLine & ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) Me.Cursor = Cursors.Default Return False End Try @@ -685,7 +686,7 @@ Public Class cATLAS_EZA_IMPORT Catch ex As Exception ' Me.Cursor = Cursors.Default - MsgBox("FEHLER! Datei im richtigen Format?" & vbNewLine & vbNewLine & ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("FEHLER! Datei im richtigen Format?" & vbNewLine & ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) ' Return False End Try End With @@ -931,7 +932,8 @@ Public Class cATLAS_EZA_IMPORT Catch ex As Exception Me.Cursor = Cursors.Default - MsgBox("FEHLER beim Einlesen: " & vbCrLf & ex.Message) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("FEHLER beim Einlesen: " & vbCrLf & ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + Finally ' Ressourcen sauber freigeben Try diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb index 14d6a13f..968df01a 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb @@ -23,34 +23,34 @@ Partial Class usrcntlKundeBearbeitenFull Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle31 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle32 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle33 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle34 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle35 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle36 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle37 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle38 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle39 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle40 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle41 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle42 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle43 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle44 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle45 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle46 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle47 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle48 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle49 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle50 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle51 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle52 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle53 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle54 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle55 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle56 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.tbcntrDetails = New System.Windows.Forms.TabControl() Me.tbAbfertigung = New System.Windows.Forms.TabPage() Me.cbxVerzolltBeiExport = New System.Windows.Forms.CheckBox() @@ -446,6 +446,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cboAuswahl = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.cbxPDFMerge = New System.Windows.Forms.CheckBox() + Me.cbxHR_autoselect = New System.Windows.Forms.CheckBox() Me.tbcntrDetails.SuspendLayout() Me.tbAbfertigung.SuspendLayout() Me.tbcntrAbf.SuspendLayout() @@ -1177,6 +1179,8 @@ Partial Class usrcntlKundeBearbeitenFull ' 'tbVerrechnung ' + Me.tbVerrechnung.Controls.Add(Me.cbxHR_autoselect) + Me.tbVerrechnung.Controls.Add(Me.cbxPDFMerge) Me.tbVerrechnung.Controls.Add(Me.cbxSammelrechnung_IM_EX) Me.tbVerrechnung.Controls.Add(Me.pnlKundenUIDveranlagt) Me.tbVerrechnung.Controls.Add(Me.Label117) @@ -1243,7 +1247,7 @@ Partial Class usrcntlKundeBearbeitenFull 'cbxSammelrechnung_IM_EX ' Me.cbxSammelrechnung_IM_EX.AutoSize = True - Me.cbxSammelrechnung_IM_EX.Location = New System.Drawing.Point(417, 175) + Me.cbxSammelrechnung_IM_EX.Location = New System.Drawing.Point(431, 144) Me.cbxSammelrechnung_IM_EX.Name = "cbxSammelrechnung_IM_EX" Me.cbxSammelrechnung_IM_EX.Size = New System.Drawing.Size(202, 17) Me.cbxSammelrechnung_IM_EX.TabIndex = 54 @@ -1371,7 +1375,7 @@ Partial Class usrcntlKundeBearbeitenFull 'Label117 ' Me.Label117.AutoSize = True - Me.Label117.Location = New System.Drawing.Point(191, 99) + Me.Label117.Location = New System.Drawing.Point(191, 91) Me.Label117.Name = "Label117" Me.Label117.Size = New System.Drawing.Size(30, 13) Me.Label117.TabIndex = 52 @@ -1478,7 +1482,7 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.cbpKopfsammelrechnung.AutoSize = True Me.cbpKopfsammelrechnung.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbpKopfsammelrechnung.Location = New System.Drawing.Point(417, 244) + Me.cbpKopfsammelrechnung.Location = New System.Drawing.Point(431, 213) Me.cbpKopfsammelrechnung.Name = "cbpKopfsammelrechnung" Me.cbpKopfsammelrechnung.Size = New System.Drawing.Size(202, 30) Me.cbpKopfsammelrechnung.TabIndex = 50 @@ -1681,7 +1685,7 @@ Partial Class usrcntlKundeBearbeitenFull 'Label101 ' Me.Label101.AutoSize = True - Me.Label101.Location = New System.Drawing.Point(191, 50) + Me.Label101.Location = New System.Drawing.Point(191, 42) Me.Label101.Name = "Label101" Me.Label101.Size = New System.Drawing.Size(95, 13) Me.Label101.TabIndex = 42 @@ -1691,7 +1695,7 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.cbxSndDatenAusSTB.AutoSize = True Me.cbxSndDatenAusSTB.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxSndDatenAusSTB.Location = New System.Drawing.Point(417, 221) + Me.cbxSndDatenAusSTB.Location = New System.Drawing.Point(431, 190) Me.cbxSndDatenAusSTB.Name = "cbxSndDatenAusSTB" Me.cbxSndDatenAusSTB.Size = New System.Drawing.Size(145, 17) Me.cbxSndDatenAusSTB.TabIndex = 40 @@ -1702,7 +1706,7 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.Label95.AutoSize = True Me.Label95.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label95.Location = New System.Drawing.Point(414, 112) + Me.Label95.Location = New System.Drawing.Point(428, 81) Me.Label95.Name = "Label95" Me.Label95.Size = New System.Drawing.Size(70, 13) Me.Label95.TabIndex = 38 @@ -1711,7 +1715,7 @@ Partial Class usrcntlKundeBearbeitenFull 'cbxSammelrechnungBerichtLeistungsdetails ' Me.cbxSammelrechnungBerichtLeistungsdetails.AutoSize = True - Me.cbxSammelrechnungBerichtLeistungsdetails.Location = New System.Drawing.Point(417, 155) + Me.cbxSammelrechnungBerichtLeistungsdetails.Location = New System.Drawing.Point(431, 124) Me.cbxSammelrechnungBerichtLeistungsdetails.Name = "cbxSammelrechnungBerichtLeistungsdetails" Me.cbxSammelrechnungBerichtLeistungsdetails.Size = New System.Drawing.Size(225, 17) Me.cbxSammelrechnungBerichtLeistungsdetails.TabIndex = 37 @@ -1743,7 +1747,7 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.cbxVeranlagungskunde.AutoSize = True Me.cbxVeranlagungskunde.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxVeranlagungskunde.Location = New System.Drawing.Point(417, 198) + Me.cbxVeranlagungskunde.Location = New System.Drawing.Point(431, 167) Me.cbxVeranlagungskunde.Name = "cbxVeranlagungskunde" Me.cbxVeranlagungskunde.Size = New System.Drawing.Size(121, 17) Me.cbxVeranlagungskunde.TabIndex = 34 @@ -1753,7 +1757,7 @@ Partial Class usrcntlKundeBearbeitenFull 'Label93 ' Me.Label93.AutoSize = True - Me.Label93.Location = New System.Drawing.Point(12, 23) + Me.Label93.Location = New System.Drawing.Point(12, 15) Me.Label93.Name = "Label93" Me.Label93.Size = New System.Drawing.Size(110, 13) Me.Label93.TabIndex = 32 @@ -1763,7 +1767,7 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.cbxAutoFakturierung.AutoSize = True Me.cbxAutoFakturierung.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxAutoFakturierung.Location = New System.Drawing.Point(417, 135) + Me.cbxAutoFakturierung.Location = New System.Drawing.Point(431, 104) Me.cbxAutoFakturierung.Name = "cbxAutoFakturierung" Me.cbxAutoFakturierung.Size = New System.Drawing.Size(118, 17) Me.cbxAutoFakturierung.TabIndex = 31 @@ -1835,7 +1839,7 @@ Partial Class usrcntlKundeBearbeitenFull 'Label47 ' Me.Label47.AutoSize = True - Me.Label47.Location = New System.Drawing.Point(191, 77) + Me.Label47.Location = New System.Drawing.Point(191, 69) Me.Label47.Name = "Label47" Me.Label47.Size = New System.Drawing.Size(30, 13) Me.Label47.TabIndex = 15 @@ -1844,7 +1848,7 @@ Partial Class usrcntlKundeBearbeitenFull 'Label46 ' Me.Label46.AutoSize = True - Me.Label46.Location = New System.Drawing.Point(12, 77) + Me.Label46.Location = New System.Drawing.Point(12, 69) Me.Label46.Name = "Label46" Me.Label46.Size = New System.Drawing.Size(69, 13) Me.Label46.TabIndex = 10 @@ -1853,7 +1857,7 @@ Partial Class usrcntlKundeBearbeitenFull 'Label45 ' Me.Label45.AutoSize = True - Me.Label45.Location = New System.Drawing.Point(12, 51) + Me.Label45.Location = New System.Drawing.Point(12, 43) Me.Label45.Name = "Label45" Me.Label45.Size = New System.Drawing.Size(108, 13) Me.Label45.TabIndex = 5 @@ -1882,7 +1886,7 @@ Partial Class usrcntlKundeBearbeitenFull 'Label44 ' Me.Label44.AutoSize = True - Me.Label44.Location = New System.Drawing.Point(12, 97) + Me.Label44.Location = New System.Drawing.Point(12, 89) Me.Label44.Name = "Label44" Me.Label44.Size = New System.Drawing.Size(88, 13) Me.Label44.TabIndex = 0 @@ -1901,7 +1905,7 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.cbxAbf_SvsRvs.AutoSize = True Me.cbxAbf_SvsRvs.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxAbf_SvsRvs.Location = New System.Drawing.Point(289, 118) + Me.cbxAbf_SvsRvs.Location = New System.Drawing.Point(289, 110) Me.cbxAbf_SvsRvs.Name = "cbxAbf_SvsRvs" Me.cbxAbf_SvsRvs.Size = New System.Drawing.Size(74, 17) Me.cbxAbf_SvsRvs.TabIndex = 12 @@ -1912,7 +1916,7 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.cbxAbf_Rabattstaffel.AutoSize = True Me.cbxAbf_Rabattstaffel.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxAbf_Rabattstaffel.Location = New System.Drawing.Point(289, 96) + Me.cbxAbf_Rabattstaffel.Location = New System.Drawing.Point(289, 88) Me.cbxAbf_Rabattstaffel.Name = "cbxAbf_Rabattstaffel" Me.cbxAbf_Rabattstaffel.Size = New System.Drawing.Size(86, 17) Me.cbxAbf_Rabattstaffel.TabIndex = 7 @@ -1923,7 +1927,7 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.cbxAbf_Vorkasse.AutoSize = True Me.cbxAbf_Vorkasse.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxAbf_Vorkasse.Location = New System.Drawing.Point(289, 74) + Me.cbxAbf_Vorkasse.Location = New System.Drawing.Point(289, 66) Me.cbxAbf_Vorkasse.Name = "cbxAbf_Vorkasse" Me.cbxAbf_Vorkasse.Size = New System.Drawing.Size(70, 17) Me.cbxAbf_Vorkasse.TabIndex = 2 @@ -1934,7 +1938,7 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.Label49.AutoSize = True Me.Label49.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label49.Location = New System.Drawing.Point(414, 93) + Me.Label49.Location = New System.Drawing.Point(428, 62) Me.Label49.Name = "Label49" Me.Label49.Size = New System.Drawing.Size(54, 13) Me.Label49.TabIndex = 13 @@ -1944,7 +1948,7 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.Label48.AutoSize = True Me.Label48.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label48.Location = New System.Drawing.Point(414, 68) + Me.Label48.Location = New System.Drawing.Point(428, 37) Me.Label48.Name = "Label48" Me.Label48.Size = New System.Drawing.Size(90, 13) Me.Label48.TabIndex = 8 @@ -1954,7 +1958,7 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.Label39.AutoSize = True Me.Label39.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label39.Location = New System.Drawing.Point(414, 49) + Me.Label39.Location = New System.Drawing.Point(428, 18) Me.Label39.Name = "Label39" Me.Label39.Size = New System.Drawing.Size(92, 13) Me.Label39.TabIndex = 3 @@ -1975,7 +1979,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtAbf_Vorlageprovision_Mindestbetrag._Waehrung = True Me.txtAbf_Vorlageprovision_Mindestbetrag._WaehrungZeichen = True Me.txtAbf_Vorlageprovision_Mindestbetrag.ForeColor = System.Drawing.Color.Red - Me.txtAbf_Vorlageprovision_Mindestbetrag.Location = New System.Drawing.Point(222, 95) + Me.txtAbf_Vorlageprovision_Mindestbetrag.Location = New System.Drawing.Point(222, 87) Me.txtAbf_Vorlageprovision_Mindestbetrag.MaxLength = 50 Me.txtAbf_Vorlageprovision_Mindestbetrag.MaxLineLength = -1 Me.txtAbf_Vorlageprovision_Mindestbetrag.MaxLines_Warning = "" @@ -2041,7 +2045,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtAbwZZVL._Waehrung = False Me.txtAbwZZVL._WaehrungZeichen = True Me.txtAbwZZVL.ForeColor = System.Drawing.Color.Red - Me.txtAbwZZVL.Location = New System.Drawing.Point(289, 47) + Me.txtAbwZZVL.Location = New System.Drawing.Point(289, 39) Me.txtAbwZZVL.MaxLength = 10 Me.txtAbwZZVL.MaxLineLength = -1 Me.txtAbwZZVL.MaxLines_Warning = "" @@ -2062,7 +2066,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.cboRechnungSprache.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.cboRechnungSprache.ForeColor = System.Drawing.Color.Black Me.cboRechnungSprache.FormattingEnabled = True - Me.cboRechnungSprache.Location = New System.Drawing.Point(527, 109) + Me.cboRechnungSprache.Location = New System.Drawing.Point(541, 78) Me.cboRechnungSprache.Name = "cboRechnungSprache" Me.cboRechnungSprache.Size = New System.Drawing.Size(73, 21) Me.cboRechnungSprache.TabIndex = 39 @@ -2082,7 +2086,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtDebKdNr._Waehrung = False Me.txtDebKdNr._WaehrungZeichen = False Me.txtDebKdNr.ForeColor = System.Drawing.Color.Red - Me.txtDebKdNr.Location = New System.Drawing.Point(125, 20) + Me.txtDebKdNr.Location = New System.Drawing.Point(125, 12) Me.txtDebKdNr.MaxLength = 10 Me.txtDebKdNr.MaxLineLength = -1 Me.txtDebKdNr.MaxLines_Warning = "" @@ -2260,7 +2264,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.cboAbf_Waehrung.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.cboAbf_Waehrung.ForeColor = System.Drawing.Color.Black Me.cboAbf_Waehrung.FormattingEnabled = True - Me.cboAbf_Waehrung.Location = New System.Drawing.Point(527, 87) + Me.cboAbf_Waehrung.Location = New System.Drawing.Point(541, 56) Me.cboAbf_Waehrung.Name = "cboAbf_Waehrung" Me.cboAbf_Waehrung.Size = New System.Drawing.Size(47, 21) Me.cboAbf_Waehrung.TabIndex = 14 @@ -2276,7 +2280,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.cboAbf_Steuerschluessel.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.cboAbf_Steuerschluessel.ForeColor = System.Drawing.Color.Black Me.cboAbf_Steuerschluessel.FormattingEnabled = True - Me.cboAbf_Steuerschluessel.Location = New System.Drawing.Point(527, 65) + Me.cboAbf_Steuerschluessel.Location = New System.Drawing.Point(541, 34) Me.cboAbf_Steuerschluessel.Name = "cboAbf_Steuerschluessel" Me.cboAbf_Steuerschluessel.Size = New System.Drawing.Size(105, 21) Me.cboAbf_Steuerschluessel.TabIndex = 9 @@ -2292,7 +2296,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.cboAbf_Sammelrechnung.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.cboAbf_Sammelrechnung.ForeColor = System.Drawing.Color.Black Me.cboAbf_Sammelrechnung.FormattingEnabled = True - Me.cboAbf_Sammelrechnung.Location = New System.Drawing.Point(527, 43) + Me.cboAbf_Sammelrechnung.Location = New System.Drawing.Point(541, 12) Me.cboAbf_Sammelrechnung.Name = "cboAbf_Sammelrechnung" Me.cboAbf_Sammelrechnung.Size = New System.Drawing.Size(105, 21) Me.cboAbf_Sammelrechnung.TabIndex = 4 @@ -2312,7 +2316,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtAbf_BankspesenMindestbetrag._Waehrung = True Me.txtAbf_BankspesenMindestbetrag._WaehrungZeichen = True Me.txtAbf_BankspesenMindestbetrag.ForeColor = System.Drawing.Color.Red - Me.txtAbf_BankspesenMindestbetrag.Location = New System.Drawing.Point(222, 70) + Me.txtAbf_BankspesenMindestbetrag.Location = New System.Drawing.Point(222, 62) Me.txtAbf_BankspesenMindestbetrag.MaxLength = 50 Me.txtAbf_BankspesenMindestbetrag.MaxLineLength = -1 Me.txtAbf_BankspesenMindestbetrag.MaxLines_Warning = "" @@ -2337,7 +2341,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtAbf_Bankspesen._Waehrung = False Me.txtAbf_Bankspesen._WaehrungZeichen = True Me.txtAbf_Bankspesen.ForeColor = System.Drawing.Color.Black - Me.txtAbf_Bankspesen.Location = New System.Drawing.Point(125, 74) + Me.txtAbf_Bankspesen.Location = New System.Drawing.Point(125, 66) Me.txtAbf_Bankspesen.MaxLength = 10 Me.txtAbf_Bankspesen.MaxLineLength = -1 Me.txtAbf_Bankspesen.MaxLines_Warning = "" @@ -2363,7 +2367,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtAbf_Kreditaufwendungen._Waehrung = False Me.txtAbf_Kreditaufwendungen._WaehrungZeichen = True Me.txtAbf_Kreditaufwendungen.ForeColor = System.Drawing.Color.Black - Me.txtAbf_Kreditaufwendungen.Location = New System.Drawing.Point(125, 48) + Me.txtAbf_Kreditaufwendungen.Location = New System.Drawing.Point(125, 40) Me.txtAbf_Kreditaufwendungen.MaxLength = 10 Me.txtAbf_Kreditaufwendungen.MaxLineLength = -1 Me.txtAbf_Kreditaufwendungen.MaxLines_Warning = "" @@ -2389,7 +2393,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtAbf_Vorlageprovision._Waehrung = False Me.txtAbf_Vorlageprovision._WaehrungZeichen = True Me.txtAbf_Vorlageprovision.ForeColor = System.Drawing.Color.Black - Me.txtAbf_Vorlageprovision.Location = New System.Drawing.Point(125, 96) + Me.txtAbf_Vorlageprovision.Location = New System.Drawing.Point(125, 88) Me.txtAbf_Vorlageprovision.MaxLength = 10 Me.txtAbf_Vorlageprovision.MaxLineLength = -1 Me.txtAbf_Vorlageprovision.MaxLines_Warning = "" @@ -3488,8 +3492,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvUmsatzbericht.AllowUserToDeleteRows = False Me.dgvUmsatzbericht.AllowUserToOrderColumns = True Me.dgvUmsatzbericht.AllowUserToResizeRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle29.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle29 Me.dgvUmsatzbericht.BackgroundColor = System.Drawing.Color.White Me.dgvUmsatzbericht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvUmsatzbericht.Location = New System.Drawing.Point(6, 25) @@ -3588,8 +3592,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvOffenePosten.AllowUserToDeleteRows = False Me.dgvOffenePosten.AllowUserToOrderColumns = True Me.dgvOffenePosten.AllowUserToResizeRows = False - DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle30.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle30 Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvOffenePosten.Location = New System.Drawing.Point(6, 38) @@ -3764,40 +3768,40 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvKreditkarten.AllowUserToDeleteRows = False Me.dgvKreditkarten.AllowUserToOrderColumns = True Me.dgvKreditkarten.AllowUserToResizeRows = False - DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle31.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle31 Me.dgvKreditkarten.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle32.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle32.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle32.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle32.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle32.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle32 Me.dgvKreditkarten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle5 + DataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle33.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle33.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle33.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle33.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle33.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle33 Me.dgvKreditkarten.Location = New System.Drawing.Point(9, 20) Me.dgvKreditkarten.MultiSelect = False Me.dgvKreditkarten.Name = "dgvKreditkarten" - DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle6 + DataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle34.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle34.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle34.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle34.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle34.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle34 Me.dgvKreditkarten.RowHeadersVisible = False - DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle7 + DataGridViewCellStyle35.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle35 Me.dgvKreditkarten.RowTemplate.DefaultCellStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.dgvKreditkarten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvKreditkarten.Size = New System.Drawing.Size(642, 312) @@ -3877,26 +3881,26 @@ Partial Class usrcntlKundeBearbeitenFull ' 'dgvMWST ' - DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvMWST.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8 + DataGridViewCellStyle36.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvMWST.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle36 Me.dgvMWST.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvMWST.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle9 + DataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle37.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle37.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle37.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle37.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle37.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle37.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvMWST.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle37 Me.dgvMWST.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvMWST.DefaultCellStyle = DataGridViewCellStyle10 + DataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle38.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle38.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle38.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle38.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle38.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle38.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvMWST.DefaultCellStyle = DataGridViewCellStyle38 Me.dgvMWST.Location = New System.Drawing.Point(9, 359) Me.dgvMWST.Name = "dgvMWST" Me.dgvMWST.Size = New System.Drawing.Size(171, 125) @@ -3955,26 +3959,26 @@ Partial Class usrcntlKundeBearbeitenFull ' 'dgvUstv_LaenderUndSteuernummern ' - DataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11 + DataGridViewCellStyle39.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle39 Me.dgvUstv_LaenderUndSteuernummern.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle12 + DataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle40.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle40.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle40.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle40.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle40.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle40.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle40 Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvUstv_LaenderUndSteuernummern.DefaultCellStyle = DataGridViewCellStyle13 + DataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle41.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle41.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle41.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle41.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle41.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle41.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvUstv_LaenderUndSteuernummern.DefaultCellStyle = DataGridViewCellStyle41 Me.dgvUstv_LaenderUndSteuernummern.Location = New System.Drawing.Point(9, 94) Me.dgvUstv_LaenderUndSteuernummern.Name = "dgvUstv_LaenderUndSteuernummern" Me.dgvUstv_LaenderUndSteuernummern.Size = New System.Drawing.Size(657, 259) @@ -4252,26 +4256,26 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvIDS_Standard.AllowUserToAddRows = False Me.dgvIDS_Standard.AllowUserToDeleteRows = False Me.dgvIDS_Standard.AllowUserToResizeRows = False - DataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvIDS_Standard.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14 + DataGridViewCellStyle42.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvIDS_Standard.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle42 Me.dgvIDS_Standard.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvIDS_Standard.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle15 + DataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle43.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle43.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle43.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle43.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle43.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle43.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvIDS_Standard.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle43 Me.dgvIDS_Standard.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvIDS_Standard.DefaultCellStyle = DataGridViewCellStyle16 + DataGridViewCellStyle44.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle44.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle44.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle44.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle44.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle44.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle44.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvIDS_Standard.DefaultCellStyle = DataGridViewCellStyle44 Me.dgvIDS_Standard.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvIDS_Standard.Location = New System.Drawing.Point(3, 3) Me.dgvIDS_Standard.Name = "dgvIDS_Standard" @@ -4294,26 +4298,26 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvIDS_Rabatte.AllowUserToAddRows = False Me.dgvIDS_Rabatte.AllowUserToDeleteRows = False Me.dgvIDS_Rabatte.AllowUserToResizeRows = False - DataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvIDS_Rabatte.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17 + DataGridViewCellStyle45.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvIDS_Rabatte.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle45 Me.dgvIDS_Rabatte.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvIDS_Rabatte.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle18 + DataGridViewCellStyle46.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle46.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle46.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle46.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle46.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle46.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle46.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvIDS_Rabatte.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle46 Me.dgvIDS_Rabatte.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvIDS_Rabatte.DefaultCellStyle = DataGridViewCellStyle19 + DataGridViewCellStyle47.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle47.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle47.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle47.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle47.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle47.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle47.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvIDS_Rabatte.DefaultCellStyle = DataGridViewCellStyle47 Me.dgvIDS_Rabatte.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvIDS_Rabatte.Location = New System.Drawing.Point(3, 3) Me.dgvIDS_Rabatte.Name = "dgvIDS_Rabatte" @@ -4510,26 +4514,26 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvSonst_IDSKunden.AllowUserToAddRows = False Me.dgvSonst_IDSKunden.AllowUserToDeleteRows = False Me.dgvSonst_IDSKunden.AllowUserToResizeRows = False - DataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle20 + DataGridViewCellStyle48.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle48 Me.dgvSonst_IDSKunden.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSonst_IDSKunden.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle21 + DataGridViewCellStyle49.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle49.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle49.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle49.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle49.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle49.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle49.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSonst_IDSKunden.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle49 Me.dgvSonst_IDSKunden.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvSonst_IDSKunden.DefaultCellStyle = DataGridViewCellStyle22 + DataGridViewCellStyle50.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle50.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle50.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle50.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle50.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle50.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle50.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvSonst_IDSKunden.DefaultCellStyle = DataGridViewCellStyle50 Me.dgvSonst_IDSKunden.Location = New System.Drawing.Point(9, 214) Me.dgvSonst_IDSKunden.MultiSelect = False Me.dgvSonst_IDSKunden.Name = "dgvSonst_IDSKunden" @@ -4863,26 +4867,26 @@ Partial Class usrcntlKundeBearbeitenFull 'DataGridView1 ' Me.DataGridView1.AllowUserToResizeRows = False - DataGridViewCellStyle23.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle23 + DataGridViewCellStyle51.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle51 Me.DataGridView1.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.DataGridView1.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle24 + DataGridViewCellStyle52.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle52.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle52.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle52.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle52.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle52.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle52.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.DataGridView1.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle52 Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.DataGridView1.DefaultCellStyle = DataGridViewCellStyle25 + DataGridViewCellStyle53.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle53.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle53.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle53.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle53.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle53.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle53.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.DataGridView1.DefaultCellStyle = DataGridViewCellStyle53 Me.DataGridView1.Enabled = False Me.DataGridView1.Location = New System.Drawing.Point(6, 111) Me.DataGridView1.MultiSelect = False @@ -4949,26 +4953,26 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.dgvBankverbindungen.AllowUserToDeleteRows = False Me.dgvBankverbindungen.AllowUserToResizeRows = False - DataGridViewCellStyle26.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvBankverbindungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle26 + DataGridViewCellStyle54.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvBankverbindungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle54 Me.dgvBankverbindungen.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvBankverbindungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle27 + DataGridViewCellStyle55.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle55.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle55.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle55.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle55.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle55.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle55.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvBankverbindungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle55 Me.dgvBankverbindungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle28.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvBankverbindungen.DefaultCellStyle = DataGridViewCellStyle28 + DataGridViewCellStyle56.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle56.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle56.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle56.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle56.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle56.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle56.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvBankverbindungen.DefaultCellStyle = DataGridViewCellStyle56 Me.dgvBankverbindungen.Location = New System.Drawing.Point(3, 40) Me.dgvBankverbindungen.MultiSelect = False Me.dgvBankverbindungen.Name = "dgvBankverbindungen" @@ -6124,6 +6128,28 @@ Partial Class usrcntlKundeBearbeitenFull Me.DataGridViewTextBoxColumn2.HeaderText = "E-Mail" Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" ' + 'cbxPDFMerge + ' + Me.cbxPDFMerge.AutoSize = True + Me.cbxPDFMerge.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxPDFMerge.Location = New System.Drawing.Point(431, 244) + Me.cbxPDFMerge.Name = "cbxPDFMerge" + Me.cbxPDFMerge.Size = New System.Drawing.Size(183, 17) + Me.cbxPDFMerge.TabIndex = 55 + Me.cbxPDFMerge.Text = "alle PDFs in RE zusammenführen" + Me.cbxPDFMerge.UseVisualStyleBackColor = True + ' + 'cbxHR_autoselect + ' + Me.cbxHR_autoselect.AutoSize = True + Me.cbxHR_autoselect.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxHR_autoselect.Location = New System.Drawing.Point(431, 264) + Me.cbxHR_autoselect.Name = "cbxHR_autoselect" + Me.cbxHR_autoselect.Size = New System.Drawing.Size(188, 17) + Me.cbxHR_autoselect.TabIndex = 56 + Me.cbxHR_autoselect.Text = "Handelrechnung in RE auswählen" + Me.cbxHR_autoselect.UseVisualStyleBackColor = True + ' 'usrcntlKundeBearbeitenFull ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -6632,4 +6658,6 @@ Partial Class usrcntlKundeBearbeitenFull Friend WithEvents Button6 As Button Friend WithEvents Label122 As Label Friend WithEvents cbxSammelrechnung_IM_EX As CheckBox + Friend WithEvents cbxPDFMerge As CheckBox + Friend WithEvents cbxHR_autoselect As CheckBox End Class diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index deae2e0e..acb6e345 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -233,6 +233,9 @@ Public Class usrcntlKundeBearbeitenFull cbpKopfsammelrechnung.Checked = KUNDE_ERW.kde_Kopfsammelrechnung txtAnmerkungAntraege.Text = loadValue(KUNDE_ERW.kde_AnmerkungAntrag, "") + cbxPDFMerge.Checked = KUNDE_ERW.kde_merge_pdf + cbxHR_autoselect.Checked = KUNDE_ERW.kde_autoselect_handelsrechnung + txtEORI.Text = If(KUNDE.EORITIN, "") txtEORINL.Text = If(KUNDE.EORITIN_NL, "") @@ -665,6 +668,9 @@ Public Class usrcntlKundeBearbeitenFull KUNDE_ERW.kde_AnmerkungFR = txtFR.Text KUNDE_ERW.kde_Kopfsammelrechnung = cbpKopfsammelrechnung.Checked + KUNDE_ERW.kde_merge_pdf = cbxPDFMerge.Checked + KUNDE_ERW.kde_autoselect_handelsrechnung = cbxHR_autoselect.Checked + If isLeerNothing(txtGruendungsDatum.Text) IsNot Nothing AndAlso IsDate(txtGruendungsDatum.Text) Then KUNDE_ERW.kde_GruendungsDatum = CDate(txtGruendungsDatum.Text) End If diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb b/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb index 36abb187..469a3088 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb @@ -114,6 +114,8 @@ Public Class cKundenErweitert Property kde_CBAM_CBAMAccountNo As Object = Nothing Property kde_abwToleranzTage As Object = Nothing Property kde_SR_IM_EX As Boolean = False + Property kde_merge_pdf As Boolean = True + Property kde_autoselect_handelsrechnung As Boolean = False Dim SQL As New SQL @@ -236,6 +238,8 @@ Public Class cKundenErweitert list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CBAM_CBAMAccountNo", kde_CBAM_CBAMAccountNo)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_abwToleranzTage", kde_abwToleranzTage)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_SR_IM_EX", kde_SR_IM_EX)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_merge_pdf", kde_merge_pdf)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_autoselect_handelsrechnung", kde_autoselect_handelsrechnung))