From 655614a6eee2762f9550583421060ebedf4fc7b8 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 6 Nov 2025 14:12:55 +0100 Subject: [PATCH] ustv, etc. --- SDL/Fakturierung/cFakturierung.vb | 34 +- .../rptRechnungDruck_MDM.Designer.vb | 58 +-- ...agenDruck_Zinsennachberechnung.Designer.vb | 96 ++-- ...ngMDM_AnlagenDruck_Zinsennachberechnung.vb | 2 +- SDL/USTV/usrCntlUSTV.Designer.vb | 72 +-- SDL/USTV/usrCntlUSTV.vb | 45 +- SDL/buchhaltung/usrCntlBH.vb | 2 +- SDL/kunden/frmKundenblatt.Designer.vb | 484 ++++++++++-------- SDL/kunden/frmKundenblatt.vb | 135 +++-- 9 files changed, 511 insertions(+), 417 deletions(-) diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index 45fbd627..b17958dc 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -2327,34 +2327,26 @@ Public Class cFakturierung rpt.lblLeistungUeberschrift.Alignment = GrapeCity.ActiveReports.Document.Section.TextAlignment.Left Select Case RECHNUNG.RechnungSprache - ' Case "EN" - ' rpt.lblLeistungUeberschrift.Text = "Inv. No." - ' rpt.lblAnzahlUeberschrift.Text = "OD days" - ' rpt.lblSteuerpflichtigUeberschrift.Text = "Payment Amount" - ' rpt.lblSteuerfreiUeberschrift.Text = "Default Interest" - ' 'rpt.lbl_onlyZR_ZinsenUeberschrift.Text = "Interest p.a." + Case "EN" - ' Case "TR" + rpt.txtSendungsdaten.Text = rpt.txtSendungsdaten.Text.Replace("NACHBERECHNUNG VON VERZUGSZINSEN", "CHARGING OF DEFAULT INTEREST") + rpt.txtSendungsdaten.Text = rpt.txtSendungsdaten.Text.Replace("Zahlungen von", "Payments from") - ' rpt.lblLeistungUeberschrift.Text = "Belge" - ' rpt.lblAnzahlUeberschrift.Text = "Günler" - ' rpt.lblSteuerpflichtigUeberschrift.Text = "Ödeme tutarı" - ' rpt.lblSteuerfreiUeberschrift.Text = "Geç ödeme faizi" - ' ' rpt.lbl_onlyZR_ZinsenUeberschrift.Text = "Zinsen p.a." + Case "TR" - ' Case "RO" + rpt.txtSendungsdaten.Text = rpt.txtSendungsdaten.Text.Replace("NACHBERECHNUNG VON VERZUGSZINSEN", "TEMERRÃœT FAÄ°ZÄ°NÄ°N YENÄ°DEN HESAPLANMASI") + rpt.txtSendungsdaten.Text = rpt.txtSendungsdaten.Text.Replace("Zahlungen von", "tarihleri ​​arasında yapılan ödemeler") - ' rpt.lblLeistungUeberschrift.Text = "Nr. fact." - ' rpt.lblAnzahlUeberschrift.Text = "Nr. zile" - ' rpt.lblSteuerpflichtigUeberschrift.Text = "Suma de plata" - ' rpt.lblSteuerfreiUeberschrift.Text = "Penalitati" - ' 'rpt.lbl_onlyZR_ZinsenUeberschrift.Text = "Dobândă p.a." + Case "RO" + + rpt.txtSendungsdaten.Text = rpt.txtSendungsdaten.Text.Replace("NACHBERECHNUNG VON VERZUGSZINSEN", "CALCUL MAJORARI PENTRU INTARZIERE LA PLATA") + rpt.txtSendungsdaten.Text = rpt.txtSendungsdaten.Text.Replace("Zahlungen von", "Perioda") Case Else rpt.lblLeistungUeberschrift.Text = "RENR" rpt.lblAnzahlUeberschrift.Text = "VZ Tage" - rpt.lblSteuerpflichtigUeberschrift.Text = "Zahlungsbetrag" + rpt.lblSteuerpflichtigUeberschrift.Text = "Zahlungsbetrag" rpt.lblSteuerfreiUeberschrift.Text = "Verzugszinsen" 'rpt.lbl_onlyZR_ZinsenUeberschrift.Text = "Zinsen p.a." End Select @@ -2363,13 +2355,11 @@ Public Class cFakturierung rpt.lblSteuerpflichtigUeberschrift.Alignment = GrapeCity.ActiveReports.Document.Section.TextAlignment.Center rpt.lblSteuerfreiUeberschrift.Alignment = GrapeCity.ActiveReports.Document.Section.TextAlignment.Right - - rpt.lbl_onlyZR_ZinsenUeberschrift.Alignment = GrapeCity.ActiveReports.Document.Section.TextAlignment.Left + rpt.lbl_onlyZR_ZinsenUeberschrift.Alignment = GrapeCity.ActiveReports.Document.Section.TextAlignment.Center rpt.lbl_onlyZR_ReDatUeberschrift.Visible = True rpt.lbl_onlyZR_FaelligUeberschrift.Visible = True rpt.lbl_onlyZR_ZinsenUeberschrift.Visible = True rpt.lbl_onlyZR_ZahlungsDatUeberschrift.Visible = True - rpt.txtLeistung.Visible = False Else diff --git a/SDL/Fakturierung/rptRechnungDruck_MDM.Designer.vb b/SDL/Fakturierung/rptRechnungDruck_MDM.Designer.vb index 325cdf32..bfd93eb6 100644 --- a/SDL/Fakturierung/rptRechnungDruck_MDM.Designer.vb +++ b/SDL/Fakturierung/rptRechnungDruck_MDM.Designer.vb @@ -126,11 +126,11 @@ Partial Public Class rptRechnungDruck_MDM Me.Line13 = New GrapeCity.ActiveReports.SectionReportModel.Line() Me.Line16 = New GrapeCity.ActiveReports.SectionReportModel.Line() Me.Line18 = New GrapeCity.ActiveReports.SectionReportModel.Line() - Me.GroupFooter4 = New GrapeCity.ActiveReports.SectionReportModel.GroupFooter() Me.lblAbsenderUeberschrift = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.lblEmpfaengerUeberschrift = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.txtAbsender = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.txtEmpfaenger = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.GroupFooter4 = New GrapeCity.ActiveReports.SectionReportModel.GroupFooter() CType(Me.lblLeistungNr, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblAnzahl, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblSteuerfrei, System.ComponentModel.ISupportInitialize).BeginInit() @@ -230,7 +230,7 @@ Partial Public Class rptRechnungDruck_MDM ' Me.Detail.CanShrink = True Me.Detail.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.lblLeistungNr, Me.lblAnzahl, Me.lblSteuerfrei, Me.lblSteuerpflichtig, Me.txtLeistung, Me.Line10, Me.Line11, Me.SubReport}) - Me.Detail.Height = 0.3901193! + Me.Detail.Height = 0.213036! Me.Detail.KeepTogether = True Me.Detail.Name = "Detail" ' @@ -250,13 +250,13 @@ Partial Public Class rptRechnungDruck_MDM ' Me.lblAnzahl.Height = 0.1574803! Me.lblAnzahl.HyperLink = Nothing - Me.lblAnzahl.Left = 3.380315! + Me.lblAnzahl.Left = 3.883465! Me.lblAnzahl.Name = "lblAnzahl" Me.lblAnzahl.Style = "font-size: 9pt; font-weight: normal; text-align: right; text-justify: auto; ddo-c" & "har-set: 1" Me.lblAnzahl.Text = "999" Me.lblAnzahl.Top = 0! - Me.lblAnzahl.Width = 0.5492127! + Me.lblAnzahl.Width = 0.4472442! ' 'lblSteuerfrei ' @@ -273,12 +273,12 @@ Partial Public Class rptRechnungDruck_MDM ' Me.lblSteuerpflichtig.Height = 0.1574803! Me.lblSteuerpflichtig.HyperLink = Nothing - Me.lblSteuerpflichtig.Left = 3.957481! + Me.lblSteuerpflichtig.Left = 4.330709! Me.lblSteuerpflichtig.Name = "lblSteuerpflichtig" Me.lblSteuerpflichtig.Style = "font-size: 9pt; font-weight: normal; text-align: right; ddo-char-set: 1" Me.lblSteuerpflichtig.Text = "999.999,99" Me.lblSteuerpflichtig.Top = 0! - Me.lblSteuerpflichtig.Width = 1.554331! + Me.lblSteuerpflichtig.Width = 1.181103! ' 'txtLeistung ' @@ -289,7 +289,7 @@ Partial Public Class rptRechnungDruck_MDM "ar-set: 1" Me.txtLeistung.Text = "Verzollung inkl. 5 Tarifnummern" Me.txtLeistung.Top = 0! - Me.txtLeistung.Width = 2.974803! + Me.txtLeistung.Width = 3.477953! ' 'Line10 ' @@ -1231,7 +1231,7 @@ Partial Public Class rptRechnungDruck_MDM ' Me.lblLeistungUeberschrift.Height = 0.1511808! Me.lblLeistungUeberschrift.HyperLink = Nothing - Me.lblLeistungUeberschrift.Left = 0.01417323! + Me.lblLeistungUeberschrift.Left = 0.003937008! Me.lblLeistungUeberschrift.Name = "lblLeistungUeberschrift" Me.lblLeistungUeberschrift.Padding = New GrapeCity.ActiveReports.PaddingEx(6, 0, 0, 0) Me.lblLeistungUeberschrift.Style = "font-size: 8pt; font-weight: bold; text-align: left; text-justify: auto; ddo-char" & @@ -1267,21 +1267,21 @@ Partial Public Class rptRechnungDruck_MDM ' Me.lbl_onlyZR_ZahlungsDatUeberschrift.Height = 0.1511808! Me.lbl_onlyZR_ZahlungsDatUeberschrift.HyperLink = Nothing - Me.lbl_onlyZR_ZahlungsDatUeberschrift.Left = 2.492528! + Me.lbl_onlyZR_ZahlungsDatUeberschrift.Left = 2.629921! Me.lbl_onlyZR_ZahlungsDatUeberschrift.Name = "lbl_onlyZR_ZahlungsDatUeberschrift" Me.lbl_onlyZR_ZahlungsDatUeberschrift.Padding = New GrapeCity.ActiveReports.PaddingEx(6, 0, 0, 0) Me.lbl_onlyZR_ZahlungsDatUeberschrift.Style = "font-size: 8pt; font-weight: bold; text-align: left; text-justify: auto; ddo-char" & "-set: 1" Me.lbl_onlyZR_ZahlungsDatUeberschrift.Text = "Zahlung" - Me.lbl_onlyZR_ZahlungsDatUeberschrift.Top = 1.079378! + Me.lbl_onlyZR_ZahlungsDatUeberschrift.Top = 1.079528! Me.lbl_onlyZR_ZahlungsDatUeberschrift.Visible = False Me.lbl_onlyZR_ZahlungsDatUeberschrift.Width = 0.9661421! ' 'lbl_onlyZR_FaelligUeberschrift ' - Me.lbl_onlyZR_FaelligUeberschrift.Height = 0.1511808! + Me.lbl_onlyZR_FaelligUeberschrift.Height = 0.1511809! Me.lbl_onlyZR_FaelligUeberschrift.HyperLink = Nothing - Me.lbl_onlyZR_FaelligUeberschrift.Left = 2.001584! + Me.lbl_onlyZR_FaelligUeberschrift.Left = 1.907874! Me.lbl_onlyZR_FaelligUeberschrift.Name = "lbl_onlyZR_FaelligUeberschrift" Me.lbl_onlyZR_FaelligUeberschrift.Padding = New GrapeCity.ActiveReports.PaddingEx(6, 0, 0, 0) Me.lbl_onlyZR_FaelligUeberschrift.Style = "font-size: 8pt; font-weight: bold; text-align: left; text-justify: auto; ddo-char" & @@ -1289,11 +1289,11 @@ Partial Public Class rptRechnungDruck_MDM Me.lbl_onlyZR_FaelligUeberschrift.Text = "Fällig" Me.lbl_onlyZR_FaelligUeberschrift.Top = 1.079378! Me.lbl_onlyZR_FaelligUeberschrift.Visible = False - Me.lbl_onlyZR_FaelligUeberschrift.Width = 0.490945! + Me.lbl_onlyZR_FaelligUeberschrift.Width = 0.7220475! ' 'lbl_onlyZR_ReDatUeberschrift ' - Me.lbl_onlyZR_ReDatUeberschrift.Height = 0.1511807! + Me.lbl_onlyZR_ReDatUeberschrift.Height = 0.1511811! Me.lbl_onlyZR_ReDatUeberschrift.HyperLink = Nothing Me.lbl_onlyZR_ReDatUeberschrift.Left = 0.9362291! Me.lbl_onlyZR_ReDatUeberschrift.Name = "lbl_onlyZR_ReDatUeberschrift" @@ -1303,31 +1303,31 @@ Partial Public Class rptRechnungDruck_MDM Me.lbl_onlyZR_ReDatUeberschrift.Text = "Datum" Me.lbl_onlyZR_ReDatUeberschrift.Top = 1.080166! Me.lbl_onlyZR_ReDatUeberschrift.Visible = False - Me.lbl_onlyZR_ReDatUeberschrift.Width = 1.065354! + Me.lbl_onlyZR_ReDatUeberschrift.Width = 0.984252! ' 'lblSteuerpflichtigUeberschrift ' - Me.lblSteuerpflichtigUeberschrift.Height = 0.1511808! + Me.lblSteuerpflichtigUeberschrift.Height = 0.1511811! Me.lblSteuerpflichtigUeberschrift.HyperLink = Nothing - Me.lblSteuerpflichtigUeberschrift.Left = 3.957482! + Me.lblSteuerpflichtigUeberschrift.Left = 4.330709! Me.lblSteuerpflichtigUeberschrift.Name = "lblSteuerpflichtigUeberschrift" Me.lblSteuerpflichtigUeberschrift.Style = "font-size: 8pt; font-weight: bold; text-align: right; text-justify: auto; ddo-cha" & "r-set: 1" Me.lblSteuerpflichtigUeberschrift.Text = "Steuerpflichtig" Me.lblSteuerpflichtigUeberschrift.Top = 1.079528! - Me.lblSteuerpflichtigUeberschrift.Width = 1.554331! + Me.lblSteuerpflichtigUeberschrift.Width = 1.181102! ' 'lblAnzahlUeberschrift ' - Me.lblAnzahlUeberschrift.Height = 0.1511807! + Me.lblAnzahlUeberschrift.Height = 0.1511811! Me.lblAnzahlUeberschrift.HyperLink = Nothing - Me.lblAnzahlUeberschrift.Left = 3.45867! + Me.lblAnzahlUeberschrift.Left = 3.596063! Me.lblAnzahlUeberschrift.Name = "lblAnzahlUeberschrift" Me.lblAnzahlUeberschrift.Style = "font-size: 8pt; font-weight: bold; text-align: right; text-justify: auto; ddo-cha" & "r-set: 1" Me.lblAnzahlUeberschrift.Text = "Anzahl" Me.lblAnzahlUeberschrift.Top = 1.079528! - Me.lblAnzahlUeberschrift.Width = 0.4988112! + Me.lblAnzahlUeberschrift.Width = 0.7346457! ' 'Line4 ' @@ -1336,7 +1336,7 @@ Partial Public Class rptRechnungDruck_MDM Me.Line4.LineWeight = 1.0! Me.Line4.Name = "Line4" Me.Line4.Top = 1.230709! - Me.Line4.Width = 7.475194! + Me.Line4.Width = 7.475193! Me.Line4.X1 = 0.005118821! Me.Line4.X2 = 7.480312! Me.Line4.Y1 = 1.230709! @@ -1472,7 +1472,7 @@ Partial Public Class rptRechnungDruck_MDM ' 'Line13 ' - Me.Line13.Height = 0.2043307! + Me.Line13.Height = 0.20433! Me.Line13.Left = 7.476378! Me.Line13.LineWeight = 1.0! Me.Line13.Name = "Line13" @@ -1498,7 +1498,7 @@ Partial Public Class rptRechnungDruck_MDM ' 'Line18 ' - Me.Line18.Height = 0.2043306! + Me.Line18.Height = 0.204331! Me.Line18.Left = 0.005118111! Me.Line18.LineWeight = 1.0! Me.Line18.Name = "Line18" @@ -1509,11 +1509,6 @@ Partial Public Class rptRechnungDruck_MDM Me.Line18.Y1 = 1.080315! Me.Line18.Y2 = 1.284646! ' - 'GroupFooter4 - ' - Me.GroupFooter4.Height = 0! - Me.GroupFooter4.Name = "GroupFooter4" - ' 'lblAbsenderUeberschrift ' Me.lblAbsenderUeberschrift.Height = 0.1574803! @@ -1560,6 +1555,11 @@ Partial Public Class rptRechnungDruck_MDM Me.txtEmpfaenger.Top = 0! Me.txtEmpfaenger.Width = 2.659449! ' + 'GroupFooter4 + ' + Me.GroupFooter4.Height = 0! + Me.GroupFooter4.Name = "GroupFooter4" + ' 'rptRechnungDruck_MDM ' Me.MasterReport = False diff --git a/SDL/Fakturierung/rptRechnungMDM_AnlagenDruck_Zinsennachberechnung.Designer.vb b/SDL/Fakturierung/rptRechnungMDM_AnlagenDruck_Zinsennachberechnung.Designer.vb index 17eb644a..0b25f531 100644 --- a/SDL/Fakturierung/rptRechnungMDM_AnlagenDruck_Zinsennachberechnung.Designer.vb +++ b/SDL/Fakturierung/rptRechnungMDM_AnlagenDruck_Zinsennachberechnung.Designer.vb @@ -19,6 +19,7 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung Dim resources As System.Resources.ResourceManager = New System.Resources.ResourceManager(GetType(rptRechnungMDM_AnlagenDruck_Zinsennachberechnung)) Me.PageHeader = New GrapeCity.ActiveReports.SectionReportModel.PageHeader() Me.Detail = New GrapeCity.ActiveReports.SectionReportModel.Detail() + Me.txt_Anmerkung = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.txtREnr = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.txtReDat = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.txtZE = New GrapeCity.ActiveReports.SectionReportModel.TextBox() @@ -39,7 +40,7 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung Me.Label1 = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.GroupFooter4 = New GrapeCity.ActiveReports.SectionReportModel.GroupFooter() Me.Line18 = New GrapeCity.ActiveReports.SectionReportModel.Line() - Me.txt_Anmerkung = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + CType(Me.txt_Anmerkung, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtREnr, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtReDat, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtZE, System.ComponentModel.ISupportInitialize).BeginInit() @@ -56,7 +57,6 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung CType(Me.lblZinsen, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblVZ, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txt_Anmerkung, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me, System.ComponentModel.ISupportInitialize).BeginInit() ' 'PageHeader @@ -72,34 +72,47 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung Me.Detail.KeepTogether = True Me.Detail.Name = "Detail" ' + 'txt_Anmerkung + ' + Me.txt_Anmerkung.Height = 0.1338583! + Me.txt_Anmerkung.Left = 1.893307! + Me.txt_Anmerkung.Name = "txt_Anmerkung" + Me.txt_Anmerkung.Padding = New GrapeCity.ActiveReports.PaddingEx(6, 0, 0, 0) + Me.txt_Anmerkung.Style = "color: #202020; font-size: 6.75pt; font-style: italic; text-align: center; ddo-ch" & + "ar-set: 0" + Me.txt_Anmerkung.Text = "-" + Me.txt_Anmerkung.Top = 0! + Me.txt_Anmerkung.Visible = False + Me.txt_Anmerkung.Width = 3.620866! + ' 'txtREnr ' Me.txtREnr.Height = 0.1338583! - Me.txtREnr.Left = 0.005119062! + Me.txtREnr.Left = 0.003937008! Me.txtREnr.Name = "txtREnr" Me.txtREnr.Padding = New GrapeCity.ActiveReports.PaddingEx(6, 0, 0, 0) - Me.txtREnr.Style = "color: #202020; font-size: 6.75pt; font-style: italic; text-align: center; ddo-ch" & - "ar-set: 0" + Me.txtREnr.Style = "color: #202020; font-size: 6.75pt; font-style: italic; text-align: left; ddo-char" & + "-set: 0" Me.txtREnr.Text = "-" Me.txtREnr.Top = 0! - Me.txtREnr.Width = 0.8244095! + Me.txtREnr.Width = 0.9220473! ' 'txtReDat ' Me.txtReDat.Height = 0.1338583! - Me.txtReDat.Left = 0.9232284! + Me.txtReDat.Left = 0.9259843! Me.txtReDat.Name = "txtReDat" Me.txtReDat.Padding = New GrapeCity.ActiveReports.PaddingEx(6, 0, 0, 0) Me.txtReDat.Style = "color: #202020; font-size: 6.75pt; font-style: italic; text-align: center; ddo-ch" & "ar-set: 0" Me.txtReDat.Text = "-" Me.txtReDat.Top = 0! - Me.txtReDat.Width = 0.8657481! + Me.txtReDat.Width = 0.984252! ' 'txtZE ' Me.txtZE.Height = 0.1338583! - Me.txtZE.Left = 2.405118! + Me.txtZE.Left = 2.632284! Me.txtZE.Name = "txtZE" Me.txtZE.Padding = New GrapeCity.ActiveReports.PaddingEx(6, 0, 0, 0) Me.txtZE.Style = "color: #202020; font-size: 6.75pt; font-style: italic; text-align: center; ddo-ch" & @@ -111,26 +124,26 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung 'txtReBetrag ' Me.txtReBetrag.Height = 0.1338583! - Me.txtReBetrag.Left = 3.948426! + Me.txtReBetrag.Left = 4.333071! Me.txtReBetrag.Name = "txtReBetrag" Me.txtReBetrag.Padding = New GrapeCity.ActiveReports.PaddingEx(6, 0, 0, 0) Me.txtReBetrag.Style = "color: #202020; font-size: 6.75pt; font-style: italic; text-align: right; ddo-cha" & "r-set: 0" Me.txtReBetrag.Text = "-" Me.txtReBetrag.Top = 0! - Me.txtReBetrag.Width = 0.9708654! + Me.txtReBetrag.Width = 0.8267719! ' 'txtTage ' Me.txtTage.Height = 0.1338583! - Me.txtTage.Left = 3.37126! + Me.txtTage.Left = 3.598425! Me.txtTage.Name = "txtTage" Me.txtTage.Padding = New GrapeCity.ActiveReports.PaddingEx(6, 0, 0, 0) Me.txtTage.Style = "color: #202020; font-size: 6.75pt; font-style: italic; text-align: right; ddo-cha" & "r-set: 0" Me.txtTage.Text = "-" Me.txtTage.Top = 0! - Me.txtTage.Width = 0.5771654! + Me.txtTage.Width = 0.6618112! ' 'txtZinsen ' @@ -147,7 +160,7 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung 'txtVZ ' Me.txtVZ.Height = 0.1338583! - Me.txtVZ.Left = 5.502756! + Me.txtVZ.Left = 5.514174! Me.txtVZ.Name = "txtVZ" Me.txtVZ.Padding = New GrapeCity.ActiveReports.PaddingEx(6, 0, 0, 0) Me.txtVZ.Style = "color: #202020; font-size: 6.75pt; font-style: italic; text-align: center; ddo-ch" & @@ -159,14 +172,14 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung 'txtFaellig ' Me.txtFaellig.Height = 0.1338583! - Me.txtFaellig.Left = 1.788977! + Me.txtFaellig.Left = 1.910236! Me.txtFaellig.Name = "txtFaellig" Me.txtFaellig.Padding = New GrapeCity.ActiveReports.PaddingEx(6, 0, 0, 0) Me.txtFaellig.Style = "color: #202020; font-size: 6.75pt; font-style: italic; text-align: center; ddo-ch" & "ar-set: 0" Me.txtFaellig.Text = "-" Me.txtFaellig.Top = 0! - Me.txtFaellig.Width = 0.6161416! + Me.txtFaellig.Width = 0.7220473! ' 'PageFooter ' @@ -185,46 +198,46 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung ' Me.lblReNr.Height = 0.1433071! Me.lblReNr.HyperLink = Nothing - Me.lblReNr.Left = 0.005118132! + Me.lblReNr.Left = 0.003937008! Me.lblReNr.Name = "lblReNr" Me.lblReNr.Style = "font-size: 6.75pt; font-weight: bold; text-align: left; text-justify: auto; ddo-c" & "har-set: 0" Me.lblReNr.Text = "RechnungsNr" Me.lblReNr.Top = 0! Me.lblReNr.Visible = False - Me.lblReNr.Width = 0.8244095! + Me.lblReNr.Width = 0.9220473! ' 'lblReDat ' Me.lblReDat.Height = 0.1433071! Me.lblReDat.HyperLink = Nothing - Me.lblReDat.Left = 0.8295276! + Me.lblReDat.Left = 0.9259843! Me.lblReDat.Name = "lblReDat" Me.lblReDat.Style = "font-size: 6.75pt; font-weight: bold; text-align: left; text-justify: auto; ddo-c" & "har-set: 0" Me.lblReDat.Text = "Rechnungsdatum" Me.lblReDat.Top = 0! Me.lblReDat.Visible = False - Me.lblReDat.Width = 1.084646! + Me.lblReDat.Width = 0.984252! ' 'lblReBetrag ' Me.lblReBetrag.Height = 0.1433071! Me.lblReBetrag.HyperLink = Nothing - Me.lblReBetrag.Left = 3.948426! + Me.lblReBetrag.Left = 4.333071! Me.lblReBetrag.Name = "lblReBetrag" Me.lblReBetrag.Style = "font-size: 6.75pt; font-weight: bold; text-align: left; text-justify: auto; ddo-c" & "har-set: 0" Me.lblReBetrag.Text = "Zahlungsbetrag" Me.lblReBetrag.Top = 0! Me.lblReBetrag.Visible = False - Me.lblReBetrag.Width = 1.554331! + Me.lblReBetrag.Width = 1.181102! ' 'lblZahlungsdat ' Me.lblZahlungsdat.Height = 0.1433071! Me.lblZahlungsdat.HyperLink = Nothing - Me.lblZahlungsdat.Left = 2.405118! + Me.lblZahlungsdat.Left = 2.632284! Me.lblZahlungsdat.Name = "lblZahlungsdat" Me.lblZahlungsdat.Style = "font-size: 6.75pt; font-weight: bold; text-align: left; text-justify: auto; ddo-c" & "har-set: 0" @@ -237,14 +250,14 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung ' Me.lblTage.Height = 0.1433071! Me.lblTage.HyperLink = Nothing - Me.lblTage.Left = 3.37126! + Me.lblTage.Left = 3.598425! Me.lblTage.Name = "lblTage" Me.lblTage.Style = "font-size: 6.75pt; font-weight: bold; text-align: left; text-justify: auto; ddo-c" & "har-set: 0" Me.lblTage.Text = "Tage" Me.lblTage.Top = 0! Me.lblTage.Visible = False - Me.lblTage.Width = 0.5771654! + Me.lblTage.Width = 0.7346457! ' 'lblZinsen ' @@ -276,14 +289,14 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung ' Me.Label1.Height = 0.1433071! Me.Label1.HyperLink = Nothing - Me.Label1.Left = 1.914173! + Me.Label1.Left = 1.910236! Me.Label1.Name = "Label1" Me.Label1.Style = "font-size: 6.75pt; font-weight: bold; text-align: left; text-justify: auto; ddo-c" & "har-set: 0" Me.Label1.Text = "Fällig" Me.Label1.Top = 0! Me.Label1.Visible = False - Me.Label1.Width = 0.4909448! + Me.Label1.Width = 0.7220473! ' 'GroupFooter4 ' @@ -293,31 +306,18 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung ' 'Line18 ' - Me.Line18.Height = 0.00004923344! - Me.Line18.Left = 0.03444719! + Me.Line18.Height = 0! + Me.Line18.Left = 0.0976378! Me.Line18.LineColor = System.Drawing.Color.FromArgb(CType(CType(169, Byte), Integer), CType(CType(169, Byte), Integer), CType(CType(169, Byte), Integer)) Me.Line18.LineWeight = 1.0! Me.Line18.Name = "Line18" Me.Line18.Top = 0.0937008! - Me.Line18.Width = 7.323034! - Me.Line18.X1 = 0.03444719! - Me.Line18.X2 = 7.357481! - Me.Line18.Y1 = 0.09375003! + Me.Line18.Width = 6.968504! + Me.Line18.X1 = 0.0976378! + Me.Line18.X2 = 7.066142! + Me.Line18.Y1 = 0.0937008! Me.Line18.Y2 = 0.0937008! ' - 'txt_Anmerkung - ' - Me.txt_Anmerkung.Height = 0.1338583! - Me.txt_Anmerkung.Left = 1.788977! - Me.txt_Anmerkung.Name = "txt_Anmerkung" - Me.txt_Anmerkung.Padding = New GrapeCity.ActiveReports.PaddingEx(6, 0, 0, 0) - Me.txt_Anmerkung.Style = "color: #202020; font-size: 6.75pt; font-style: italic; text-align: center; ddo-ch" & - "ar-set: 0" - Me.txt_Anmerkung.Text = "-" - Me.txt_Anmerkung.Top = 0.02083332! - Me.txt_Anmerkung.Visible = False - Me.txt_Anmerkung.Width = 3.713779! - ' 'rptRechnungMDM_AnlagenDruck_Zinsennachberechnung ' Me.MasterReport = False @@ -327,7 +327,7 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung Me.PageSettings.Margins.Top = 0.3937008! Me.PageSettings.PaperHeight = 11.0! Me.PageSettings.PaperWidth = 8.5! - Me.PrintWidth = 7.452378! + Me.PrintWidth = 7.103184! Me.Sections.Add(Me.PageHeader) Me.Sections.Add(Me.GroupHeader4) Me.Sections.Add(Me.Detail) @@ -339,6 +339,7 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung 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")) + CType(Me.txt_Anmerkung, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtREnr, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtReDat, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtZE, System.ComponentModel.ISupportInitialize).EndInit() @@ -355,7 +356,6 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung CType(Me.lblZinsen, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblVZ, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txt_Anmerkung, System.ComponentModel.ISupportInitialize).EndInit() CType(Me, System.ComponentModel.ISupportInitialize).EndInit() End Sub diff --git a/SDL/Fakturierung/rptRechnungMDM_AnlagenDruck_Zinsennachberechnung.vb b/SDL/Fakturierung/rptRechnungMDM_AnlagenDruck_Zinsennachberechnung.vb index 7217261a..34e041ee 100644 --- a/SDL/Fakturierung/rptRechnungMDM_AnlagenDruck_Zinsennachberechnung.vb +++ b/SDL/Fakturierung/rptRechnungMDM_AnlagenDruck_Zinsennachberechnung.vb @@ -60,7 +60,7 @@ End If If Me.Fields.Item("clmnTage") IsNot Nothing AndAlso Me.Fields.Item("clmnTage").Value IsNot Nothing Then txtTage.Text &= Me.Fields.Item("clmnTage").Value.ToString If Me.Fields.Item("clmnZinsen") IsNot Nothing AndAlso Me.Fields.Item("clmnZinsen").Value IsNot Nothing AndAlso IsNumeric(Me.Fields.Item("clmnZinsen").Value) AndAlso CDbl(Me.Fields.Item("clmnZinsen").Value) <> 0 Then txtZinsen.Text &= CDbl(Me.Fields.Item("clmnZinsen").Value).ToString("N2") - If Me.Fields.Item("clmnVZ") IsNot Nothing AndAlso Me.Fields.Item("clmnVZ").Value IsNot Nothing AndAlso IsNumeric(Me.Fields.Item("clmnVZ").Value) Then txtVZ.Text &= Me.Fields.Item("clmnVZ").Value.ToString() & " %" + If Me.Fields.Item("clmnVZ") IsNot Nothing AndAlso Me.Fields.Item("clmnVZ").Value IsNot Nothing AndAlso IsNumeric(Me.Fields.Item("clmnVZ").Value) Then txtVZ.Text &= Me.Fields.Item("clmnVZ").Value.ToString() & "%" End If End Sub diff --git a/SDL/USTV/usrCntlUSTV.Designer.vb b/SDL/USTV/usrCntlUSTV.Designer.vb index 8db4f257..a1bf802b 100644 --- a/SDL/USTV/usrCntlUSTV.Designer.vb +++ b/SDL/USTV/usrCntlUSTV.Designer.vb @@ -292,25 +292,27 @@ Partial Class usrCntlUSTV Me.txtRisiko._Waehrung = True Me.txtRisiko._WaehrungZeichen = True Me.txtRisiko.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtRisiko.BackColor = System.Drawing.Color.IndianRed + Me.txtRisiko.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtRisiko.ForeColor = System.Drawing.Color.Black - Me.txtRisiko.Location = New System.Drawing.Point(1161, 28) + Me.txtRisiko.Location = New System.Drawing.Point(1015, 29) Me.txtRisiko.MaxLineLength = -1 Me.txtRisiko.MaxLines_Warning = "" Me.txtRisiko.MaxLines_Warning_Label = Nothing Me.txtRisiko.Name = "txtRisiko" Me.txtRisiko.ReadOnly = True - Me.txtRisiko.Size = New System.Drawing.Size(107, 20) + Me.txtRisiko.Size = New System.Drawing.Size(96, 20) Me.txtRisiko.TabIndex = 56 ' 'Label10 ' Me.Label10.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label10.AutoSize = True - Me.Label10.Location = New System.Drawing.Point(1116, 31) + Me.Label10.Location = New System.Drawing.Point(957, 32) Me.Label10.Name = "Label10" - Me.Label10.Size = New System.Drawing.Size(45, 13) + Me.Label10.Size = New System.Drawing.Size(36, 13) Me.Label10.TabIndex = 55 - Me.Label10.Text = "= Risiko" + Me.Label10.Text = "Risiko" ' 'txtOPSaldo ' @@ -327,21 +329,23 @@ Partial Class usrCntlUSTV Me.txtOPSaldo._Waehrung = True Me.txtOPSaldo._WaehrungZeichen = True Me.txtOPSaldo.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtOPSaldo.BackColor = System.Drawing.Color.IndianRed + Me.txtOPSaldo.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtOPSaldo.ForeColor = System.Drawing.Color.Black - Me.txtOPSaldo.Location = New System.Drawing.Point(999, 0) + Me.txtOPSaldo.Location = New System.Drawing.Point(1015, 6) Me.txtOPSaldo.MaxLineLength = -1 Me.txtOPSaldo.MaxLines_Warning = "" Me.txtOPSaldo.MaxLines_Warning_Label = Nothing Me.txtOPSaldo.Name = "txtOPSaldo" Me.txtOPSaldo.ReadOnly = True - Me.txtOPSaldo.Size = New System.Drawing.Size(91, 20) + Me.txtOPSaldo.Size = New System.Drawing.Size(96, 20) Me.txtOPSaldo.TabIndex = 54 ' 'Label11 ' Me.Label11.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label11.AutoSize = True - Me.Label11.Location = New System.Drawing.Point(941, 6) + Me.Label11.Location = New System.Drawing.Point(957, 12) Me.Label11.Name = "Label11" Me.Label11.Size = New System.Drawing.Size(52, 13) Me.Label11.TabIndex = 53 @@ -373,13 +377,13 @@ Partial Class usrCntlUSTV Me.txtSumDiff._WaehrungZeichen = True Me.txtSumDiff.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.txtSumDiff.ForeColor = System.Drawing.Color.Black - Me.txtSumDiff.Location = New System.Drawing.Point(999, 19) + Me.txtSumDiff.Location = New System.Drawing.Point(1396, 49) Me.txtSumDiff.MaxLineLength = -1 Me.txtSumDiff.MaxLines_Warning = "" Me.txtSumDiff.MaxLines_Warning_Label = Nothing Me.txtSumDiff.Name = "txtSumDiff" Me.txtSumDiff.ReadOnly = True - Me.txtSumDiff.Size = New System.Drawing.Size(91, 20) + Me.txtSumDiff.Size = New System.Drawing.Size(92, 20) Me.txtSumDiff.TabIndex = 32 ' 'btnKundendatenaktualisieren @@ -412,13 +416,13 @@ Partial Class usrCntlUSTV Me.txtSumErst._WaehrungZeichen = True Me.txtSumErst.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.txtSumErst.ForeColor = System.Drawing.Color.Black - Me.txtSumErst.Location = New System.Drawing.Point(1381, 25) + Me.txtSumErst.Location = New System.Drawing.Point(1396, 25) Me.txtSumErst.MaxLineLength = -1 Me.txtSumErst.MaxLines_Warning = "" Me.txtSumErst.MaxLines_Warning_Label = Nothing Me.txtSumErst.Name = "txtSumErst" Me.txtSumErst.ReadOnly = True - Me.txtSumErst.Size = New System.Drawing.Size(107, 20) + Me.txtSumErst.Size = New System.Drawing.Size(92, 20) Me.txtSumErst.TabIndex = 31 ' 'txtSumUst @@ -437,13 +441,13 @@ Partial Class usrCntlUSTV Me.txtSumUst._WaehrungZeichen = True Me.txtSumUst.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.txtSumUst.ForeColor = System.Drawing.Color.Black - Me.txtSumUst.Location = New System.Drawing.Point(1381, 5) + Me.txtSumUst.Location = New System.Drawing.Point(1396, 5) Me.txtSumUst.MaxLineLength = -1 Me.txtSumUst.MaxLines_Warning = "" Me.txtSumUst.MaxLines_Warning_Label = Nothing Me.txtSumUst.Name = "txtSumUst" Me.txtSumUst.ReadOnly = True - Me.txtSumUst.Size = New System.Drawing.Size(107, 20) + Me.txtSumUst.Size = New System.Drawing.Size(92, 20) Me.txtSumUst.TabIndex = 30 ' 'txtVZBetrag @@ -462,40 +466,40 @@ Partial Class usrCntlUSTV Me.txtVZBetrag._WaehrungZeichen = True Me.txtVZBetrag.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.txtVZBetrag.ForeColor = System.Drawing.Color.Black - Me.txtVZBetrag.Location = New System.Drawing.Point(1161, 5) + Me.txtVZBetrag.Location = New System.Drawing.Point(1204, 5) Me.txtVZBetrag.MaxLineLength = -1 Me.txtVZBetrag.MaxLines_Warning = "" Me.txtVZBetrag.MaxLines_Warning_Label = Nothing Me.txtVZBetrag.Name = "txtVZBetrag" Me.txtVZBetrag.ReadOnly = True - Me.txtVZBetrag.Size = New System.Drawing.Size(107, 20) + Me.txtVZBetrag.Size = New System.Drawing.Size(92, 20) Me.txtVZBetrag.TabIndex = 51 ' 'Label5 ' Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label5.AutoSize = True - Me.Label5.Location = New System.Drawing.Point(914, 27) + Me.Label5.Location = New System.Drawing.Point(1302, 51) Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(85, 13) + Me.Label5.Size = New System.Drawing.Size(79, 13) Me.Label5.TabIndex = 29 - Me.Label5.Text = "- Differenzbetrag" + Me.Label5.Text = "Differenzbetrag" ' 'Label8 ' Me.Label8.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label8.AutoSize = True - Me.Label8.Location = New System.Drawing.Point(1100, 8) + Me.Label8.Location = New System.Drawing.Point(1117, 13) Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(64, 13) + Me.Label8.Size = New System.Drawing.Size(55, 13) Me.Label8.TabIndex = 50 - Me.Label8.Text = "+ VZ-Betrag" + Me.Label8.Text = "VZ-Betrag" ' 'Label4 ' Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label4.AutoSize = True - Me.Label4.Location = New System.Drawing.Point(1276, 28) + Me.Label4.Location = New System.Drawing.Point(1302, 27) Me.Label4.Name = "Label4" Me.Label4.Size = New System.Drawing.Size(90, 13) Me.Label4.TabIndex = 28 @@ -516,21 +520,23 @@ Partial Class usrCntlUSTV Me.txt3470Betrag._Waehrung = True Me.txt3470Betrag._WaehrungZeichen = True Me.txt3470Betrag.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txt3470Betrag.BackColor = System.Drawing.Color.LightGreen + Me.txt3470Betrag.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txt3470Betrag.ForeColor = System.Drawing.Color.Black - Me.txt3470Betrag.Location = New System.Drawing.Point(999, 40) + Me.txt3470Betrag.Location = New System.Drawing.Point(848, 8) Me.txt3470Betrag.MaxLineLength = -1 Me.txt3470Betrag.MaxLines_Warning = "" Me.txt3470Betrag.MaxLines_Warning_Label = Nothing Me.txt3470Betrag.Name = "txt3470Betrag" Me.txt3470Betrag.ReadOnly = True - Me.txt3470Betrag.Size = New System.Drawing.Size(91, 20) + Me.txt3470Betrag.Size = New System.Drawing.Size(103, 20) Me.txt3470Betrag.TabIndex = 49 ' 'Label3 ' Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(1276, 7) + Me.Label3.Location = New System.Drawing.Point(1302, 6) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(59, 13) Me.Label3.TabIndex = 27 @@ -540,11 +546,11 @@ Partial Class usrCntlUSTV ' Me.Label7.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label7.AutoSize = True - Me.Label7.Location = New System.Drawing.Point(956, 43) + Me.Label7.Location = New System.Drawing.Point(811, 12) Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(37, 13) + Me.Label7.Size = New System.Drawing.Size(31, 13) Me.Label7.TabIndex = 48 - Me.Label7.Text = "- 3470" + Me.Label7.Text = "3470" ' 'txtVorschaubetrGes ' @@ -562,7 +568,7 @@ Partial Class usrCntlUSTV Me.txtVorschaubetrGes._WaehrungZeichen = True Me.txtVorschaubetrGes.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.txtVorschaubetrGes.ForeColor = System.Drawing.Color.Black - Me.txtVorschaubetrGes.Location = New System.Drawing.Point(999, 60) + Me.txtVorschaubetrGes.Location = New System.Drawing.Point(1205, 28) Me.txtVorschaubetrGes.MaxLineLength = -1 Me.txtVorschaubetrGes.MaxLines_Warning = "" Me.txtVorschaubetrGes.MaxLines_Warning_Label = Nothing @@ -575,11 +581,11 @@ Partial Class usrCntlUSTV ' Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label6.AutoSize = True - Me.Label6.Location = New System.Drawing.Point(872, 63) + Me.Label6.Location = New System.Drawing.Point(1117, 35) Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(127, 13) + Me.Label6.Size = New System.Drawing.Size(82, 13) Me.Label6.TabIndex = 33 - Me.Label6.Text = "- Vorschaubetrag-Gesamt" + Me.Label6.Text = "Vorschaubetrag" ' 'cbxDifferenzbetrag ' diff --git a/SDL/USTV/usrCntlUSTV.vb b/SDL/USTV/usrCntlUSTV.vb index 167470f7..4c38d7a4 100644 --- a/SDL/USTV/usrCntlUSTV.vb +++ b/SDL/USTV/usrCntlUSTV.vb @@ -1,7 +1,4 @@ Imports System.ComponentModel -Imports com.sun.org.apache.bcel.internal.generic -Imports com.sun.xml.internal.rngom -Imports DocumentFormat.OpenXml.Drawing Imports Microsoft.Office.Interop Imports VERAG_PROG_ALLGEMEIN @@ -47,10 +44,17 @@ Public Class usrCntlUSTV End If End If - .SET_SQL("SELECT " & topMax & " [tblUStVAntrag].[UStVAn_ID],UStVAn_AntragArt,[UStVAn_KuNr],[UStVAn_Name],[UStVAn_LandKz],LandKz as Land_Antrag , UStVAn_BezugsNr, [UStVAn_ReDatVon], [UStVAn_ReDatBis] ,UStVAn_AntragEingereichtAm,[UStVAn_VZBetrag],[UStVAn_VZDatum],[UStVAn_3470] ,[UStVAn_Währungscode],[UStVAn_USteuerbetrag],[UStVAn_Erstattungsbetrag],([UStVAn_USteuerbetrag] - [UStVAn_Erstattungsbetrag]) as UStVAn_Differenzbetrag,[UStVAn_USteuerbetragEUR],[UStVAn_ErstattungsbetragEUR],([UStVAn_USteuerbetragEUR] - [UStVAn_ErstattungsbetragEUR]) as UStVAn_DifferenzbetragEUR,UStVAn_VZoffen ,[UStVAn_Sachbearbeiter] + Dim sql_query As String = "SELECT " & topMax & " [tblUStVAntrag].[UStVAn_ID],UStVAn_AntragArt,[UStVAn_KuNr],[UStVAn_Name],[UStVAn_LandKz],LandKz as Land_Antrag , UStVAn_BezugsNr, [UStVAn_ReDatVon], [UStVAn_ReDatBis] ,UStVAn_AntragEingereichtAm,[UStVAn_VZBetrag],[UStVAn_VZDatum],[UStVAn_3470],STUFF(( + SELECT ', ' + CAST(e.GutschriftsNr AS VARCHAR(50)) + From tblUStVErstattung e + Where e.UStVAn_ID = [tblUStVAntrag].[UStVAn_ID] + FOR XML PATH(''), TYPE + ).value('.', 'NVARCHAR(MAX)'), 1, 2, '') AS 'GutschriftsNr' ,[UStVAn_Währungscode],[UStVAn_USteuerbetrag],[UStVAn_Erstattungsbetrag],([UStVAn_USteuerbetrag] - [UStVAn_Erstattungsbetrag]) as UStVAn_Differenzbetrag,[UStVAn_USteuerbetragEUR],[UStVAn_ErstattungsbetragEUR],([UStVAn_USteuerbetragEUR] - [UStVAn_ErstattungsbetragEUR]) as UStVAn_DifferenzbetragEUR,UStVAn_VZoffen ,[UStVAn_Sachbearbeiter] FROM [tblUStVAntrag] inner join [Länderverzeichnis für die Außenhandelsstatistik] on UStVAn_LandNr=Landnr where 1=1 " & getWhere(, ID, AntragsLand) & " - order by UStVAn_KuNr,UStVAn_Name,datepart(year,[UStVAn_ReDatVon] ) desc,LandKz,[UStVAn_ReDatVon] desc", "FMZOLL") + order by UStVAn_KuNr,UStVAn_Name,datepart(year,[UStVAn_ReDatVon] ) desc,LandKz,[UStVAn_ReDatVon] desc" + + .SET_SQL(sql_query, "FMZOLL") .LOAD() loaded = True @@ -62,41 +66,38 @@ Public Class usrCntlUSTV btnKundendatenaktualisieren.Enabled = KdSearchBox1.KdNr > 0 'AndAlso .RowCount > 0 - - If .Columns.Count > 0 Then Dim DataGridViewCellStyleDate = New DataGridViewCellStyle() DataGridViewCellStyleDate.Format = "MM/yyyy" - - ' .Columns("UStVAn_ID").Visible = False - .Columns("UStVAn_ID").Width = 70 + .Columns("UStVAn_ID").Width = 60 .Columns("UStVAn_ID").HeaderText = "ID" '.Columns("UStVAn_ID").Frozen = True .Columns("UStVAn_AntragArt").HeaderText = "Art" - .Columns("UStVAn_AntragArt").MinimumWidth = 50 + .Columns("UStVAn_AntragArt").Width = 50 '.Columns("UStVAn_AntragArt").Frozen = True .Columns("UStVAn_KuNr").HeaderText = "KundenNr" - .Columns("UStVAn_Name").MinimumWidth = 70 + .Columns("UStVAn_KuNr").Width = 70 '.Columns("UStVAn_KuNr").Frozen = True .Columns("UStVAn_Name").HeaderText = "Firma" - .Columns("UStVAn_Name").Width = 200 + .Columns("UStVAn_Name").MinimumWidth = 150 + .Columns("UStVAn_Name").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill '.Columns("UStVAn_Name").Frozen = True ' .Columns("UStVAn_Name").MinimumWidth = 150 ' .Columns("UStVAn_Name").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("UStVAn_LandKz").HeaderText = "Land" - .Columns("UStVAn_LandKz").Width = 60 + .Columns("UStVAn_LandKz").Width = 50 '.Columns("UStVAn_LandKz").Frozen = True .Columns("Land_Antrag").HeaderText = "Antrag Land" - .Columns("Land_Antrag").Width = 60 + .Columns("Land_Antrag").Width = 50 '.Columns("Land_Antrag").Frozen = True .Columns("UStVAn_ReDatVon").HeaderText = "Von" @@ -108,7 +109,7 @@ Public Class usrCntlUSTV .Columns("UStVAn_ReDatBis").Width = 75 .Columns("UStVAn_BezugsNr").HeaderText = "BezugsNr" - .Columns("UStVAn_BezugsNr").Width = 70 + .Columns("UStVAn_BezugsNr").Width = 60 .Columns("UStVAn_AntragEingereichtAm").HeaderText = "Eingereicht Datum" .Columns("UStVAn_AntragEingereichtAm").Width = 80 @@ -123,7 +124,7 @@ Public Class usrCntlUSTV .Columns("UStVAn_3470").HeaderText = "3470" - .Columns("UStVAn_3470").Width = 100 + .Columns("UStVAn_3470").Width = 80 .Columns("UStVAn_3470").DefaultCellStyle.Format = "N2" .Columns("UStVAn_3470").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight @@ -161,14 +162,16 @@ Public Class usrCntlUSTV .Columns("UStVAn_DifferenzbetragEUR").DefaultCellStyle.Format = "N2" .Columns("UStVAn_DifferenzbetragEUR").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight - .Columns("UStVAn_VZoffen").HeaderText = "VZ nicht abgerechnet" .Columns("UStVAn_VZoffen").Width = 80 .Columns("UStVAn_VZoffen").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter + .Columns("GutschriftsNr").HeaderText = "GutschriftsNr" + .Columns("GutschriftsNr").Width = 180 + .Columns("GutschriftsNr").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter + .Columns("UStVAn_Sachbearbeiter").HeaderText = "Sachbearbeiter" - .Columns("UStVAn_Sachbearbeiter").MinimumWidth = 150 - .Columns("UStVAn_Sachbearbeiter").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns("UStVAn_Sachbearbeiter").MinimumWidth = 60 End If Dim GesamtUSteuer As Double = 0 @@ -594,7 +597,7 @@ Public Class usrCntlUSTV - Private Sub btn2_Click(sender As Object, e As EventArgs) Handles btn3470.Click + Private Sub btn2_Click(sender As Object, e As EventArgs) Handles Button2.Click If Not ContextMenuStrip3.Items.ContainsKey("dgv") Then diff --git a/SDL/buchhaltung/usrCntlBH.vb b/SDL/buchhaltung/usrCntlBH.vb index d09ede23..09ed86b6 100644 --- a/SDL/buchhaltung/usrCntlBH.vb +++ b/SDL/buchhaltung/usrCntlBH.vb @@ -1305,7 +1305,7 @@ Public Class usrCntlBH Dim startDate As String = CDate(R("zahlungsperiode_start")).ToShortDateString Dim EndDate As String = CDate(R("zahlungsperiode_ende")).ToShortDateString - Dim vermerk As String = "Zahlungen vom " & startDate & " - " & EndDate 'max 50 Zeichen!!! + Dim vermerk As String = "Zahlungen von " & startDate & " - " & EndDate 'max 50 Zeichen!!! Dim Fußtext As String = "" 'Fußtext = "Sehr geehrte Damen und Herren," & vbNewLine & " diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index f415d6c1..8d9f1879 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -38,9 +38,6 @@ Partial Class frmKundenblatt 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() @@ -48,14 +45,20 @@ Partial Class frmKundenblatt 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 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 resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmKundenblatt)) Me.pnlInfo = New System.Windows.Forms.Panel() Me.txtInfotext = New System.Windows.Forms.Label() Me.tbFirmendaten = New System.Windows.Forms.TabPage() Me.Panel4 = New System.Windows.Forms.Panel() - Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull() Me.tbcntrMain = New System.Windows.Forms.TabControl() Me.tbAllgemein = New System.Windows.Forms.TabPage() + Me.txtEmailRE2 = New System.Windows.Forms.TextBox() Me.txtEmailRE = New System.Windows.Forms.TextBox() Me.TextBox1 = New System.Windows.Forms.TextBox() Me.PictureBox8 = New System.Windows.Forms.PictureBox() @@ -153,10 +156,8 @@ Partial Class frmKundenblatt Me.lblLetzterSA_SDL = New System.Windows.Forms.Label() Me.rtbVermerke = New System.Windows.Forms.RichTextBox() Me.tbSDLKarten = New System.Windows.Forms.TabPage() - Me.usrcntlKarten = New SDL.usrCntlKartenDaten() Me.tbLKW = New System.Windows.Forms.TabPage() Me.pnlLKWRight = New System.Windows.Forms.Panel() - Me.UsrCntlLKW1 = New SDL.usrCntlLKW() Me.pnlLKW = New System.Windows.Forms.Panel() Me.dgvLKW = New System.Windows.Forms.DataGridView() Me.pnlLKWBottom = New System.Windows.Forms.Panel() @@ -188,7 +189,6 @@ Partial Class frmKundenblatt Me.tbBesuchsberichte = New System.Windows.Forms.TabPage() Me.tbFremdrechnungen = New System.Windows.Forms.TabPage() Me.tbOfferte = New System.Windows.Forms.TabPage() - Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte() Me.tbUSTV = New System.Windows.Forms.TabPage() Me.tbcntrUSTV = New System.Windows.Forms.TabControl() Me.tbUSTVDokumente = New System.Windows.Forms.TabPage() @@ -199,7 +199,6 @@ Partial Class frmKundenblatt Me.scanUSTVFABest = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() Me.scanUSTVVollmachten = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() Me.tbUSTVAntrage = New System.Windows.Forms.TabPage() - Me.UsrCntlUSTV = New SDL.usrCntlUSTV() Me.tbFIBU = New System.Windows.Forms.TabPage() Me.txtZinsbelastungNew = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.btn_FIBU_speichern = New System.Windows.Forms.Button() @@ -249,7 +248,13 @@ Partial Class frmKundenblatt Me.tbiKartenverwaltung = New System.Windows.Forms.ToolStripMenuItem() Me.tbiLKW = New System.Windows.Forms.ToolStripMenuItem() Me.tbiVERAGCard = New System.Windows.Forms.ToolStripMenuItem() - Me.txtEmailRE2 = New System.Windows.Forms.TextBox() + Me.txtAnsprechp = New System.Windows.Forms.TextBox() + Me.dgvLeistungen = New System.Windows.Forms.DataGridView() + Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull() + Me.usrcntlKarten = New SDL.usrCntlKartenDaten() + Me.UsrCntlLKW1 = New SDL.usrCntlLKW() + Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte() + Me.UsrCntlUSTV = New SDL.usrCntlUSTV() Me.pnlInfo.SuspendLayout() Me.tbFirmendaten.SuspendLayout() Me.Panel4.SuspendLayout() @@ -309,6 +314,7 @@ Partial Class frmKundenblatt Me.ContextMenuStrip3.SuspendLayout() Me.mne.SuspendLayout() Me.pnl.SuspendLayout() + CType(Me.dgvLeistungen, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'pnlInfo @@ -317,7 +323,7 @@ Partial Class frmKundenblatt Me.pnlInfo.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer)) Me.pnlInfo.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.pnlInfo.Controls.Add(Me.txtInfotext) - Me.pnlInfo.Location = New System.Drawing.Point(332, 6) + Me.pnlInfo.Location = New System.Drawing.Point(350, 6) Me.pnlInfo.Name = "pnlInfo" Me.pnlInfo.Size = New System.Drawing.Size(602, 35) Me.pnlInfo.TabIndex = 1 @@ -339,7 +345,7 @@ Partial Class frmKundenblatt Me.tbFirmendaten.Location = New System.Drawing.Point(4, 25) Me.tbFirmendaten.Name = "tbFirmendaten" Me.tbFirmendaten.Padding = New System.Windows.Forms.Padding(3) - Me.tbFirmendaten.Size = New System.Drawing.Size(1644, 962) + Me.tbFirmendaten.Size = New System.Drawing.Size(1681, 996) Me.tbFirmendaten.TabIndex = 3 Me.tbFirmendaten.Text = "Firmendaten" ' @@ -349,19 +355,9 @@ Partial Class frmKundenblatt Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel4.Location = New System.Drawing.Point(3, 3) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(1638, 956) + Me.Panel4.Size = New System.Drawing.Size(1675, 990) Me.Panel4.TabIndex = 0 ' - 'UsrcntlKundeBearbeitenFull1 - ' - Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White - Me.UsrcntlKundeBearbeitenFull1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0) - Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1" - Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1638, 956) - Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0 - ' 'tbcntrMain ' Me.tbcntrMain.Appearance = System.Windows.Forms.TabAppearance.FlatButtons @@ -379,17 +375,19 @@ Partial Class frmKundenblatt Me.tbcntrMain.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrMain.Name = "tbcntrMain" Me.tbcntrMain.SelectedIndex = 0 - Me.tbcntrMain.Size = New System.Drawing.Size(1652, 991) + Me.tbcntrMain.Size = New System.Drawing.Size(1689, 1025) Me.tbcntrMain.TabIndex = 3 ' 'tbAllgemein ' Me.tbAllgemein.BackColor = System.Drawing.Color.White + Me.tbAllgemein.Controls.Add(Me.txtAnsprechp) Me.tbAllgemein.Controls.Add(Me.txtEmailRE2) Me.tbAllgemein.Controls.Add(Me.txtEmailRE) Me.tbAllgemein.Controls.Add(Me.TextBox1) Me.tbAllgemein.Controls.Add(Me.PictureBox8) Me.tbAllgemein.Controls.Add(Me.FlatButton6) + Me.tbAllgemein.Controls.Add(Me.picLogo) Me.tbAllgemein.Controls.Add(Me.lblBonitaet) Me.tbAllgemein.Controls.Add(Me.Label39) Me.tbAllgemein.Controls.Add(Me.btnBonitaetBearbeiten) @@ -399,7 +397,6 @@ Partial Class frmKundenblatt Me.tbAllgemein.Controls.Add(Me.cboFirmaFMZOLL) Me.tbAllgemein.Controls.Add(Me.Label17) Me.tbAllgemein.Controls.Add(Me.dgvOfferte) - Me.tbAllgemein.Controls.Add(Me.picLogo) Me.tbAllgemein.Controls.Add(Me.Button4) Me.tbAllgemein.Controls.Add(Me.lblEmail2) Me.tbAllgemein.Controls.Add(Me.lblEmail) @@ -424,10 +421,23 @@ Partial Class frmKundenblatt Me.tbAllgemein.Margin = New System.Windows.Forms.Padding(0) Me.tbAllgemein.Name = "tbAllgemein" Me.tbAllgemein.Padding = New System.Windows.Forms.Padding(3) - Me.tbAllgemein.Size = New System.Drawing.Size(1644, 962) + Me.tbAllgemein.Size = New System.Drawing.Size(1681, 996) Me.tbAllgemein.TabIndex = 0 Me.tbAllgemein.Text = "Allgemein" ' + 'txtEmailRE2 + ' + Me.txtEmailRE2.BackColor = System.Drawing.Color.White + Me.txtEmailRE2.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.txtEmailRE2.Cursor = System.Windows.Forms.Cursors.Hand + Me.txtEmailRE2.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtEmailRE2.Location = New System.Drawing.Point(40, 410) + Me.txtEmailRE2.Name = "txtEmailRE2" + Me.txtEmailRE2.ReadOnly = True + Me.txtEmailRE2.Size = New System.Drawing.Size(384, 19) + Me.txtEmailRE2.TabIndex = 195 + Me.txtEmailRE2.Text = "email-Rechnung" + ' 'txtEmailRE ' Me.txtEmailRE.BackColor = System.Drawing.Color.White @@ -542,7 +552,7 @@ Partial Class frmKundenblatt Me.TabControl1.Location = New System.Drawing.Point(8, 474) Me.TabControl1.Name = "TabControl1" Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(718, 482) + Me.TabControl1.Size = New System.Drawing.Size(718, 516) Me.TabControl1.TabIndex = 186 ' 'TabPage1 @@ -554,7 +564,7 @@ Partial Class frmKundenblatt Me.TabPage1.Location = New System.Drawing.Point(4, 22) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(710, 456) + Me.TabPage1.Size = New System.Drawing.Size(710, 490) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Offene Posten" Me.TabPage1.UseVisualStyleBackColor = True @@ -613,7 +623,7 @@ Partial Class frmKundenblatt Me.dgvOffenePosten.RowHeadersDefaultCellStyle = DataGridViewCellStyle4 Me.dgvOffenePosten.RowHeadersVisible = False Me.dgvOffenePosten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvOffenePosten.Size = New System.Drawing.Size(707, 424) + Me.dgvOffenePosten.Size = New System.Drawing.Size(707, 458) Me.dgvOffenePosten.TabIndex = 175 ' 'Label10 @@ -646,7 +656,7 @@ Partial Class frmKundenblatt Me.TabPage2.Location = New System.Drawing.Point(4, 22) Me.TabPage2.Name = "TabPage2" Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(710, 456) + Me.TabPage2.Size = New System.Drawing.Size(710, 473) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Umsatzbericht" Me.TabPage2.UseVisualStyleBackColor = True @@ -691,7 +701,7 @@ Partial Class frmKundenblatt Me.dgvUmsaetze.RowHeadersDefaultCellStyle = DataGridViewCellStyle8 Me.dgvUmsaetze.RowHeadersVisible = False Me.dgvUmsaetze.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 451) + Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 468) Me.dgvUmsaetze.TabIndex = 182 ' 'Label13 @@ -739,7 +749,7 @@ Partial Class frmKundenblatt Me.TabPage3.Controls.Add(Me.dgvUmsatzNachLeistngsNr) Me.TabPage3.Location = New System.Drawing.Point(4, 22) Me.TabPage3.Name = "TabPage3" - Me.TabPage3.Size = New System.Drawing.Size(710, 456) + Me.TabPage3.Size = New System.Drawing.Size(710, 473) Me.TabPage3.TabIndex = 2 Me.TabPage3.Text = "Umsatz nach LeistungsNr" Me.TabPage3.UseVisualStyleBackColor = True @@ -795,7 +805,7 @@ Partial Class frmKundenblatt Me.dgvUmsatzNachLeistngsNr.RowHeadersDefaultCellStyle = DataGridViewCellStyle12 Me.dgvUmsatzNachLeistngsNr.RowHeadersVisible = False Me.dgvUmsatzNachLeistngsNr.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvUmsatzNachLeistngsNr.Size = New System.Drawing.Size(705, 450) + Me.dgvUmsatzNachLeistngsNr.Size = New System.Drawing.Size(705, 467) Me.dgvUmsatzNachLeistngsNr.TabIndex = 183 ' 'lblAdressenzusatz @@ -803,7 +813,7 @@ Partial Class frmKundenblatt Me.lblAdressenzusatz.BackColor = System.Drawing.Color.White Me.lblAdressenzusatz.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblAdressenzusatz.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAdressenzusatz.Location = New System.Drawing.Point(3, 144) + Me.lblAdressenzusatz.Location = New System.Drawing.Point(3, 126) Me.lblAdressenzusatz.Name = "lblAdressenzusatz" Me.lblAdressenzusatz.ReadOnly = True Me.lblAdressenzusatz.Size = New System.Drawing.Size(419, 19) @@ -835,11 +845,12 @@ Partial Class frmKundenblatt 'Label17 ' Me.Label17.AutoSize = True - Me.Label17.Location = New System.Drawing.Point(430, 20) + Me.Label17.Location = New System.Drawing.Point(660, 21) Me.Label17.Name = "Label17" Me.Label17.Size = New System.Drawing.Size(66, 13) Me.Label17.TabIndex = 1 Me.Label17.Text = "Offertenliste:" + Me.Label17.Visible = False ' 'dgvOfferte ' @@ -861,7 +872,7 @@ Partial Class frmKundenblatt DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] Me.dgvOfferte.DefaultCellStyle = DataGridViewCellStyle14 - Me.dgvOfferte.Location = New System.Drawing.Point(433, 37) + Me.dgvOfferte.Location = New System.Drawing.Point(684, 37) Me.dgvOfferte.Name = "dgvOfferte" Me.dgvOfferte.ReadOnly = True DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft @@ -872,8 +883,9 @@ Partial Class frmKundenblatt DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] Me.dgvOfferte.RowHeadersDefaultCellStyle = DataGridViewCellStyle15 - Me.dgvOfferte.Size = New System.Drawing.Size(293, 320) + Me.dgvOfferte.Size = New System.Drawing.Size(42, 320) Me.dgvOfferte.TabIndex = 12 + Me.dgvOfferte.Visible = False ' 'picLogo ' @@ -882,9 +894,9 @@ Partial Class frmKundenblatt Me.picLogo.Cursor = System.Windows.Forms.Cursors.Hand Me.picLogo.Image = Global.SDL.My.Resources.Resources.person_default Me.picLogo.ImageLocation = "" - Me.picLogo.Location = New System.Drawing.Point(788, 839) + Me.picLogo.Location = New System.Drawing.Point(430, 6) Me.picLogo.Name = "picLogo" - Me.picLogo.Size = New System.Drawing.Size(287, 114) + Me.picLogo.Size = New System.Drawing.Size(145, 58) Me.picLogo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom Me.picLogo.TabIndex = 173 Me.picLogo.TabStop = False @@ -896,7 +908,7 @@ Partial Class frmKundenblatt Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button4.Image = Global.SDL.My.Resources.Resources.statistik_small Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button4.Location = New System.Drawing.Point(1058, 792) + Me.Button4.Location = New System.Drawing.Point(1095, 470) Me.Button4.Name = "Button4" Me.Button4.Size = New System.Drawing.Size(136, 32) Me.Button4.TabIndex = 21 @@ -971,7 +983,7 @@ Partial Class frmKundenblatt Me.lblUid.BackColor = System.Drawing.Color.White Me.lblUid.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblUid.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblUid.Location = New System.Drawing.Point(5, 216) + Me.lblUid.Location = New System.Drawing.Point(5, 191) Me.lblUid.Name = "lblUid" Me.lblUid.ReadOnly = True Me.lblUid.Size = New System.Drawing.Size(419, 19) @@ -983,7 +995,7 @@ Partial Class frmKundenblatt Me.lblPostfach.BackColor = System.Drawing.Color.White Me.lblPostfach.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblPostfach.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblPostfach.Location = New System.Drawing.Point(5, 191) + Me.lblPostfach.Location = New System.Drawing.Point(3, 170) Me.lblPostfach.Name = "lblPostfach" Me.lblPostfach.ReadOnly = True Me.lblPostfach.Size = New System.Drawing.Size(419, 19) @@ -995,7 +1007,7 @@ Partial Class frmKundenblatt Me.lblLandPlzOrt.BackColor = System.Drawing.Color.White Me.lblLandPlzOrt.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblLandPlzOrt.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblLandPlzOrt.Location = New System.Drawing.Point(5, 166) + Me.lblLandPlzOrt.Location = New System.Drawing.Point(3, 149) Me.lblLandPlzOrt.Name = "lblLandPlzOrt" Me.lblLandPlzOrt.ReadOnly = True Me.lblLandPlzOrt.Size = New System.Drawing.Size(419, 19) @@ -1007,7 +1019,7 @@ Partial Class frmKundenblatt Me.lblStrasse.BackColor = System.Drawing.Color.White Me.lblStrasse.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblStrasse.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblStrasse.Location = New System.Drawing.Point(3, 122) + Me.lblStrasse.Location = New System.Drawing.Point(3, 104) Me.lblStrasse.Name = "lblStrasse" Me.lblStrasse.ReadOnly = True Me.lblStrasse.Size = New System.Drawing.Size(419, 19) @@ -1019,7 +1031,7 @@ Partial Class frmKundenblatt Me.lblFirmenname2.BackColor = System.Drawing.Color.White Me.lblFirmenname2.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblFirmenname2.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblFirmenname2.Location = New System.Drawing.Point(3, 97) + Me.lblFirmenname2.Location = New System.Drawing.Point(3, 83) Me.lblFirmenname2.Name = "lblFirmenname2" Me.lblFirmenname2.ReadOnly = True Me.lblFirmenname2.Size = New System.Drawing.Size(419, 19) @@ -1031,7 +1043,7 @@ Partial Class frmKundenblatt Me.lblFirmenname1.BackColor = System.Drawing.Color.White Me.lblFirmenname1.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblFirmenname1.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblFirmenname1.Location = New System.Drawing.Point(3, 79) + Me.lblFirmenname1.Location = New System.Drawing.Point(3, 62) Me.lblFirmenname1.Name = "lblFirmenname1" Me.lblFirmenname1.ReadOnly = True Me.lblFirmenname1.Size = New System.Drawing.Size(419, 19) @@ -1057,10 +1069,11 @@ Partial Class frmKundenblatt Me.GroupBox5.Controls.Add(Me.lblStat_SdlLeistungen_Diesel) Me.GroupBox5.Controls.Add(Me.lblStat_SdlLeistungen) Me.GroupBox5.Controls.Add(Me.lblStat_Lkws) + Me.GroupBox5.Controls.Add(Me.dgvLeistungen) Me.GroupBox5.Controls.Add(Me.PictureBox5) - Me.GroupBox5.Location = New System.Drawing.Point(738, 832) + Me.GroupBox5.Location = New System.Drawing.Point(738, 501) Me.GroupBox5.Name = "GroupBox5" - Me.GroupBox5.Size = New System.Drawing.Size(456, 121) + Me.GroupBox5.Size = New System.Drawing.Size(493, 489) Me.GroupBox5.TabIndex = 22 Me.GroupBox5.TabStop = False Me.GroupBox5.Text = "Statistik" @@ -1071,7 +1084,7 @@ Partial Class frmKundenblatt Me.lblStat_SdlLeistungen_Maut.AutoSize = True Me.lblStat_SdlLeistungen_Maut.Cursor = System.Windows.Forms.Cursors.Hand Me.lblStat_SdlLeistungen_Maut.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblStat_SdlLeistungen_Maut.Location = New System.Drawing.Point(12, 90) + Me.lblStat_SdlLeistungen_Maut.Location = New System.Drawing.Point(15, 48) Me.lblStat_SdlLeistungen_Maut.Name = "lblStat_SdlLeistungen_Maut" Me.lblStat_SdlLeistungen_Maut.Size = New System.Drawing.Size(27, 16) Me.lblStat_SdlLeistungen_Maut.TabIndex = 3 @@ -1082,7 +1095,7 @@ Partial Class frmKundenblatt Me.lblStat_SdlLeistungen_Diesel.AutoSize = True Me.lblStat_SdlLeistungen_Diesel.Cursor = System.Windows.Forms.Cursors.Hand Me.lblStat_SdlLeistungen_Diesel.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblStat_SdlLeistungen_Diesel.Location = New System.Drawing.Point(12, 70) + Me.lblStat_SdlLeistungen_Diesel.Location = New System.Drawing.Point(15, 32) Me.lblStat_SdlLeistungen_Diesel.Name = "lblStat_SdlLeistungen_Diesel" Me.lblStat_SdlLeistungen_Diesel.Size = New System.Drawing.Size(27, 16) Me.lblStat_SdlLeistungen_Diesel.TabIndex = 2 @@ -1093,7 +1106,7 @@ Partial Class frmKundenblatt Me.lblStat_SdlLeistungen.AutoSize = True Me.lblStat_SdlLeistungen.Cursor = System.Windows.Forms.Cursors.Hand Me.lblStat_SdlLeistungen.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblStat_SdlLeistungen.Location = New System.Drawing.Point(12, 50) + Me.lblStat_SdlLeistungen.Location = New System.Drawing.Point(15, 64) Me.lblStat_SdlLeistungen.Name = "lblStat_SdlLeistungen" Me.lblStat_SdlLeistungen.Size = New System.Drawing.Size(27, 16) Me.lblStat_SdlLeistungen.TabIndex = 1 @@ -1104,7 +1117,7 @@ Partial Class frmKundenblatt Me.lblStat_Lkws.AutoSize = True Me.lblStat_Lkws.Cursor = System.Windows.Forms.Cursors.Hand Me.lblStat_Lkws.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblStat_Lkws.Location = New System.Drawing.Point(12, 30) + Me.lblStat_Lkws.Location = New System.Drawing.Point(15, 16) Me.lblStat_Lkws.Name = "lblStat_Lkws" Me.lblStat_Lkws.Size = New System.Drawing.Size(30, 16) Me.lblStat_Lkws.TabIndex = 0 @@ -1114,7 +1127,7 @@ Partial Class frmKundenblatt ' Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None Me.PictureBox5.Image = Global.SDL.My.Resources.Resources.statistik - Me.PictureBox5.Location = New System.Drawing.Point(409, 7) + Me.PictureBox5.Location = New System.Drawing.Point(449, 9) Me.PictureBox5.Name = "PictureBox5" Me.PictureBox5.Size = New System.Drawing.Size(38, 39) Me.PictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom @@ -1137,28 +1150,28 @@ Partial Class frmKundenblatt Me.dgvSperrliste.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.dgvSperrliste.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control - 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.WindowText - DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSperrliste.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle16 + DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control + 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.WindowText + DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSperrliste.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle19 Me.dgvSperrliste.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle17.ForeColor = System.Drawing.Color.Black - DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvSperrliste.DefaultCellStyle = DataGridViewCellStyle17 + DataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle20.ForeColor = System.Drawing.Color.Black + DataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvSperrliste.DefaultCellStyle = DataGridViewCellStyle20 Me.dgvSperrliste.Location = New System.Drawing.Point(732, 36) Me.dgvSperrliste.Name = "dgvSperrliste" Me.dgvSperrliste.ReadOnly = True Me.dgvSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle15 - Me.dgvSperrliste.Size = New System.Drawing.Size(462, 629) + Me.dgvSperrliste.Size = New System.Drawing.Size(499, 413) Me.dgvSperrliste.TabIndex = 23 ' 'PictureBox2 @@ -1198,11 +1211,11 @@ Partial Class frmKundenblatt Me.lblKurzname.BackColor = System.Drawing.Color.White Me.lblKurzname.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblKurzname.Font = New System.Drawing.Font("Microsoft Sans Serif", 16.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblKurzname.Location = New System.Drawing.Point(3, 18) + Me.lblKurzname.Location = New System.Drawing.Point(3, 6) Me.lblKurzname.Multiline = True Me.lblKurzname.Name = "lblKurzname" Me.lblKurzname.ReadOnly = True - Me.lblKurzname.Size = New System.Drawing.Size(421, 55) + Me.lblKurzname.Size = New System.Drawing.Size(421, 58) Me.lblKurzname.TabIndex = 0 Me.lblKurzname.Text = "VERAG Spedition AG" ' @@ -1212,7 +1225,7 @@ Partial Class frmKundenblatt Me.tbZoll.Location = New System.Drawing.Point(4, 25) Me.tbZoll.Name = "tbZoll" Me.tbZoll.Padding = New System.Windows.Forms.Padding(3) - Me.tbZoll.Size = New System.Drawing.Size(1644, 962) + Me.tbZoll.Size = New System.Drawing.Size(1681, 996) Me.tbZoll.TabIndex = 9 Me.tbZoll.Text = "ZOLL" Me.tbZoll.UseVisualStyleBackColor = True @@ -1224,7 +1237,7 @@ Partial Class frmKundenblatt Me.tbcntrZOLL.Location = New System.Drawing.Point(3, 3) Me.tbcntrZOLL.Name = "tbcntrZOLL" Me.tbcntrZOLL.SelectedIndex = 0 - Me.tbcntrZOLL.Size = New System.Drawing.Size(1638, 956) + Me.tbcntrZOLL.Size = New System.Drawing.Size(1675, 990) Me.tbcntrZOLL.TabIndex = 0 ' 'tabZoll_Artikel @@ -1232,7 +1245,7 @@ Partial Class frmKundenblatt Me.tabZoll_Artikel.Location = New System.Drawing.Point(4, 22) Me.tabZoll_Artikel.Name = "tabZoll_Artikel" Me.tabZoll_Artikel.Padding = New System.Windows.Forms.Padding(3) - Me.tabZoll_Artikel.Size = New System.Drawing.Size(1630, 930) + Me.tabZoll_Artikel.Size = New System.Drawing.Size(1667, 964) Me.tabZoll_Artikel.TabIndex = 1 Me.tabZoll_Artikel.Text = "Artikel" Me.tabZoll_Artikel.UseVisualStyleBackColor = True @@ -1243,7 +1256,7 @@ Partial Class frmKundenblatt Me.tbMdm.Location = New System.Drawing.Point(4, 25) Me.tbMdm.Name = "tbMdm" Me.tbMdm.Padding = New System.Windows.Forms.Padding(3) - Me.tbMdm.Size = New System.Drawing.Size(1644, 962) + Me.tbMdm.Size = New System.Drawing.Size(1681, 996) Me.tbMdm.TabIndex = 10 Me.tbMdm.Text = "MDM" Me.tbMdm.UseVisualStyleBackColor = True @@ -1262,7 +1275,7 @@ Partial Class frmKundenblatt Me.tbcntrMDM.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrMDM.Name = "tbcntrMDM" Me.tbcntrMDM.SelectedIndex = 0 - Me.tbcntrMDM.Size = New System.Drawing.Size(1638, 956) + Me.tbcntrMDM.Size = New System.Drawing.Size(1675, 990) Me.tbcntrMDM.TabIndex = 0 ' 'tbSDL @@ -1274,7 +1287,7 @@ Partial Class frmKundenblatt Me.tbSDL.Margin = New System.Windows.Forms.Padding(0) Me.tbSDL.Name = "tbSDL" Me.tbSDL.Padding = New System.Windows.Forms.Padding(3) - Me.tbSDL.Size = New System.Drawing.Size(1630, 930) + Me.tbSDL.Size = New System.Drawing.Size(1667, 964) Me.tbSDL.TabIndex = 5 Me.tbSDL.Text = "SDL-Leistungen" Me.tbSDL.UseVisualStyleBackColor = True @@ -1283,40 +1296,40 @@ Partial Class frmKundenblatt ' Me.dgvSDLLeistungenFull.AllowUserToAddRows = False Me.dgvSDLLeistungenFull.AllowUserToResizeRows = False - DataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvSDLLeistungenFull.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle18 + DataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvSDLLeistungenFull.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle21 Me.dgvSDLLeistungenFull.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control - 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.WindowText - DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSDLLeistungenFull.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle19 + DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control + 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.WindowText + DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSDLLeistungenFull.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle22 Me.dgvSDLLeistungenFull.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvSDLLeistungenFull.DefaultCellStyle = DataGridViewCellStyle20 + DataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvSDLLeistungenFull.DefaultCellStyle = DataGridViewCellStyle23 Me.dgvSDLLeistungenFull.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvSDLLeistungenFull.Location = New System.Drawing.Point(3, 50) Me.dgvSDLLeistungenFull.Name = "dgvSDLLeistungenFull" Me.dgvSDLLeistungenFull.ReadOnly = True - 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.dgvSDLLeistungenFull.RowHeadersDefaultCellStyle = DataGridViewCellStyle21 + 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.dgvSDLLeistungenFull.RowHeadersDefaultCellStyle = DataGridViewCellStyle24 Me.dgvSDLLeistungenFull.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1624, 734) + Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1661, 768) Me.dgvSDLLeistungenFull.TabIndex = 5 ' 'Panel6 @@ -1330,7 +1343,7 @@ Partial Class frmKundenblatt Me.Panel6.Dock = System.Windows.Forms.DockStyle.Top Me.Panel6.Location = New System.Drawing.Point(3, 3) Me.Panel6.Name = "Panel6" - Me.Panel6.Size = New System.Drawing.Size(1624, 47) + Me.Panel6.Size = New System.Drawing.Size(1661, 47) Me.Panel6.TabIndex = 178 ' 'Label28 @@ -1422,9 +1435,9 @@ Partial Class frmKundenblatt Me.Panel5.Controls.Add(Me.lblLetzterSA_SDL) Me.Panel5.Controls.Add(Me.rtbVermerke) Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel5.Location = New System.Drawing.Point(3, 784) + Me.Panel5.Location = New System.Drawing.Point(3, 818) Me.Panel5.Name = "Panel5" - Me.Panel5.Size = New System.Drawing.Size(1624, 143) + Me.Panel5.Size = New System.Drawing.Size(1661, 143) Me.Panel5.TabIndex = 177 ' 'btnBestelldateiErzeugen @@ -1816,21 +1829,11 @@ Partial Class frmKundenblatt Me.tbSDLKarten.Location = New System.Drawing.Point(4, 22) Me.tbSDLKarten.Name = "tbSDLKarten" Me.tbSDLKarten.Padding = New System.Windows.Forms.Padding(3) - Me.tbSDLKarten.Size = New System.Drawing.Size(178, 39) + Me.tbSDLKarten.Size = New System.Drawing.Size(1630, 947) Me.tbSDLKarten.TabIndex = 7 Me.tbSDLKarten.Text = "SDL-Kartenverwaltung" Me.tbSDLKarten.UseVisualStyleBackColor = True ' - 'usrcntlKarten - ' - Me.usrcntlKarten.Cursor = System.Windows.Forms.Cursors.Default - Me.usrcntlKarten.Dock = System.Windows.Forms.DockStyle.Fill - Me.usrcntlKarten.Location = New System.Drawing.Point(3, 3) - Me.usrcntlKarten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.usrcntlKarten.Name = "usrcntlKarten" - Me.usrcntlKarten.Size = New System.Drawing.Size(172, 33) - Me.usrcntlKarten.TabIndex = 0 - ' 'tbLKW ' Me.tbLKW.Controls.Add(Me.pnlLKWRight) @@ -1838,7 +1841,7 @@ Partial Class frmKundenblatt Me.tbLKW.Location = New System.Drawing.Point(4, 22) Me.tbLKW.Name = "tbLKW" Me.tbLKW.Padding = New System.Windows.Forms.Padding(3) - Me.tbLKW.Size = New System.Drawing.Size(178, 39) + Me.tbLKW.Size = New System.Drawing.Size(1630, 947) Me.tbLKW.TabIndex = 4 Me.tbLKW.Text = "LKWs" Me.tbLKW.UseVisualStyleBackColor = True @@ -1850,22 +1853,9 @@ Partial Class frmKundenblatt Me.pnlLKWRight.Location = New System.Drawing.Point(309, 3) Me.pnlLKWRight.Name = "pnlLKWRight" Me.pnlLKWRight.Padding = New System.Windows.Forms.Padding(10, 0, 0, 0) - Me.pnlLKWRight.Size = New System.Drawing.Size(0, 33) + Me.pnlLKWRight.Size = New System.Drawing.Size(1318, 941) Me.pnlLKWRight.TabIndex = 2 ' - 'UsrCntlLKW1 - ' - Me.UsrCntlLKW1.BackColor = System.Drawing.Color.White - Me.UsrCntlLKW1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.UsrCntlLKW1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.UsrCntlLKW1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlLKW1.Location = New System.Drawing.Point(10, 0) - Me.UsrCntlLKW1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.UsrCntlLKW1.MaximumSize = New System.Drawing.Size(1200, 1000) - Me.UsrCntlLKW1.Name = "UsrCntlLKW1" - Me.UsrCntlLKW1.Size = New System.Drawing.Size(0, 33) - Me.UsrCntlLKW1.TabIndex = 0 - ' 'pnlLKW ' Me.pnlLKW.Controls.Add(Me.dgvLKW) @@ -1874,48 +1864,48 @@ Partial Class frmKundenblatt Me.pnlLKW.Dock = System.Windows.Forms.DockStyle.Left Me.pnlLKW.Location = New System.Drawing.Point(3, 3) Me.pnlLKW.Name = "pnlLKW" - Me.pnlLKW.Size = New System.Drawing.Size(306, 33) + Me.pnlLKW.Size = New System.Drawing.Size(306, 941) Me.pnlLKW.TabIndex = 3 ' 'dgvLKW ' Me.dgvLKW.AllowUserToAddRows = False Me.dgvLKW.AllowUserToDeleteRows = False - DataGridViewCellStyle22.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvLKW.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle22 + DataGridViewCellStyle25.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvLKW.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle25 Me.dgvLKW.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvLKW.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle23 + DataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle26.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvLKW.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle26 Me.dgvLKW.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Window - 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.ControlText - DataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvLKW.DefaultCellStyle = DataGridViewCellStyle24 + DataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Window + 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.ControlText + DataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvLKW.DefaultCellStyle = DataGridViewCellStyle27 Me.dgvLKW.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvLKW.Location = New System.Drawing.Point(0, 62) Me.dgvLKW.Name = "dgvLKW" Me.dgvLKW.ReadOnly = True - DataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Control - 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.WindowText - DataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle25 + DataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Control + 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.WindowText + DataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle28 Me.dgvLKW.RowHeadersVisible = False Me.dgvLKW.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvLKW.Size = New System.Drawing.Size(306, 0) + Me.dgvLKW.Size = New System.Drawing.Size(306, 767) Me.dgvLKW.TabIndex = 2 ' 'pnlLKWBottom @@ -1927,7 +1917,7 @@ Partial Class frmKundenblatt Me.pnlLKWBottom.Controls.Add(Me.Button13) Me.pnlLKWBottom.Controls.Add(Me.lblErgebnisse) Me.pnlLKWBottom.Dock = System.Windows.Forms.DockStyle.Bottom - Me.pnlLKWBottom.Location = New System.Drawing.Point(0, -79) + Me.pnlLKWBottom.Location = New System.Drawing.Point(0, 829) Me.pnlLKWBottom.Name = "pnlLKWBottom" Me.pnlLKWBottom.Size = New System.Drawing.Size(306, 112) Me.pnlLKWBottom.TabIndex = 3 @@ -2068,7 +2058,7 @@ Partial Class frmKundenblatt Me.tbVERAGCard.Location = New System.Drawing.Point(4, 22) Me.tbVERAGCard.Name = "tbVERAGCard" Me.tbVERAGCard.Padding = New System.Windows.Forms.Padding(3) - Me.tbVERAGCard.Size = New System.Drawing.Size(178, 39) + Me.tbVERAGCard.Size = New System.Drawing.Size(1630, 947) Me.tbVERAGCard.TabIndex = 6 Me.tbVERAGCard.Text = "VERAG Card" Me.tbVERAGCard.UseVisualStyleBackColor = True @@ -2080,7 +2070,7 @@ Partial Class frmKundenblatt Me.Panel3.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel3.Location = New System.Drawing.Point(3, 3) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(172, 33) + Me.Panel3.Size = New System.Drawing.Size(1624, 941) Me.Panel3.TabIndex = 0 ' 'tbDokumente @@ -2098,7 +2088,7 @@ Partial Class frmKundenblatt Me.tbDokumente.Controls.Add(Me.scanVertragVeragKd) Me.tbDokumente.Location = New System.Drawing.Point(4, 22) Me.tbDokumente.Name = "tbDokumente" - Me.tbDokumente.Size = New System.Drawing.Size(178, 39) + Me.tbDokumente.Size = New System.Drawing.Size(1630, 947) Me.tbDokumente.TabIndex = 8 Me.tbDokumente.Text = "Dokumente" Me.tbDokumente.UseVisualStyleBackColor = True @@ -2298,7 +2288,7 @@ Partial Class frmKundenblatt Me.tbBesuchsberichte.Location = New System.Drawing.Point(4, 22) Me.tbBesuchsberichte.Name = "tbBesuchsberichte" Me.tbBesuchsberichte.Padding = New System.Windows.Forms.Padding(3) - Me.tbBesuchsberichte.Size = New System.Drawing.Size(178, 39) + Me.tbBesuchsberichte.Size = New System.Drawing.Size(1630, 947) Me.tbBesuchsberichte.TabIndex = 9 Me.tbBesuchsberichte.Text = "Besuchsberichte" Me.tbBesuchsberichte.UseVisualStyleBackColor = True @@ -2307,7 +2297,7 @@ Partial Class frmKundenblatt ' Me.tbFremdrechnungen.Location = New System.Drawing.Point(4, 22) Me.tbFremdrechnungen.Name = "tbFremdrechnungen" - Me.tbFremdrechnungen.Size = New System.Drawing.Size(178, 39) + Me.tbFremdrechnungen.Size = New System.Drawing.Size(1630, 947) Me.tbFremdrechnungen.TabIndex = 10 Me.tbFremdrechnungen.Text = "Fremdrechnungen" Me.tbFremdrechnungen.UseVisualStyleBackColor = True @@ -2318,27 +2308,17 @@ Partial Class frmKundenblatt Me.tbOfferte.Location = New System.Drawing.Point(4, 25) Me.tbOfferte.Margin = New System.Windows.Forms.Padding(2) Me.tbOfferte.Name = "tbOfferte" - Me.tbOfferte.Size = New System.Drawing.Size(1644, 962) + Me.tbOfferte.Size = New System.Drawing.Size(1681, 996) Me.tbOfferte.TabIndex = 11 Me.tbOfferte.Text = "Offerte" Me.tbOfferte.UseVisualStyleBackColor = True ' - 'UsrCntlOfferte1 - ' - Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White - Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0) - Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1) - Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" - Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1644, 962) - Me.UsrCntlOfferte1.TabIndex = 0 - ' 'tbUSTV ' Me.tbUSTV.Controls.Add(Me.tbcntrUSTV) Me.tbUSTV.Location = New System.Drawing.Point(4, 25) Me.tbUSTV.Name = "tbUSTV" - Me.tbUSTV.Size = New System.Drawing.Size(1644, 962) + Me.tbUSTV.Size = New System.Drawing.Size(1681, 996) Me.tbUSTV.TabIndex = 12 Me.tbUSTV.Text = "USTV" Me.tbUSTV.UseVisualStyleBackColor = True @@ -2352,7 +2332,7 @@ Partial Class frmKundenblatt Me.tbcntrUSTV.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrUSTV.Name = "tbcntrUSTV" Me.tbcntrUSTV.SelectedIndex = 0 - Me.tbcntrUSTV.Size = New System.Drawing.Size(1644, 962) + Me.tbcntrUSTV.Size = New System.Drawing.Size(1681, 996) Me.tbcntrUSTV.TabIndex = 1 ' 'tbUSTVDokumente @@ -2365,7 +2345,7 @@ Partial Class frmKundenblatt Me.tbUSTVDokumente.Controls.Add(Me.scanUSTVVollmachten) Me.tbUSTVDokumente.Location = New System.Drawing.Point(4, 22) Me.tbUSTVDokumente.Name = "tbUSTVDokumente" - Me.tbUSTVDokumente.Size = New System.Drawing.Size(1636, 936) + Me.tbUSTVDokumente.Size = New System.Drawing.Size(1673, 970) Me.tbUSTVDokumente.TabIndex = 8 Me.tbUSTVDokumente.Text = "Dokumente" Me.tbUSTVDokumente.UseVisualStyleBackColor = True @@ -2466,19 +2446,11 @@ Partial Class frmKundenblatt Me.tbUSTVAntrage.Location = New System.Drawing.Point(4, 22) Me.tbUSTVAntrage.Name = "tbUSTVAntrage" Me.tbUSTVAntrage.Padding = New System.Windows.Forms.Padding(3) - Me.tbUSTVAntrage.Size = New System.Drawing.Size(184, 45) + Me.tbUSTVAntrage.Size = New System.Drawing.Size(1636, 953) Me.tbUSTVAntrage.TabIndex = 9 Me.tbUSTVAntrage.Text = "USTV-Anträge" Me.tbUSTVAntrage.UseVisualStyleBackColor = True ' - 'UsrCntlUSTV - ' - Me.UsrCntlUSTV.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlUSTV.Location = New System.Drawing.Point(3, 3) - Me.UsrCntlUSTV.Name = "UsrCntlUSTV" - Me.UsrCntlUSTV.Size = New System.Drawing.Size(178, 39) - Me.UsrCntlUSTV.TabIndex = 0 - ' 'tbFIBU ' Me.tbFIBU.Controls.Add(Me.txtZinsbelastungNew) @@ -2496,7 +2468,7 @@ Partial Class frmKundenblatt Me.tbFIBU.Controls.Add(Me.txtFIBUKuerzel) Me.tbFIBU.Location = New System.Drawing.Point(4, 25) Me.tbFIBU.Name = "tbFIBU" - Me.tbFIBU.Size = New System.Drawing.Size(1644, 962) + Me.tbFIBU.Size = New System.Drawing.Size(1681, 996) Me.tbFIBU.TabIndex = 13 Me.tbFIBU.Text = "FIBU" Me.tbFIBU.UseVisualStyleBackColor = True @@ -2655,7 +2627,7 @@ Partial Class frmKundenblatt Me.tbRechnungen.Controls.Add(Me.MyPanel1) Me.tbRechnungen.Location = New System.Drawing.Point(4, 25) Me.tbRechnungen.Name = "tbRechnungen" - Me.tbRechnungen.Size = New System.Drawing.Size(1644, 962) + Me.tbRechnungen.Size = New System.Drawing.Size(1681, 996) Me.tbRechnungen.TabIndex = 14 Me.tbRechnungen.Text = "Rechnungen" Me.tbRechnungen.UseVisualStyleBackColor = True @@ -2674,7 +2646,7 @@ Partial Class frmKundenblatt Me.dgvRg.ReadOnly = True Me.dgvRg.RowHeadersVisible = False Me.dgvRg.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvRg.Size = New System.Drawing.Size(1644, 902) + Me.dgvRg.Size = New System.Drawing.Size(1681, 936) Me.dgvRg.TabIndex = 3 ' 'MyPanel1 @@ -2687,7 +2659,7 @@ Partial Class frmKundenblatt Me.MyPanel1.Dock = System.Windows.Forms.DockStyle.Top Me.MyPanel1.Location = New System.Drawing.Point(0, 0) Me.MyPanel1.Name = "MyPanel1" - Me.MyPanel1.Size = New System.Drawing.Size(1644, 60) + Me.MyPanel1.Size = New System.Drawing.Size(1681, 60) Me.MyPanel1.TabIndex = 2 ' 'btnRgPdf @@ -2696,7 +2668,7 @@ Partial Class frmKundenblatt Me.btnRgPdf.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnRgPdf.Image = Global.SDL.My.Resources.Resources.pdf1 Me.btnRgPdf.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnRgPdf.Location = New System.Drawing.Point(1531, 0) + Me.btnRgPdf.Location = New System.Drawing.Point(1568, 0) Me.btnRgPdf.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3) Me.btnRgPdf.Name = "btnRgPdf" Me.btnRgPdf.Size = New System.Drawing.Size(105, 57) @@ -2848,7 +2820,7 @@ Partial Class frmKundenblatt Me.mne.Location = New System.Drawing.Point(0, 31) Me.mne.Name = "mne" Me.mne.Padding = New System.Windows.Forms.Padding(5, 0, 0, 0) - Me.mne.Size = New System.Drawing.Size(1652, 81) + Me.mne.Size = New System.Drawing.Size(1689, 81) Me.mne.TabIndex = 3 Me.mne.Text = "mnue" ' @@ -2901,7 +2873,7 @@ Partial Class frmKundenblatt ' Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24) Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM" - Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4 + Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8 Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4) Me.cntxtCntxtMDM.Text = "cntxtMDM" ' @@ -2989,7 +2961,7 @@ Partial Class frmKundenblatt Me.pnl.Dock = System.Windows.Forms.DockStyle.Top Me.pnl.Location = New System.Drawing.Point(0, 0) Me.pnl.Name = "pnl" - Me.pnl.Size = New System.Drawing.Size(1652, 112) + Me.pnl.Size = New System.Drawing.Size(1689, 112) Me.pnl.TabIndex = 0 ' 'lblINAKTIV @@ -3034,7 +3006,7 @@ Partial Class frmKundenblatt Me.KdSearchBox1.Name = "KdSearchBox1" Me.KdSearchBox1.nurAktive = False Me.KdSearchBox1.searchActive = True - Me.KdSearchBox1.Size = New System.Drawing.Size(1652, 34) + Me.KdSearchBox1.Size = New System.Drawing.Size(1689, 34) Me.KdSearchBox1.TabIndex = 0 Me.KdSearchBox1.TIMER_SEARCH = True Me.KdSearchBox1.usrcntl = Nothing @@ -3063,18 +3035,105 @@ Partial Class frmKundenblatt Me.tbiVERAGCard.Size = New System.Drawing.Size(186, 22) Me.tbiVERAGCard.Text = "VERAG Card" ' - 'txtEmailRE2 + 'txtAnsprechp ' - Me.txtEmailRE2.BackColor = System.Drawing.Color.White - Me.txtEmailRE2.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.txtEmailRE2.Cursor = System.Windows.Forms.Cursors.Hand - Me.txtEmailRE2.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtEmailRE2.Location = New System.Drawing.Point(40, 410) - Me.txtEmailRE2.Name = "txtEmailRE2" - Me.txtEmailRE2.ReadOnly = True - Me.txtEmailRE2.Size = New System.Drawing.Size(384, 19) - Me.txtEmailRE2.TabIndex = 195 - Me.txtEmailRE2.Text = "email-Rechnung" + Me.txtAnsprechp.BackColor = System.Drawing.Color.White + Me.txtAnsprechp.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.txtAnsprechp.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtAnsprechp.Location = New System.Drawing.Point(5, 212) + Me.txtAnsprechp.Name = "txtAnsprechp" + Me.txtAnsprechp.ReadOnly = True + Me.txtAnsprechp.Size = New System.Drawing.Size(431, 19) + Me.txtAnsprechp.TabIndex = 196 + Me.txtAnsprechp.Text = "Kontakt" + ' + 'dgvLeistungen + ' + Me.dgvLeistungen.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.dgvLeistungen.BackgroundColor = System.Drawing.Color.White + DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control + 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.WindowText + DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvLeistungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle16 + Me.dgvLeistungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle17.ForeColor = System.Drawing.Color.Black + DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvLeistungen.DefaultCellStyle = DataGridViewCellStyle17 + Me.dgvLeistungen.Location = New System.Drawing.Point(6, 92) + Me.dgvLeistungen.Name = "dgvLeistungen" + Me.dgvLeistungen.ReadOnly = True + 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.dgvLeistungen.RowHeadersDefaultCellStyle = DataGridViewCellStyle18 + Me.dgvLeistungen.Size = New System.Drawing.Size(481, 391) + Me.dgvLeistungen.TabIndex = 197 + ' + 'UsrcntlKundeBearbeitenFull1 + ' + Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White + Me.UsrcntlKundeBearbeitenFull1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0) + Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1" + Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1675, 990) + Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0 + ' + 'usrcntlKarten + ' + Me.usrcntlKarten.Cursor = System.Windows.Forms.Cursors.Default + Me.usrcntlKarten.Dock = System.Windows.Forms.DockStyle.Fill + Me.usrcntlKarten.Location = New System.Drawing.Point(3, 3) + Me.usrcntlKarten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.usrcntlKarten.Name = "usrcntlKarten" + Me.usrcntlKarten.Size = New System.Drawing.Size(1624, 941) + Me.usrcntlKarten.TabIndex = 0 + ' + 'UsrCntlLKW1 + ' + Me.UsrCntlLKW1.BackColor = System.Drawing.Color.White + Me.UsrCntlLKW1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.UsrCntlLKW1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.UsrCntlLKW1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlLKW1.Location = New System.Drawing.Point(10, 0) + Me.UsrCntlLKW1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.UsrCntlLKW1.MaximumSize = New System.Drawing.Size(1200, 1000) + Me.UsrCntlLKW1.Name = "UsrCntlLKW1" + Me.UsrCntlLKW1.Size = New System.Drawing.Size(1200, 941) + Me.UsrCntlLKW1.TabIndex = 0 + ' + 'UsrCntlOfferte1 + ' + Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White + Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0) + Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1) + Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" + Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1681, 996) + Me.UsrCntlOfferte1.TabIndex = 0 + ' + 'UsrCntlUSTV + ' + Me.UsrCntlUSTV.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlUSTV.Location = New System.Drawing.Point(3, 3) + Me.UsrCntlUSTV.Name = "UsrCntlUSTV" + Me.UsrCntlUSTV.Size = New System.Drawing.Size(1630, 947) + Me.UsrCntlUSTV.TabIndex = 0 ' 'frmKundenblatt ' @@ -3082,7 +3141,7 @@ Partial Class frmKundenblatt Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScroll = True Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(1649, 1120) + Me.ClientSize = New System.Drawing.Size(1689, 1137) Me.Controls.Add(Me.lblAbfVerb) Me.Controls.Add(Me.btnAbfVerb) Me.Controls.Add(Me.tbcntrMain) @@ -3172,6 +3231,7 @@ Partial Class frmKundenblatt Me.mne.PerformLayout() Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() + CType(Me.dgvLeistungen, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -3377,4 +3437,6 @@ Partial Class frmKundenblatt Friend WithEvents TextBox1 As TextBox Friend WithEvents PictureBox8 As PictureBox Friend WithEvents txtEmailRE2 As TextBox + Friend WithEvents txtAnsprechp As TextBox + Friend WithEvents dgvLeistungen As DataGridView End Class diff --git a/SDL/kunden/frmKundenblatt.vb b/SDL/kunden/frmKundenblatt.vb index e69b6dfb..6c1a5ffd 100644 --- a/SDL/kunden/frmKundenblatt.vb +++ b/SDL/kunden/frmKundenblatt.vb @@ -18,7 +18,8 @@ Public Class frmKundenblatt ' Dim KUNDE As cKunde = Nothing Dim ADRESSE As VERAG_PROG_ALLGEMEIN.cAdressen = Nothing Dim KUNDE_ERW As VERAG_PROG_ALLGEMEIN.cKundenErweitert = Nothing - Dim KUNDE_K As VERAG_PROG_ALLGEMEIN.cKundenKontakte = Nothing + Dim KUNDE_K_RE As VERAG_PROG_ALLGEMEIN.cKundenKontakte = Nothing + Dim KUNDE_K_GF As VERAG_PROG_ALLGEMEIN.cKundenKontakte = Nothing ' Public BERECHTIGUNEN As List(Of cBerechtigungen) = Nothing @@ -344,6 +345,7 @@ Public Class frmKundenblatt initDGVOffenePosten() initDGVUmsatz() initDGVUmsatzNachLeistungsNr() + initStat() ' initDgvSDLLeistungen() 'showDgvSDLLeistungen() @@ -639,27 +641,47 @@ Public Class frmKundenblatt End Sub Sub initStat() - lblStat_Lkws.Text = SQL.getSqlCount("SELECT Count(KfzKennzeichen) FROM LKW WHERE KundenNr=" & kdNr & " and isnull(Verkauft,0) <> 1 and isnull(Abgemeldet,0) <> 1 ") & " aktive LKWs registriert" + lblStat_Lkws.Text = SQL.getSqlCount("SELECT Count(KfzKennzeichen) FROM LKW WHERE KundenNr=" & kdNr & " and isnull(Verkauft,0) <> 1 and isnull(Abgemeldet,0) <> 1 ") & " aktive LKWs registriert" 'OK + lblStat_SdlLeistungen.Text = SQL.getSqlCount("SELECT Count(SDL.SDLNr) FROM SDL, Speditionsdienstleistungen WHERE KundenNr=" & kdNr & " and ISNULL(Archiviert,0) <> 1 and ISNULL(LKWAbgemeldet,0) <> 1 and ISNULL(Gesperrt,0) <> 1 and ISNULL(Defekt,0) <> 1 and ISNULL(Verloren,0) <> 1 and ISNULL(Gestohlen,0) <> 1 AND SDL.SDLNr=Speditionsdienstleistungen.SDLNr ") & " aktive SDL Leistungen" + With dgvLeistungen + .DataSource = SQL.loadDgvBySql(" SELECT Count(SDL.SDLNr) as Anzahl , SDLBez as Leistung FROM SDL, Speditionsdienstleistungen + WHERE KundenNr=" & kdNr & " and ISNULL(Archiviert,0) <> 1 and ISNULL(LKWAbgemeldet,0) <> 1 and ISNULL(Gesperrt,0) <> 1 and ISNULL(Defekt,0) <> 1 and ISNULL(Verloren,0) <> 1 and ISNULL(Gestohlen,0) <> 1 + AND SDL.SDLNr=Speditionsdienstleistungen.SDLNr group by SDLBez order by Count(SDL.SDLNr) desc ") + .Columns(1).AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + + .RowTemplate.Height = 20 + .AllowUserToAddRows = False + .AllowUserToDeleteRows = False + .AllowUserToOrderColumns = False + .AllowUserToResizeColumns = False + .AllowUserToResizeRows = False + .RowTemplate.ReadOnly = True + .RowHeadersVisible = False + + + End With + + Dim SQL_Diesel As String = " FROM SDL, Speditionsdienstleistungen WHERE KundenNr=" & kdNr & " AND ISNULL(Archiviert,0) <> 1 and ISNULL(LKWAbgemeldet,0) <> 1 and ISNULL(Gesperrt,0) <> 1 and ISNULL(Defekt,0) <> 1 and ISNULL(Verloren,0) <> 1 and ISNULL(Gestohlen,0) <> 1 AND SDL.SDLNr=Speditionsdienstleistungen.SDLNr AND SDL.SDLNr IN (100,101)" Dim dt_Diesel As DataTable = SQL.loadDgvBySql("SELECT SDL.SDLNr,Count(SDL.SDLNr) as Anzahl" & SQL_Diesel & " Group by SDL.SDLNr", "SDL") lblStat_SdlLeistungen_Diesel.Text = SQL.getSqlCount("SELECT Count(SDL.SDLNr)" & SQL_Diesel) & " aktive Tankkarten" - If dt_Diesel.Rows.Count > 0 Then - lblStat_SdlLeistungen_Diesel.Text &= " ( " - For Each r In dt_Diesel.Rows - Dim Lieferant As String = "" - Select Case r.Item("SDLNr") - Case "100" : Lieferant = r.Item("Anzahl") & "x IDS " - Case "101" : Lieferant = r.Item("Anzahl") & "x RMC " - End Select + 'If dt_Diesel.Rows.Count > 0 Then + ' lblStat_SdlLeistungen_Diesel.Text &= " ( " + ' For Each r In dt_Diesel.Rows + ' Dim Lieferant As String = "" + ' Select Case r.Item("SDLNr") + ' Case "100" : Lieferant = r.Item("Anzahl") & "x IDS " + ' Case "101" : Lieferant = r.Item("Anzahl") & "x RMC " + ' End Select - lblStat_SdlLeistungen_Diesel.Text &= Lieferant - Next - lblStat_SdlLeistungen_Diesel.Text &= ")" - End If + ' lblStat_SdlLeistungen_Diesel.Text &= Lieferant + ' Next + ' lblStat_SdlLeistungen_Diesel.Text &= ")" + 'End If @@ -668,35 +690,35 @@ Public Class frmKundenblatt lblStat_SdlLeistungen_Maut.Text = SQL.getSqlCount("SELECT Count(SDL.SDLNr)" & SQL_Maut) & " aktive Mautboxen/-karten" - If dt_Maut.Rows.Count > 0 Then - lblStat_SdlLeistungen_Maut.Text &= " ( " - For Each r As DataRow In dt_Maut.Rows - Dim Lieferant As String = "" - Select Case r.Item("SDLNr") - Case "200" : Lieferant = r.Item("Anzahl") & "x AT " - Case "201" : Lieferant = r.Item("Anzahl") & "x DE " - Case "202" : Lieferant = r.Item("Anzahl") & "x TELEPASS " - Case "203" : Lieferant = r.Item("Anzahl") & "x CZ " - Case "205" : Lieferant = r.Item("Anzahl") & "x MotorWay " - Case "206" : Lieferant = r.Item("Anzahl") & "x DouBox " - Case "208" : Lieferant = r.Item("Anzahl") & "x MSE " - Case "209" : Lieferant = r.Item("Anzahl") & "x PL " - Case "210" : Lieferant = r.Item("Anzahl") & "x SI " - Case "211" : Lieferant = r.Item("Anzahl") & "x MSE-MP " - Case "212" : Lieferant = r.Item("Anzahl") & "x UTA " - Case "213" : Lieferant = r.Item("Anzahl") & "x HUGO " - Case "214" : Lieferant = r.Item("Anzahl") & "x PLOSE-RM " - Case "215" : Lieferant = r.Item("Anzahl") & "x PLOSE-IT " - Case "216" : Lieferant = r.Item("Anzahl") & "x PLOSE-CZ " - Case "217" : Lieferant = r.Item("Anzahl") & "x PLOSE-MP " - Case "218" : Lieferant = r.Item("Anzahl") & "x PLOSE-TM " + 'If dt_Maut.Rows.Count > 0 Then + ' lblStat_SdlLeistungen_Maut.Text &= " ( " + ' For Each r As DataRow In dt_Maut.Rows + ' Dim Lieferant As String = "" + ' Select Case r.Item("SDLNr") + ' Case "200" : Lieferant = r.Item("Anzahl") & "x AT " + ' Case "201" : Lieferant = r.Item("Anzahl") & "x DE " + ' Case "202" : Lieferant = r.Item("Anzahl") & "x TELEPASS " + ' Case "203" : Lieferant = r.Item("Anzahl") & "x CZ " + ' Case "205" : Lieferant = r.Item("Anzahl") & "x MotorWay " + ' Case "206" : Lieferant = r.Item("Anzahl") & "x DouBox " + ' Case "208" : Lieferant = r.Item("Anzahl") & "x MSE " + ' Case "209" : Lieferant = r.Item("Anzahl") & "x PL " + ' Case "210" : Lieferant = r.Item("Anzahl") & "x SI " + ' Case "211" : Lieferant = r.Item("Anzahl") & "x MSE-MP " + ' Case "212" : Lieferant = r.Item("Anzahl") & "x UTA " + ' Case "213" : Lieferant = r.Item("Anzahl") & "x HUGO " + ' Case "214" : Lieferant = r.Item("Anzahl") & "x PLOSE-RM " + ' Case "215" : Lieferant = r.Item("Anzahl") & "x PLOSE-IT " + ' Case "216" : Lieferant = r.Item("Anzahl") & "x PLOSE-CZ " + ' Case "217" : Lieferant = r.Item("Anzahl") & "x PLOSE-MP " + ' Case "218" : Lieferant = r.Item("Anzahl") & "x PLOSE-TM " - End Select + ' End Select - lblStat_SdlLeistungen_Maut.Text &= Lieferant - Next - lblStat_SdlLeistungen_Maut.Text &= ")" - End If + ' lblStat_SdlLeistungen_Maut.Text &= Lieferant + ' Next + ' lblStat_SdlLeistungen_Maut.Text &= ")" + 'End If End Sub @@ -738,7 +760,8 @@ Public Class frmKundenblatt KUNDE = New VERAG_PROG_ALLGEMEIN.cKunde(kdNr) 'kundenSQL.getKundeByKdNr(kdNr) ADRESSE = New VERAG_PROG_ALLGEMEIN.cAdressen(kdNr) 'kundenSQL.getKundeByKdNr(kdNr) KUNDE_ERW = New VERAG_PROG_ALLGEMEIN.cKundenErweitert(kdNr) - KUNDE_K = New VERAG_PROG_ALLGEMEIN.cKundenKontakte(8, kdNr) + KUNDE_K_RE = New VERAG_PROG_ALLGEMEIN.cKundenKontakte(8, kdNr) 'Rechnungen an! + KUNDE_K_GF = New VERAG_PROG_ALLGEMEIN.cKundenKontakte(13, kdNr) 'Rechnungen an! 'Me.dataAdapterFirma = Nothing ' Me.dataFirma.Clear() 'SDL! @@ -752,16 +775,16 @@ Public Class frmKundenblatt 'Me.dataFirma.AcceptChanges() ' Me.dataFirma.Locale = System.Globalization.CultureInfo.InvariantCulture - lblKurzname.Text = checkNullStr(ADRESSE.Ordnungsbegriff) lblFirmenname1.Text = checkNullStr(ADRESSE.Name_1) lblFirmenname2.Text = checkNullStr(ADRESSE.Name_2) - lblStrasse.Text = checkNullStr(ADRESSE.Straße) lblAdressenzusatz.Text = checkNullStr(KUNDE_ERW.kde_AdressZusatz) lblLandPlzOrt.Text = checkNullStr(ADRESSE.LandKz) & " - " & checkNullStr(ADRESSE.PLZ) & " - " & checkNullStr(ADRESSE.Ort) - lblPostfach.Text = checkNullStr(ADRESSE.PLZPF) & " - " & checkNullStr(ADRESSE.Postfach) + txtAnsprechp.Text = "" + txtAnsprechp.Text = IIf(checkNullStr(ADRESSE.Anrede) <> "", ADRESSE.Anrede & " ", "") + txtAnsprechp.Text &= IIf(checkNullStr(ADRESSE.Ansprechpartner) <> "", ADRESSE.Ansprechpartner, "") lblTel.Text = checkNullStr(ADRESSE.Telefon) @@ -772,9 +795,21 @@ Public Class frmKundenblatt txtEmailRE.Text = "-" txtEmailRE2.Text = "" - If KUNDE_K.hasEntry Then 'Rechnung an - txtEmailRE.Text = KUNDE_K.kkd_Email - txtEmailRE2.Text &= KUNDE_K.kkd_EmailCC + If KUNDE_K_RE.hasEntry Then 'Rechnung an + txtEmailRE.Text = KUNDE_K_RE.kkd_Email + txtEmailRE2.Text &= KUNDE_K_RE.kkd_EmailCC + End If + + + If KUNDE_K_GF.hasEntry Then + If txtAnsprechp.Text <> "" Then txtAnsprechp.Text &= " " + + txtAnsprechp.Text &= "(GF:" + txtAnsprechp.Text &= IIf(checkNullStr(KUNDE_K_GF.kkd_AnsprechpartnerAnrede) <> "", KUNDE_K_GF.kkd_AnsprechpartnerAnrede & " ", "") + txtAnsprechp.Text &= IIf(checkNullStr(KUNDE_K_GF.kkd_AnsprechpartnerVorname) <> "", KUNDE_K_GF.kkd_AnsprechpartnerVorname & " ", "") + txtAnsprechp.Text &= IIf(checkNullStr(KUNDE_K_GF.kkd_AnsprechpartnerNachname) <> "", KUNDE_K_GF.kkd_AnsprechpartnerNachname.ToString.ToUpper, "") + txtAnsprechp.Text &= ")" + End If @@ -1062,7 +1097,7 @@ Public Class frmKundenblatt ' .DataSource = SQL.loadDgvBySql("SELECT Speditionsdienstleistungen.SDLNr,Speditionsdienstleistungen.SDLBez,Sperrnummernverzeichnis.SperrNr,Sperrnummernverzeichnis.SperrBez,KundenSDL.Sperrdatum FROM Speditionsdienstleistungen,KundenSDL,Sperrnummernverzeichnis WHERE KundenSDL.KundenNr=" & kdNr & " AND Speditionsdienstleistungen.SDLNr=KundenSDL.SDLNr AND Sperrnummernverzeichnis.SperrNr=KundenSDL.Sperre /*AND KundenSDL.Sperrdatum IS NOT NULL*/ ORDER BY SperrNr") .DataSource = SQL.loadDgvBySql(" SELECT KundenSDL.SDLNr, Speditionsdienstleistungen.SDLBez,Sperrnummernverzeichnis.SperrNr,Sperrnummernverzeichnis.SperrBez, [Sperrdatum] " & " FROM KundenSDL INNER JOIN Speditionsdienstleistungen ON Speditionsdienstleistungen.SDLNr=KundenSDL.SDLNr INNER JOIN Sperrnummernverzeichnis ON Sperrnummernverzeichnis.SperrNr=KundenSDL.Sperre " & - " WHERE KundenSDL.KundenNr='" & kdNr & "' /*AND [SDLTypNr] <=2 */ ORDER BY Sperre,Speditionsdienstleistungen.SDLBez") + " WHERE KundenSDL.KundenNr='" & kdNr & "' AND KundenSDL.SDLNr in (select distinct(SDL.SDLNr) from SDL where SDL.SDLNr=KundenSDL.SDLNr AND SDL.KundenNr = KundenSDL.KundenNr) and SDLTypNr IN (1,2) ORDER BY Sperre,Speditionsdienstleistungen.SDLBez") .RowTemplate.Height = 20 .AllowUserToAddRows = False .AllowUserToDeleteRows = False @@ -1317,12 +1352,10 @@ Public Class frmKundenblatt If GroupBox5.Visible Then 'Stat angezeigt GroupBox5.Visible = False sender.text = "Statistik anzeigen" - picLogo.Visible = True Else GroupBox5.Visible = True initStat() sender.text = "Statistik ausblenden" - picLogo.Visible = False End If End Sub