diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index b3e4d7d1..680da2b5 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -90,7 +90,7 @@ false - SDL_TemporaryKey.pfx + Test.pfx diff --git a/SDL/kunden/Berichte/rptFiskalkunde.Designer.vb b/SDL/kunden/Berichte/rptFiskalkunde.Designer.vb index b7ee25a0..347c4a79 100644 --- a/SDL/kunden/Berichte/rptFiskalkunde.Designer.vb +++ b/SDL/kunden/Berichte/rptFiskalkunde.Designer.vb @@ -22,7 +22,7 @@ Partial Public Class rptFiskalkunde Me.lblUeberschrift = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.Detail = New GrapeCity.ActiveReports.SectionReportModel.Detail() Me.Label5 = New GrapeCity.ActiveReports.SectionReportModel.Label() - Me.txtKunde = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.txtEMail = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.txtAnsprechpartner = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.txtKdNr = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.Label1 = New GrapeCity.ActiveReports.SectionReportModel.Label() @@ -31,7 +31,7 @@ Partial Public Class rptFiskalkunde Me.txtWebsite = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.Line = New GrapeCity.ActiveReports.SectionReportModel.Line() Me.Label7 = New GrapeCity.ActiveReports.SectionReportModel.Label() - Me.TextBox1 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.txtFirma = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.Label10 = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.Label11 = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.Shape1 = New GrapeCity.ActiveReports.SectionReportModel.Shape() @@ -120,7 +120,7 @@ Partial Public Class rptFiskalkunde CType(Me.picVERAG, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label5, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txtKunde, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtEMail, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtAnsprechpartner, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtKdNr, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -128,7 +128,7 @@ Partial Public Class rptFiskalkunde CType(Me.txtKundeSeit, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtWebsite, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label7, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TextBox1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtFirma, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label10, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label11, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label2, System.ComponentModel.ISupportInitialize).BeginInit() @@ -206,7 +206,7 @@ Partial Public Class rptFiskalkunde ' 'Detail ' - Me.Detail.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Label5, Me.txtKunde, Me.txtAnsprechpartner, Me.txtKdNr, Me.Label1, Me.lblWebsite, Me.txtKundeSeit, Me.txtWebsite, Me.Line, Me.Label7, Me.TextBox1, Me.Label10, Me.Label11, Me.Shape1, Me.Shape2, Me.Shape3, Me.Shape4, Me.Shape5, Me.Shape6, Me.Shape7, Me.Shape8, Me.Shape9, Me.Shape10, Me.Shape11, Me.Shape12, Me.Shape13, Me.Shape14, Me.Shape15, Me.Shape17, Me.Shape18, Me.Shape19, Me.Label2, Me.Label3, Me.Label6, Me.Label4, Me.txtHR, Me.txtBon, Me.txtUmsatz, Me.txtVM, Me.txtHRja, Me.txtHRnein, Me.txtWSja, Me.txtWSnein, Me.txtBONnein, Me.txtBONja, Me.txtUmsatzJa, Me.txtUmsatzNein, Me.txtVMNein, Me.txtVMJa, Me.Shape16, Me.Shape20, Me.Label8, Me.Label9, Me.Label12, Me.Shape21, Me.Shape22, Me.Shape23, Me.Shape24, Me.Shape25, Me.Shape26, Me.Shape27, Me.Shape28, Me.Shape29, Me.Shape30, Me.Shape31, Me.Shape32, Me.Shape33, Me.Shape34, Me.Shape35, Me.Shape36, Me.Shape37, Me.Shape38, Me.Label13, Me.Label14, Me.Label15, Me.Label16, Me.Label17, Me.Label18, Me.Label19, Me.Label20, Me.Label21, Me.txtGZ, Me.txtGJ, Me.txtAnzMA, Me.txtKredit, Me.txtImport, Me.txtGesellschafter, Me.txtGF, Me.txtSteuerberater, Me.txtSonstiges, Me.lblKontrolle}) + Me.Detail.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Label5, Me.txtEMail, Me.txtAnsprechpartner, Me.txtKdNr, Me.Label1, Me.lblWebsite, Me.txtKundeSeit, Me.txtWebsite, Me.Line, Me.Label7, Me.txtFirma, Me.Label10, Me.Label11, Me.Shape1, Me.Shape2, Me.Shape3, Me.Shape4, Me.Shape5, Me.Shape6, Me.Shape7, Me.Shape8, Me.Shape9, Me.Shape10, Me.Shape11, Me.Shape12, Me.Shape13, Me.Shape14, Me.Shape15, Me.Shape17, Me.Shape18, Me.Shape19, Me.Label2, Me.Label3, Me.Label6, Me.Label4, Me.txtHR, Me.txtBon, Me.txtUmsatz, Me.txtVM, Me.txtHRja, Me.txtHRnein, Me.txtWSja, Me.txtWSnein, Me.txtBONnein, Me.txtBONja, Me.txtUmsatzJa, Me.txtUmsatzNein, Me.txtVMNein, Me.txtVMJa, Me.Shape16, Me.Shape20, Me.Label8, Me.Label9, Me.Label12, Me.Shape21, Me.Shape22, Me.Shape23, Me.Shape24, Me.Shape25, Me.Shape26, Me.Shape27, Me.Shape28, Me.Shape29, Me.Shape30, Me.Shape31, Me.Shape32, Me.Shape33, Me.Shape34, Me.Shape35, Me.Shape36, Me.Shape37, Me.Shape38, Me.Label13, Me.Label14, Me.Label15, Me.Label16, Me.Label17, Me.Label18, Me.Label19, Me.Label20, Me.Label21, Me.txtGZ, Me.txtGJ, Me.txtAnzMA, Me.txtKredit, Me.txtImport, Me.txtGesellschafter, Me.txtGF, Me.txtSteuerberater, Me.txtSonstiges, Me.lblKontrolle}) Me.Detail.Height = 6.456694! Me.Detail.Name = "Detail" ' @@ -221,16 +221,19 @@ Partial Public Class rptFiskalkunde Me.Label5.Top = 0.015! Me.Label5.Width = 1.0! ' - 'txtKunde + 'txtEMail ' - Me.txtKunde.CanShrink = True - Me.txtKunde.Height = 0.186! - Me.txtKunde.Left = 1.0! - Me.txtKunde.Name = "txtKunde" - Me.txtKunde.Style = "font-size: 12pt; font-weight: bold; ddo-char-set: 1" - Me.txtKunde.Text = "-" - Me.txtKunde.Top = 0.369! - Me.txtKunde.Width = 3.0! + Me.txtEMail.CanShrink = True + Me.txtEMail.DataField = "" + Me.txtEMail.DistinctField = "" + Me.txtEMail.Height = 0.186! + Me.txtEMail.Left = 1.0! + Me.txtEMail.Name = "txtEMail" + Me.txtEMail.Style = "color: Black; font-size: 12pt; font-weight: bold; ddo-char-set: 1" + Me.txtEMail.SummaryGroup = "" + Me.txtEMail.Text = "-" + Me.txtEMail.Top = 0.369! + Me.txtEMail.Width = 3.0! ' 'txtAnsprechpartner ' @@ -246,7 +249,7 @@ Partial Public Class rptFiskalkunde Me.txtKdNr.Height = 0.172! Me.txtKdNr.Left = 1.01! Me.txtKdNr.Name = "txtKdNr" - Me.txtKdNr.Style = "font-weight: bold; text-align: center" + Me.txtKdNr.Style = "font-weight: bold; text-align: left" Me.txtKdNr.Text = "123456" Me.txtKdNr.Top = 0.015! Me.txtKdNr.Width = 0.9999999! @@ -267,12 +270,12 @@ Partial Public Class rptFiskalkunde Me.lblWebsite.DataField = "" Me.lblWebsite.Height = 0.1570001! Me.lblWebsite.HyperLink = Nothing - Me.lblWebsite.Left = 0.062! + Me.lblWebsite.Left = 0.05! Me.lblWebsite.Name = "lblWebsite" Me.lblWebsite.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: left; ddo-char-set: " & "1" Me.lblWebsite.Text = "Internet/ Website-Check:" - Me.lblWebsite.Top = 0.8930001! + Me.lblWebsite.Top = 0.893! Me.lblWebsite.Width = 2.708! ' 'txtKundeSeit @@ -290,7 +293,7 @@ Partial Public Class rptFiskalkunde ' Me.txtWebsite.DataField = "" Me.txtWebsite.DistinctField = "" - Me.txtWebsite.Height = 0.1574803! + Me.txtWebsite.Height = 0.157! Me.txtWebsite.Left = 3.667! Me.txtWebsite.Name = "txtWebsite" Me.txtWebsite.Style = "color: Black" @@ -323,15 +326,18 @@ Partial Public Class rptFiskalkunde Me.Label7.Top = 0.187! Me.Label7.Width = 1.0! ' - 'TextBox1 + 'txtFirma ' - Me.TextBox1.Height = 0.172! - Me.TextBox1.Left = 1.01! - Me.TextBox1.Name = "TextBox1" - Me.TextBox1.Style = "font-weight: bold; text-align: left" - Me.TextBox1.Text = "123456" - Me.TextBox1.Top = 0.187! - Me.TextBox1.Width = 2.99! + Me.txtFirma.DataField = "" + Me.txtFirma.DistinctField = "" + Me.txtFirma.Height = 0.172! + Me.txtFirma.Left = 1.01! + Me.txtFirma.Name = "txtFirma" + Me.txtFirma.Style = "color: Black; font-weight: bold; text-align: left" + Me.txtFirma.SummaryGroup = "" + Me.txtFirma.Text = "123456" + Me.txtFirma.Top = 0.187! + Me.txtFirma.Width = 2.99! ' 'Label10 ' @@ -384,12 +390,12 @@ Partial Public Class rptFiskalkunde ' 'Shape4 ' - Me.Shape4.Height = 0.2500001! + Me.Shape4.Height = 0.25! Me.Shape4.Left = 0.01! Me.Shape4.Name = "Shape4" Me.Shape4.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) Me.Shape4.Top = 0.851! - Me.Shape4.Width = 2.792! + Me.Shape4.Width = 2.802! ' 'Shape5 ' @@ -519,42 +525,42 @@ Partial Public Class rptFiskalkunde ' 'Label2 ' - Me.Label2.Height = 0.132! + Me.Label2.Height = 0.174! Me.Label2.HyperLink = Nothing Me.Label2.Left = 2.812! Me.Label2.Name = "Label2" Me.Label2.Style = "text-align: center" Me.Label2.Text = "JA" - Me.Label2.Top = 0.677! + Me.Label2.Top = 0.6350001! Me.Label2.Width = 0.4070001! ' 'Label3 ' - Me.Label3.Height = 0.132! + Me.Label3.Height = 0.174! Me.Label3.HyperLink = Nothing Me.Label3.Left = 3.219! Me.Label3.Name = "Label3" Me.Label3.Style = "text-align: center" Me.Label3.Text = "NEIN" - Me.Label3.Top = 0.677! + Me.Label3.Top = 0.6350001! Me.Label3.Width = 0.4070001! ' 'Label6 ' - Me.Label6.Height = 0.132! + Me.Label6.Height = 0.174! Me.Label6.HyperLink = Nothing Me.Label6.Left = 3.636! Me.Label6.Name = "Label6" Me.Label6.Style = "text-align: center" Me.Label6.Text = "Zusatzinfo" - Me.Label6.Top = 0.677! + Me.Label6.Top = 0.6350001! Me.Label6.Width = 3.844! ' 'Label4 ' Me.Label4.Height = 0.1574802! Me.Label4.HyperLink = Nothing - Me.Label4.Left = 0.052! + Me.Label4.Left = 0.05! Me.Label4.Name = "Label4" Me.Label4.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: left; ddo-char-set: " & "1" @@ -605,8 +611,8 @@ Partial Public Class rptFiskalkunde ' Me.txtVM.DataField = "" Me.txtVM.DistinctField = "" - Me.txtVM.Height = 0.1574803! - Me.txtVM.Left = 3.636! + Me.txtVM.Height = 0.157! + Me.txtVM.Left = 3.667! Me.txtVM.Name = "txtVM" Me.txtVM.Style = "color: Black" Me.txtVM.SummaryGroup = "" @@ -623,7 +629,6 @@ Partial Public Class rptFiskalkunde Me.txtHRja.Name = "txtHRja" Me.txtHRja.Style = "color: Black; text-align: center" Me.txtHRja.SummaryGroup = "" - Me.txtHRja.Text = "-" Me.txtHRja.Top = 1.165! Me.txtHRja.Width = 0.3! ' @@ -636,7 +641,6 @@ Partial Public Class rptFiskalkunde Me.txtHRnein.Name = "txtHRnein" Me.txtHRnein.Style = "color: Black; text-align: center" Me.txtHRnein.SummaryGroup = "" - Me.txtHRnein.Text = "-" Me.txtHRnein.Top = 1.172! Me.txtHRnein.Width = 0.3! ' @@ -649,7 +653,6 @@ Partial Public Class rptFiskalkunde Me.txtWSja.Name = "txtWSja" Me.txtWSja.Style = "color: Black; text-align: center" Me.txtWSja.SummaryGroup = "" - Me.txtWSja.Text = "-" Me.txtWSja.Top = 0.8930001! Me.txtWSja.Width = 0.3! ' @@ -662,7 +665,6 @@ Partial Public Class rptFiskalkunde Me.txtWSnein.Name = "txtWSnein" Me.txtWSnein.Style = "color: Black; text-align: center" Me.txtWSnein.SummaryGroup = "" - Me.txtWSnein.Text = "-" Me.txtWSnein.Top = 0.8930001! Me.txtWSnein.Width = 0.3! ' @@ -675,7 +677,6 @@ Partial Public Class rptFiskalkunde Me.txtBONnein.Name = "txtBONnein" Me.txtBONnein.Style = "color: Black; text-align: center" Me.txtBONnein.SummaryGroup = "" - Me.txtBONnein.Text = "-" Me.txtBONnein.Top = 1.417! Me.txtBONnein.Width = 0.3! ' @@ -688,7 +689,6 @@ Partial Public Class rptFiskalkunde Me.txtBONja.Name = "txtBONja" Me.txtBONja.Style = "color: Black; text-align: center" Me.txtBONja.SummaryGroup = "" - Me.txtBONja.Text = "-" Me.txtBONja.Top = 1.417! Me.txtBONja.Width = 0.3! ' @@ -701,7 +701,6 @@ Partial Public Class rptFiskalkunde Me.txtUmsatzJa.Name = "txtUmsatzJa" Me.txtUmsatzJa.Style = "color: Black; text-align: center" Me.txtUmsatzJa.SummaryGroup = "" - Me.txtUmsatzJa.Text = "-" Me.txtUmsatzJa.Top = 1.643! Me.txtUmsatzJa.Width = 0.3! ' @@ -714,7 +713,6 @@ Partial Public Class rptFiskalkunde Me.txtUmsatzNein.Name = "txtUmsatzNein" Me.txtUmsatzNein.Style = "color: Black; text-align: center" Me.txtUmsatzNein.SummaryGroup = "" - Me.txtUmsatzNein.Text = "-" Me.txtUmsatzNein.Top = 1.643! Me.txtUmsatzNein.Width = 0.3! ' @@ -727,7 +725,6 @@ Partial Public Class rptFiskalkunde Me.txtVMNein.Name = "txtVMNein" Me.txtVMNein.Style = "color: Black; text-align: center" Me.txtVMNein.SummaryGroup = "" - Me.txtVMNein.Text = "-" Me.txtVMNein.Top = 1.91! Me.txtVMNein.Width = 0.3! ' @@ -740,7 +737,6 @@ Partial Public Class rptFiskalkunde Me.txtVMJa.Name = "txtVMJa" Me.txtVMJa.Style = "color: Black; text-align: center" Me.txtVMJa.SummaryGroup = "" - Me.txtVMJa.Text = "-" Me.txtVMJa.Top = 1.91! Me.txtVMJa.Width = 0.3! ' @@ -766,7 +762,7 @@ Partial Public Class rptFiskalkunde ' Me.Label8.Height = 0.1574803! Me.Label8.HyperLink = Nothing - Me.Label8.Left = 0.052! + Me.Label8.Left = 0.05! Me.Label8.Name = "Label8" Me.Label8.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: left; ddo-char-set: " & "1" @@ -778,7 +774,7 @@ Partial Public Class rptFiskalkunde ' Me.Label9.Height = 0.1574803! Me.Label9.HyperLink = Nothing - Me.Label9.Left = 0.052! + Me.Label9.Left = 0.05! Me.Label9.Name = "Label9" Me.Label9.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: left; ddo-char-set: " & "1" @@ -790,7 +786,7 @@ Partial Public Class rptFiskalkunde ' Me.Label12.Height = 0.1574803! Me.Label12.HyperLink = Nothing - Me.Label12.Left = 0.052! + Me.Label12.Left = 0.05! Me.Label12.Name = "Label12" Me.Label12.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: left; ddo-char-set: " & "1" @@ -964,7 +960,7 @@ Partial Public Class rptFiskalkunde ' Me.Label13.Height = 0.1574803! Me.Label13.HyperLink = Nothing - Me.Label13.Left = 0.052! + Me.Label13.Left = 0.05! Me.Label13.Name = "Label13" Me.Label13.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: left; ddo-char-set: " & "1" @@ -976,7 +972,7 @@ Partial Public Class rptFiskalkunde ' Me.Label14.Height = 0.1574803! Me.Label14.HyperLink = Nothing - Me.Label14.Left = 0.042! + Me.Label14.Left = 0.05! Me.Label14.Name = "Label14" Me.Label14.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: left; ddo-char-set: " & "1" @@ -988,7 +984,7 @@ Partial Public Class rptFiskalkunde ' Me.Label15.Height = 0.157! Me.Label15.HyperLink = Nothing - Me.Label15.Left = 0.052! + Me.Label15.Left = 0.05! Me.Label15.Name = "Label15" Me.Label15.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: left; ddo-char-set: " & "1" @@ -1000,7 +996,7 @@ Partial Public Class rptFiskalkunde ' Me.Label16.Height = 0.157! Me.Label16.HyperLink = Nothing - Me.Label16.Left = 0.042! + Me.Label16.Left = 0.05! Me.Label16.Name = "Label16" Me.Label16.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: left; ddo-char-set: " & "1" @@ -1012,7 +1008,7 @@ Partial Public Class rptFiskalkunde ' Me.Label17.Height = 0.157! Me.Label17.HyperLink = Nothing - Me.Label17.Left = 0.042! + Me.Label17.Left = 0.05! Me.Label17.Name = "Label17" Me.Label17.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: left; ddo-char-set: " & "1" @@ -1024,7 +1020,7 @@ Partial Public Class rptFiskalkunde ' Me.Label18.Height = 0.157! Me.Label18.HyperLink = Nothing - Me.Label18.Left = 0.042! + Me.Label18.Left = 0.05! Me.Label18.Name = "Label18" Me.Label18.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: left; ddo-char-set: " & "1" @@ -1036,7 +1032,7 @@ Partial Public Class rptFiskalkunde ' Me.Label19.Height = 0.157! Me.Label19.HyperLink = Nothing - Me.Label19.Left = 0.05200005! + Me.Label19.Left = 0.05! Me.Label19.Name = "Label19" Me.Label19.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: left; ddo-char-set: " & "1" @@ -1048,7 +1044,7 @@ Partial Public Class rptFiskalkunde ' Me.Label20.Height = 0.157! Me.Label20.HyperLink = Nothing - Me.Label20.Left = 0.042! + Me.Label20.Left = 0.05! Me.Label20.Name = "Label20" Me.Label20.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: left; ddo-char-set: " & "1" @@ -1060,7 +1056,7 @@ Partial Public Class rptFiskalkunde ' Me.Label21.Height = 0.157! Me.Label21.HyperLink = Nothing - Me.Label21.Left = 0.03200006! + Me.Label21.Left = 0.05! Me.Label21.Name = "Label21" Me.Label21.Style = "font-size: 8.25pt; font-weight: bold" Me.Label21.Text = "Sonstiges" @@ -1268,7 +1264,7 @@ Partial Public Class rptFiskalkunde CType(Me.picVERAG, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblUeberschrift, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label5, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txtKunde, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtEMail, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtAnsprechpartner, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtKdNr, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label1, System.ComponentModel.ISupportInitialize).EndInit() @@ -1276,7 +1272,7 @@ Partial Public Class rptFiskalkunde CType(Me.txtKundeSeit, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtWebsite, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label7, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TextBox1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtFirma, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label10, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label11, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label2, System.ComponentModel.ISupportInitialize).EndInit() @@ -1328,7 +1324,7 @@ Partial Public Class rptFiskalkunde Private WithEvents picVERAG As GrapeCity.ActiveReports.SectionReportModel.Picture Private WithEvents lblUeberschrift As GrapeCity.ActiveReports.SectionReportModel.Label Private WithEvents Label5 As GrapeCity.ActiveReports.SectionReportModel.Label - Private WithEvents txtKunde As GrapeCity.ActiveReports.SectionReportModel.TextBox + Private WithEvents txtEMail As GrapeCity.ActiveReports.SectionReportModel.TextBox Private WithEvents txtAnsprechpartner As GrapeCity.ActiveReports.SectionReportModel.TextBox Private WithEvents txtKdNr As GrapeCity.ActiveReports.SectionReportModel.TextBox Private WithEvents Label1 As GrapeCity.ActiveReports.SectionReportModel.Label @@ -1341,7 +1337,7 @@ Partial Public Class rptFiskalkunde Private WithEvents lblDat As GrapeCity.ActiveReports.SectionReportModel.Label Public WithEvents Label28 As GrapeCity.ActiveReports.SectionReportModel.Label Private WithEvents Label7 As GrapeCity.ActiveReports.SectionReportModel.Label - Private WithEvents TextBox1 As GrapeCity.ActiveReports.SectionReportModel.TextBox + Private WithEvents txtFirma As GrapeCity.ActiveReports.SectionReportModel.TextBox Private WithEvents Label10 As GrapeCity.ActiveReports.SectionReportModel.Label Private WithEvents Label11 As GrapeCity.ActiveReports.SectionReportModel.Label Private WithEvents Shape1 As GrapeCity.ActiveReports.SectionReportModel.Shape diff --git a/SDL/kunden/Berichte/rptFiskalkunde.vb b/SDL/kunden/Berichte/rptFiskalkunde.vb index 40ccfd4d..d158d446 100644 --- a/SDL/kunden/Berichte/rptFiskalkunde.vb +++ b/SDL/kunden/Berichte/rptFiskalkunde.vb @@ -12,8 +12,9 @@ Public Class rptFiskalkunde Dim BR As cBonitaetsauskunft Dim EORI As cEORIPruefung Dim UID As cUIDPruefung + Dim unterlagenliste As List(Of String) - Sub New(KdNr As Integer, FiskalId As Integer, VM As cKundenVollmachten, BR As cBonitaetsauskunft, EORI As cEORIPruefung, UID As cUIDPruefung, Optional Firma As String = "VERAG") + Sub New(KdNr As Integer, FiskalId As Integer, VM As cKundenVollmachten, BR As cBonitaetsauskunft, EORI As cEORIPruefung, UID As cUIDPruefung, unterlagenliste As List(Of String), Optional Firma As String = "VERAG") ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() @@ -25,6 +26,7 @@ Public Class rptFiskalkunde Me.BR = BR Me.EORI = EORI Me.UID = UID + Me.unterlagenliste = unterlagenliste ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. @@ -39,39 +41,45 @@ Public Class rptFiskalkunde lblUeberschrift.Text = "Checkliste für " & FK.FK_Art & "-Fiskal Kunden" txtKdNr.Text = AD.AdressenNr - txtKunde.Text = AD.Name_1 & " " & AD.Name_2 + txtFirma.Text = AD.Name_1 & " " & AD.Name_2 + txtEMail.Text = AD.E_Mail If VM IsNot Nothing Then If VM.kdvm_emailId > 0 Then - txtVM.Text &= " Vollmacht per Mail erhalten " + txtVM.Text = " Vollmacht per Mail erhalten " + txtVMJa.Text = "X" ElseIf VM.kdvm_datenarchivId > 0 Then - txtVM.Text &= " Vollmacht liegt vor " + txtVM.Text = " Vollmacht liegt vor " + txtVMJa.Text = "X" Else - txtVM.Text &= " Vollmacht liegt NICHT vor " + txtVM.Text = " Vollmacht liegt NICHT vor " + txtVMNein.Text = "X" End If - If IsDate(VM.kdvm_erhalten_Datum) Then txtVM.Text &= CDate(VM.kdvm_erhalten_Datum).ToShortDateString - + Else + txtVMNein.Text = "X" End If - If BR IsNot Nothing Then + If BR IsNot Nothing Then txtBon.Text = "Bonitätsklasse" If AD.LandKz = "AT" Or AD.LandKz = "A" Then txtBon.Text = "Bonitätsscore: " txtBon.Text &= If(BR.ba_CreditSaveBonitaetsScore, "") + txtBONja.Text = "X" Else txtBon.Text = "Bonitätsindex: " txtBon.Text &= If(BR.ba_CreditSaveBonitaetsIndex, "") + txtBONja.Text = "X" End If If IsDate(BR.ba_Datum) Then txtBon.Text &= " - " & CDate(BR.ba_Datum).ToShortDateString + Else + txtBONnein.Text = "X" End If - - txtUmsatz.Text = "" @@ -79,9 +87,28 @@ Public Class rptFiskalkunde If IsNumeric(FK.FK_AnzahlMitarbeiter) Then txtAnzMA.Text = CDbl(FK.FK_AnzahlMitarbeiter) If IsDate(FK.FK_Gruendungsdatum) Then txtGJ.Text = CDate(FK.FK_Gruendungsdatum).ToShortDateString txtImport.Text = IIf(FK.FK_Waren <> "", FK.FK_Waren, "") - txtGesellschafter.Text = IIf(FK.FK_Gesellschafter <> "", FK.FK_Gesellschafter, "") - txtWebsite.Text = IIf(FK.FK_Homepage_URL <> "", FK.FK_Homepage_URL, "") + txtSteuerberater.Text = IIf(FK.FK_Steuerberater <> "", FK.FK_Steuerberater, "") + If FK.FK_Website_URL <> "" Then + txtWebsite.Text = FK.FK_Website_URL + txtWSja.Text = "X" + Else + txtWebsite.Text = "" + txtWSnein.Text = "X" + End If + + If unterlagenliste.Contains("HR") Or unterlagenliste.Contains("GW-Anmeldung") Then + txtHRja.Text = "X" + Else + txtHRnein.Text = "X" + End If + + For Each c In unterlagenliste + txtSonstiges.Text &= c.ToString & ", " + Next + + txtGZ.Text = IIf(FK.FK_Geschaeftszweck <> "", FK.FK_Geschaeftszweck, "") + txtGF.Text = IIf(FK.FK_Geschaeftsfuehrer <> "", FK.FK_Geschaeftsfuehrer, "") If IsDate(KD.Eingegeben_am) Then txtKundeSeit.Text = CDate(KD.Eingegeben_am).ToShortDateString If FK.FK_locked Then diff --git a/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb b/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb index 0ebb3de1..5ae346c8 100644 --- a/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb +++ b/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb @@ -39,6 +39,11 @@ Partial Class usrcntlFiskaluebersicht Me.btnPDFReport = New System.Windows.Forms.Button() Me.dgvFiskaluebersicht = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.MyPanel2 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) + Me.picOKSt = New System.Windows.Forms.PictureBox() + Me.Button3 = New System.Windows.Forms.Button() + Me.txtSteuerberater = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label13 = New System.Windows.Forms.Label() + Me.cbxVMOriginal = New System.Windows.Forms.CheckBox() Me.lblBon = New System.Windows.Forms.Label() Me.rtfZwischenh = New System.Windows.Forms.RichTextBox() Me.dgvZwischenh = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) @@ -50,7 +55,7 @@ Partial Class usrcntlFiskaluebersicht Me.Label3 = New System.Windows.Forms.Label() Me.Label2 = New System.Windows.Forms.Label() Me.lblAnmerkungen = New System.Windows.Forms.Label() - Me.txtSteuerberater = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtWebsiteSt = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label12 = New System.Windows.Forms.Label() Me.txtGF = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label11 = New System.Windows.Forms.Label() @@ -60,7 +65,7 @@ Partial Class usrcntlFiskaluebersicht Me.Label9 = New System.Windows.Forms.Label() Me.txtWaren = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label8 = New System.Windows.Forms.Label() - Me.txtGriendungsjahr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtGruendungsjahr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label7 = New System.Windows.Forms.Label() Me.txtGeschaeftszweck = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label5 = New System.Windows.Forms.Label() @@ -88,6 +93,7 @@ Partial Class usrcntlFiskaluebersicht Me.MyPanel1.SuspendLayout() CType(Me.dgvFiskaluebersicht, System.ComponentModel.ISupportInitialize).BeginInit() Me.MyPanel2.SuspendLayout() + CType(Me.picOKSt, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvZwischenh, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvEmpfaenger, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvLieferanten, System.ComponentModel.ISupportInitialize).BeginInit() @@ -278,6 +284,11 @@ Partial Class usrcntlFiskaluebersicht Me.MyPanel2.AutoScrollMinSize = New System.Drawing.Size(0, 10) Me.MyPanel2.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.MyPanel2.BackColor = System.Drawing.Color.White + Me.MyPanel2.Controls.Add(Me.picOKSt) + Me.MyPanel2.Controls.Add(Me.Button3) + Me.MyPanel2.Controls.Add(Me.txtSteuerberater) + Me.MyPanel2.Controls.Add(Me.Label13) + Me.MyPanel2.Controls.Add(Me.cbxVMOriginal) Me.MyPanel2.Controls.Add(Me.lblBon) Me.MyPanel2.Controls.Add(Me.rtfZwischenh) Me.MyPanel2.Controls.Add(Me.dgvZwischenh) @@ -289,7 +300,7 @@ Partial Class usrcntlFiskaluebersicht Me.MyPanel2.Controls.Add(Me.Label3) Me.MyPanel2.Controls.Add(Me.Label2) Me.MyPanel2.Controls.Add(Me.lblAnmerkungen) - Me.MyPanel2.Controls.Add(Me.txtSteuerberater) + Me.MyPanel2.Controls.Add(Me.txtWebsiteSt) Me.MyPanel2.Controls.Add(Me.Label12) Me.MyPanel2.Controls.Add(Me.txtGF) Me.MyPanel2.Controls.Add(Me.Label11) @@ -299,7 +310,7 @@ Partial Class usrcntlFiskaluebersicht Me.MyPanel2.Controls.Add(Me.Label9) Me.MyPanel2.Controls.Add(Me.txtWaren) Me.MyPanel2.Controls.Add(Me.Label8) - Me.MyPanel2.Controls.Add(Me.txtGriendungsjahr) + Me.MyPanel2.Controls.Add(Me.txtGruendungsjahr) Me.MyPanel2.Controls.Add(Me.Label7) Me.MyPanel2.Controls.Add(Me.txtGeschaeftszweck) Me.MyPanel2.Controls.Add(Me.Label5) @@ -328,139 +339,29 @@ Partial Class usrcntlFiskaluebersicht Me.MyPanel2.Size = New System.Drawing.Size(721, 657) Me.MyPanel2.TabIndex = 110 ' - 'lblBon + 'picOKSt ' - Me.lblBon.AutoSize = True - Me.lblBon.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblBon.Location = New System.Drawing.Point(539, 50) - Me.lblBon.Name = "lblBon" - Me.lblBon.Size = New System.Drawing.Size(11, 13) - Me.lblBon.TabIndex = 139 - Me.lblBon.Text = "-" + Me.picOKSt.BackgroundImage = Global.SDL.My.Resources.Resources.ok + Me.picOKSt.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.picOKSt.Location = New System.Drawing.Point(604, 169) + Me.picOKSt.Name = "picOKSt" + Me.picOKSt.Size = New System.Drawing.Size(19, 17) + Me.picOKSt.TabIndex = 181 + Me.picOKSt.TabStop = False + Me.picOKSt.Visible = False ' - 'rtfZwischenh + 'Button3 ' - Me.rtfZwischenh.Enabled = False - Me.rtfZwischenh.Location = New System.Drawing.Point(237, 283) - Me.rtfZwischenh.Name = "rtfZwischenh" - Me.rtfZwischenh.Size = New System.Drawing.Size(225, 78) - Me.rtfZwischenh.TabIndex = 176 - Me.rtfZwischenh.Text = "" - Me.rtfZwischenh.Visible = False - ' - 'dgvZwischenh - ' - Me.dgvZwischenh.AKTUALISIERUNGS_INTERVALL = -1 - Me.dgvZwischenh.AllowUserToAddRows = False - Me.dgvZwischenh.AllowUserToDeleteRows = False - Me.dgvZwischenh.AllowUserToOrderColumns = True - Me.dgvZwischenh.AllowUserToResizeRows = False - Me.dgvZwischenh.BackgroundColor = System.Drawing.Color.White - Me.dgvZwischenh.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvZwischenh.Location = New System.Drawing.Point(237, 260) - Me.dgvZwischenh.MultiSelect = False - Me.dgvZwischenh.Name = "dgvZwischenh" - Me.dgvZwischenh.ReadOnly = True - Me.dgvZwischenh.RowHeadersVisible = False - Me.dgvZwischenh.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvZwischenh.Size = New System.Drawing.Size(225, 92) - Me.dgvZwischenh.TabIndex = 175 - ' - 'Label6 - ' - Me.Label6.AutoSize = True - Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label6.Location = New System.Drawing.Point(233, 237) - Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(167, 16) - Me.Label6.TabIndex = 174 - Me.Label6.Text = "Top 5 Zwischenhändler" - ' - 'rtfEmpfaenger - ' - Me.rtfEmpfaenger.Enabled = False - Me.rtfEmpfaenger.Location = New System.Drawing.Point(477, 283) - Me.rtfEmpfaenger.Name = "rtfEmpfaenger" - Me.rtfEmpfaenger.Size = New System.Drawing.Size(224, 78) - Me.rtfEmpfaenger.TabIndex = 173 - Me.rtfEmpfaenger.Text = "" - Me.rtfEmpfaenger.Visible = False - ' - 'rtfLieferanten - ' - Me.rtfLieferanten.Enabled = False - Me.rtfLieferanten.Location = New System.Drawing.Point(6, 283) - Me.rtfLieferanten.Name = "rtfLieferanten" - Me.rtfLieferanten.Size = New System.Drawing.Size(215, 78) - Me.rtfLieferanten.TabIndex = 172 - Me.rtfLieferanten.Text = "" - Me.rtfLieferanten.Visible = False - ' - 'dgvEmpfaenger - ' - Me.dgvEmpfaenger.AKTUALISIERUNGS_INTERVALL = -1 - Me.dgvEmpfaenger.AllowUserToAddRows = False - Me.dgvEmpfaenger.AllowUserToDeleteRows = False - Me.dgvEmpfaenger.AllowUserToOrderColumns = True - Me.dgvEmpfaenger.AllowUserToResizeRows = False - Me.dgvEmpfaenger.BackgroundColor = System.Drawing.Color.White - Me.dgvEmpfaenger.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvEmpfaenger.Location = New System.Drawing.Point(477, 260) - Me.dgvEmpfaenger.MultiSelect = False - Me.dgvEmpfaenger.Name = "dgvEmpfaenger" - Me.dgvEmpfaenger.ReadOnly = True - Me.dgvEmpfaenger.RowHeadersVisible = False - Me.dgvEmpfaenger.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvEmpfaenger.Size = New System.Drawing.Size(224, 92) - Me.dgvEmpfaenger.TabIndex = 171 - ' - 'dgvLieferanten - ' - Me.dgvLieferanten.AKTUALISIERUNGS_INTERVALL = -1 - Me.dgvLieferanten.AllowUserToAddRows = False - Me.dgvLieferanten.AllowUserToDeleteRows = False - Me.dgvLieferanten.AllowUserToOrderColumns = True - Me.dgvLieferanten.AllowUserToResizeRows = False - Me.dgvLieferanten.BackgroundColor = System.Drawing.Color.White - Me.dgvLieferanten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvLieferanten.Location = New System.Drawing.Point(6, 260) - Me.dgvLieferanten.MultiSelect = False - Me.dgvLieferanten.Name = "dgvLieferanten" - Me.dgvLieferanten.ReadOnly = True - Me.dgvLieferanten.RowHeadersVisible = False - Me.dgvLieferanten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvLieferanten.Size = New System.Drawing.Size(215, 92) - Me.dgvLieferanten.TabIndex = 170 - ' - 'Label3 - ' - Me.Label3.AutoSize = True - Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label3.Location = New System.Drawing.Point(473, 237) - Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(126, 16) - Me.Label3.TabIndex = 168 - Me.Label3.Text = "Top 5 Empfänger" - ' - 'Label2 - ' - Me.Label2.AutoSize = True - Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label2.Location = New System.Drawing.Point(5, 241) - Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(128, 16) - Me.Label2.TabIndex = 167 - Me.Label2.Text = "Top 5 Lieferanten" - ' - 'lblAnmerkungen - ' - Me.lblAnmerkungen.AutoSize = True - Me.lblAnmerkungen.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAnmerkungen.Location = New System.Drawing.Point(4, 544) - Me.lblAnmerkungen.Name = "lblAnmerkungen" - Me.lblAnmerkungen.Size = New System.Drawing.Size(120, 20) - Me.lblAnmerkungen.TabIndex = 166 - Me.lblAnmerkungen.Text = "Anmerkungen" + Me.Button3.BackgroundImage = Global.SDL.My.Resources.Resources.pdf + Me.Button3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button3.ForeColor = System.Drawing.Color.Black + Me.Button3.Location = New System.Drawing.Point(629, 166) + Me.Button3.Name = "Button3" + Me.Button3.Size = New System.Drawing.Size(29, 19) + Me.Button3.TabIndex = 180 + Me.Button3.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button3.UseVisualStyleBackColor = True ' 'txtSteuerberater ' @@ -477,13 +378,191 @@ Partial Class usrcntlFiskaluebersicht Me.txtSteuerberater._Waehrung = False Me.txtSteuerberater._WaehrungZeichen = True Me.txtSteuerberater.ForeColor = System.Drawing.Color.Black - Me.txtSteuerberater.Location = New System.Drawing.Point(419, 165) + Me.txtSteuerberater.Location = New System.Drawing.Point(421, 139) Me.txtSteuerberater.MaxLineLength = -1 Me.txtSteuerberater.MaxLines_Warning = "" Me.txtSteuerberater.MaxLines_Warning_Label = Nothing Me.txtSteuerberater.Name = "txtSteuerberater" - Me.txtSteuerberater.Size = New System.Drawing.Size(239, 20) - Me.txtSteuerberater.TabIndex = 165 + Me.txtSteuerberater.Size = New System.Drawing.Size(237, 20) + Me.txtSteuerberater.TabIndex = 179 + ' + 'Label13 + ' + Me.Label13.AutoSize = True + Me.Label13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label13.Location = New System.Drawing.Point(281, 142) + Me.Label13.Name = "Label13" + Me.Label13.Size = New System.Drawing.Size(84, 13) + Me.Label13.TabIndex = 178 + Me.Label13.Text = "Steuerberater" + ' + 'cbxVMOriginal + ' + Me.cbxVMOriginal.AutoSize = True + Me.cbxVMOriginal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxVMOriginal.Location = New System.Drawing.Point(417, 72) + Me.cbxVMOriginal.Name = "cbxVMOriginal" + Me.cbxVMOriginal.Size = New System.Drawing.Size(215, 17) + Me.cbxVMOriginal.TabIndex = 177 + Me.cbxVMOriginal.Text = "Vollmacht im Original vorhanden?" + Me.cbxVMOriginal.UseVisualStyleBackColor = True + ' + 'lblBon + ' + Me.lblBon.AutoSize = True + Me.lblBon.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblBon.Location = New System.Drawing.Point(538, 28) + Me.lblBon.Name = "lblBon" + Me.lblBon.Size = New System.Drawing.Size(11, 13) + Me.lblBon.TabIndex = 139 + Me.lblBon.Text = "-" + ' + 'rtfZwischenh + ' + Me.rtfZwischenh.Enabled = False + Me.rtfZwischenh.Location = New System.Drawing.Point(237, 293) + Me.rtfZwischenh.Name = "rtfZwischenh" + Me.rtfZwischenh.Size = New System.Drawing.Size(225, 153) + Me.rtfZwischenh.TabIndex = 176 + Me.rtfZwischenh.Text = "" + Me.rtfZwischenh.Visible = False + ' + 'dgvZwischenh + ' + Me.dgvZwischenh.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvZwischenh.AllowUserToAddRows = False + Me.dgvZwischenh.AllowUserToDeleteRows = False + Me.dgvZwischenh.AllowUserToOrderColumns = True + Me.dgvZwischenh.AllowUserToResizeRows = False + Me.dgvZwischenh.BackgroundColor = System.Drawing.Color.White + Me.dgvZwischenh.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvZwischenh.Location = New System.Drawing.Point(237, 270) + Me.dgvZwischenh.MultiSelect = False + Me.dgvZwischenh.Name = "dgvZwischenh" + Me.dgvZwischenh.ReadOnly = True + Me.dgvZwischenh.RowHeadersVisible = False + Me.dgvZwischenh.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvZwischenh.Size = New System.Drawing.Size(225, 176) + Me.dgvZwischenh.TabIndex = 175 + ' + 'Label6 + ' + Me.Label6.AutoSize = True + Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label6.Location = New System.Drawing.Point(233, 247) + Me.Label6.Name = "Label6" + Me.Label6.Size = New System.Drawing.Size(167, 16) + Me.Label6.TabIndex = 174 + Me.Label6.Text = "Top 5 Zwischenhändler" + ' + 'rtfEmpfaenger + ' + Me.rtfEmpfaenger.Enabled = False + Me.rtfEmpfaenger.Location = New System.Drawing.Point(477, 293) + Me.rtfEmpfaenger.Name = "rtfEmpfaenger" + Me.rtfEmpfaenger.Size = New System.Drawing.Size(224, 153) + Me.rtfEmpfaenger.TabIndex = 173 + Me.rtfEmpfaenger.Text = "" + Me.rtfEmpfaenger.Visible = False + ' + 'rtfLieferanten + ' + Me.rtfLieferanten.Enabled = False + Me.rtfLieferanten.Location = New System.Drawing.Point(6, 293) + Me.rtfLieferanten.Name = "rtfLieferanten" + Me.rtfLieferanten.Size = New System.Drawing.Size(215, 153) + Me.rtfLieferanten.TabIndex = 172 + Me.rtfLieferanten.Text = "" + Me.rtfLieferanten.Visible = False + ' + 'dgvEmpfaenger + ' + Me.dgvEmpfaenger.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvEmpfaenger.AllowUserToAddRows = False + Me.dgvEmpfaenger.AllowUserToDeleteRows = False + Me.dgvEmpfaenger.AllowUserToOrderColumns = True + Me.dgvEmpfaenger.AllowUserToResizeRows = False + Me.dgvEmpfaenger.BackgroundColor = System.Drawing.Color.White + Me.dgvEmpfaenger.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvEmpfaenger.Location = New System.Drawing.Point(477, 270) + Me.dgvEmpfaenger.MultiSelect = False + Me.dgvEmpfaenger.Name = "dgvEmpfaenger" + Me.dgvEmpfaenger.ReadOnly = True + Me.dgvEmpfaenger.RowHeadersVisible = False + Me.dgvEmpfaenger.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvEmpfaenger.Size = New System.Drawing.Size(224, 176) + Me.dgvEmpfaenger.TabIndex = 171 + ' + 'dgvLieferanten + ' + Me.dgvLieferanten.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvLieferanten.AllowUserToAddRows = False + Me.dgvLieferanten.AllowUserToDeleteRows = False + Me.dgvLieferanten.AllowUserToOrderColumns = True + Me.dgvLieferanten.AllowUserToResizeRows = False + Me.dgvLieferanten.BackgroundColor = System.Drawing.Color.White + Me.dgvLieferanten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvLieferanten.Location = New System.Drawing.Point(6, 270) + Me.dgvLieferanten.MultiSelect = False + Me.dgvLieferanten.Name = "dgvLieferanten" + Me.dgvLieferanten.ReadOnly = True + Me.dgvLieferanten.RowHeadersVisible = False + Me.dgvLieferanten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvLieferanten.Size = New System.Drawing.Size(215, 176) + Me.dgvLieferanten.TabIndex = 170 + ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label3.Location = New System.Drawing.Point(473, 247) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(126, 16) + Me.Label3.TabIndex = 168 + Me.Label3.Text = "Top 5 Empfänger" + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label2.Location = New System.Drawing.Point(5, 251) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(128, 16) + Me.Label2.TabIndex = 167 + Me.Label2.Text = "Top 5 Lieferanten" + ' + 'lblAnmerkungen + ' + Me.lblAnmerkungen.AutoSize = True + Me.lblAnmerkungen.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblAnmerkungen.Location = New System.Drawing.Point(294, 464) + Me.lblAnmerkungen.Name = "lblAnmerkungen" + Me.lblAnmerkungen.Size = New System.Drawing.Size(120, 20) + Me.lblAnmerkungen.TabIndex = 166 + Me.lblAnmerkungen.Text = "Anmerkungen" + ' + 'txtWebsiteSt + ' + Me.txtWebsiteSt._DateTimeOnly = False + Me.txtWebsiteSt._numbersOnly = False + Me.txtWebsiteSt._numbersOnlyKommastellen = "" + Me.txtWebsiteSt._numbersOnlyTrennzeichen = True + Me.txtWebsiteSt._Prozent = False + Me.txtWebsiteSt._ShortDateNew = False + Me.txtWebsiteSt._ShortDateOnly = False + Me.txtWebsiteSt._TimeOnly = False + Me.txtWebsiteSt._TimeOnly_Seconds = False + Me.txtWebsiteSt._value = Nothing + Me.txtWebsiteSt._Waehrung = False + Me.txtWebsiteSt._WaehrungZeichen = True + Me.txtWebsiteSt.ForeColor = System.Drawing.Color.Black + Me.txtWebsiteSt.Location = New System.Drawing.Point(421, 165) + Me.txtWebsiteSt.MaxLineLength = -1 + Me.txtWebsiteSt.MaxLines_Warning = "" + Me.txtWebsiteSt.MaxLines_Warning_Label = Nothing + Me.txtWebsiteSt.Name = "txtWebsiteSt" + Me.txtWebsiteSt.Size = New System.Drawing.Size(178, 20) + Me.txtWebsiteSt.TabIndex = 165 ' 'Label12 ' @@ -491,9 +570,9 @@ Partial Class usrcntlFiskaluebersicht Me.Label12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label12.Location = New System.Drawing.Point(279, 168) Me.Label12.Name = "Label12" - Me.Label12.Size = New System.Drawing.Size(84, 13) + Me.Label12.Size = New System.Drawing.Size(134, 13) Me.Label12.TabIndex = 164 - Me.Label12.Text = "Steuerberater" + Me.Label12.Text = "Steuerberater Website" ' 'txtGF ' @@ -510,7 +589,7 @@ Partial Class usrcntlFiskaluebersicht Me.txtGF._Waehrung = False Me.txtGF._WaehrungZeichen = True Me.txtGF.ForeColor = System.Drawing.Color.Black - Me.txtGF.Location = New System.Drawing.Point(419, 139) + Me.txtGF.Location = New System.Drawing.Point(421, 113) Me.txtGF.MaxLineLength = -1 Me.txtGF.MaxLines_Warning = "" Me.txtGF.MaxLines_Warning_Label = Nothing @@ -522,7 +601,7 @@ Partial Class usrcntlFiskaluebersicht ' Me.Label11.AutoSize = True Me.Label11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label11.Location = New System.Drawing.Point(279, 142) + Me.Label11.Location = New System.Drawing.Point(281, 116) Me.Label11.Name = "Label11" Me.Label11.Size = New System.Drawing.Size(97, 13) Me.Label11.TabIndex = 162 @@ -532,7 +611,7 @@ Partial Class usrcntlFiskaluebersicht ' Me.Label10.AutoSize = True Me.Label10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label10.Location = New System.Drawing.Point(5, 165) + Me.Label10.Location = New System.Drawing.Point(5, 168) Me.Label10.Name = "Label10" Me.Label10.Size = New System.Drawing.Size(79, 13) Me.Label10.TabIndex = 161 @@ -553,7 +632,7 @@ Partial Class usrcntlFiskaluebersicht Me.txtKredit._Waehrung = True Me.txtKredit._WaehrungZeichen = True Me.txtKredit.ForeColor = System.Drawing.Color.Black - Me.txtKredit.Location = New System.Drawing.Point(144, 162) + Me.txtKredit.Location = New System.Drawing.Point(144, 165) Me.txtKredit.MaxLineLength = -1 Me.txtKredit.MaxLines_Warning = "" Me.txtKredit.MaxLines_Warning_Label = Nothing @@ -576,7 +655,7 @@ Partial Class usrcntlFiskaluebersicht Me.txtAnzMA._Waehrung = False Me.txtAnzMA._WaehrungZeichen = False Me.txtAnzMA.ForeColor = System.Drawing.Color.Black - Me.txtAnzMA.Location = New System.Drawing.Point(144, 136) + Me.txtAnzMA.Location = New System.Drawing.Point(144, 139) Me.txtAnzMA.MaxLineLength = -1 Me.txtAnzMA.MaxLines_Warning = "" Me.txtAnzMA.MaxLines_Warning_Label = Nothing @@ -588,7 +667,7 @@ Partial Class usrcntlFiskaluebersicht ' Me.Label9.AutoSize = True Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label9.Location = New System.Drawing.Point(5, 139) + Me.Label9.Location = New System.Drawing.Point(5, 142) Me.Label9.Name = "Label9" Me.Label9.Size = New System.Drawing.Size(109, 13) Me.Label9.TabIndex = 158 @@ -609,7 +688,7 @@ Partial Class usrcntlFiskaluebersicht Me.txtWaren._Waehrung = False Me.txtWaren._WaehrungZeichen = True Me.txtWaren.ForeColor = System.Drawing.Color.Black - Me.txtWaren.Location = New System.Drawing.Point(144, 188) + Me.txtWaren.Location = New System.Drawing.Point(143, 214) Me.txtWaren.MaxLineLength = -1 Me.txtWaren.MaxLines_Warning = "" Me.txtWaren.MaxLines_Warning_Label = Nothing @@ -621,41 +700,41 @@ Partial Class usrcntlFiskaluebersicht ' Me.Label8.AutoSize = True Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label8.Location = New System.Drawing.Point(8, 191) + Me.Label8.Location = New System.Drawing.Point(4, 217) Me.Label8.Name = "Label8" Me.Label8.Size = New System.Drawing.Size(44, 13) Me.Label8.TabIndex = 156 Me.Label8.Text = "Waren" ' - 'txtGriendungsjahr + 'txtGruendungsjahr ' - Me.txtGriendungsjahr._DateTimeOnly = False - Me.txtGriendungsjahr._numbersOnly = False - Me.txtGriendungsjahr._numbersOnlyKommastellen = "" - Me.txtGriendungsjahr._numbersOnlyTrennzeichen = True - Me.txtGriendungsjahr._Prozent = False - Me.txtGriendungsjahr._ShortDateNew = False - Me.txtGriendungsjahr._ShortDateOnly = True - Me.txtGriendungsjahr._TimeOnly = False - Me.txtGriendungsjahr._TimeOnly_Seconds = False - Me.txtGriendungsjahr._value = "" - Me.txtGriendungsjahr._Waehrung = False - Me.txtGriendungsjahr._WaehrungZeichen = False - Me.txtGriendungsjahr.ForeColor = System.Drawing.Color.Black - Me.txtGriendungsjahr.Location = New System.Drawing.Point(144, 110) - Me.txtGriendungsjahr.MaxLength = 10 - Me.txtGriendungsjahr.MaxLineLength = -1 - Me.txtGriendungsjahr.MaxLines_Warning = "" - Me.txtGriendungsjahr.MaxLines_Warning_Label = Nothing - Me.txtGriendungsjahr.Name = "txtGriendungsjahr" - Me.txtGriendungsjahr.Size = New System.Drawing.Size(97, 20) - Me.txtGriendungsjahr.TabIndex = 155 + Me.txtGruendungsjahr._DateTimeOnly = False + Me.txtGruendungsjahr._numbersOnly = False + Me.txtGruendungsjahr._numbersOnlyKommastellen = "" + Me.txtGruendungsjahr._numbersOnlyTrennzeichen = True + Me.txtGruendungsjahr._Prozent = False + Me.txtGruendungsjahr._ShortDateNew = False + Me.txtGruendungsjahr._ShortDateOnly = False + Me.txtGruendungsjahr._TimeOnly = False + Me.txtGruendungsjahr._TimeOnly_Seconds = False + Me.txtGruendungsjahr._value = "" + Me.txtGruendungsjahr._Waehrung = False + Me.txtGruendungsjahr._WaehrungZeichen = False + Me.txtGruendungsjahr.ForeColor = System.Drawing.Color.Black + Me.txtGruendungsjahr.Location = New System.Drawing.Point(144, 113) + Me.txtGruendungsjahr.MaxLength = 10 + Me.txtGruendungsjahr.MaxLineLength = -1 + Me.txtGruendungsjahr.MaxLines_Warning = "" + Me.txtGruendungsjahr.MaxLines_Warning_Label = Nothing + Me.txtGruendungsjahr.Name = "txtGruendungsjahr" + Me.txtGruendungsjahr.Size = New System.Drawing.Size(97, 20) + Me.txtGruendungsjahr.TabIndex = 155 ' 'Label7 ' Me.Label7.AutoSize = True Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label7.Location = New System.Drawing.Point(5, 113) + Me.Label7.Location = New System.Drawing.Point(5, 116) Me.Label7.Name = "Label7" Me.Label7.Size = New System.Drawing.Size(89, 13) Me.Label7.TabIndex = 154 @@ -676,19 +755,19 @@ Partial Class usrcntlFiskaluebersicht Me.txtGeschaeftszweck._Waehrung = False Me.txtGeschaeftszweck._WaehrungZeichen = True Me.txtGeschaeftszweck.ForeColor = System.Drawing.Color.Black - Me.txtGeschaeftszweck.Location = New System.Drawing.Point(419, 110) + Me.txtGeschaeftszweck.Location = New System.Drawing.Point(143, 191) Me.txtGeschaeftszweck.MaxLineLength = -1 Me.txtGeschaeftszweck.MaxLines_Warning = "" Me.txtGeschaeftszweck.MaxLines_Warning_Label = Nothing Me.txtGeschaeftszweck.Name = "txtGeschaeftszweck" - Me.txtGeschaeftszweck.Size = New System.Drawing.Size(239, 20) + Me.txtGeschaeftszweck.Size = New System.Drawing.Size(512, 20) Me.txtGeschaeftszweck.TabIndex = 153 ' 'Label5 ' Me.Label5.AutoSize = True Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label5.Location = New System.Drawing.Point(279, 113) + Me.Label5.Location = New System.Drawing.Point(3, 194) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(100, 13) Me.Label5.TabIndex = 152 @@ -700,9 +779,9 @@ Partial Class usrcntlFiskaluebersicht Me.btnAddAttachments.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.btnAddAttachments.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnAddAttachments.ForeColor = System.Drawing.Color.Black - Me.btnAddAttachments.Location = New System.Drawing.Point(627, 512) + Me.btnAddAttachments.Location = New System.Drawing.Point(171, 600) Me.btnAddAttachments.Name = "btnAddAttachments" - Me.btnAddAttachments.Size = New System.Drawing.Size(29, 19) + Me.btnAddAttachments.Size = New System.Drawing.Size(42, 19) Me.btnAddAttachments.TabIndex = 142 Me.btnAddAttachments.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.btnAddAttachments.UseVisualStyleBackColor = True @@ -713,9 +792,9 @@ Partial Class usrcntlFiskaluebersicht Me.cbxAttachmentArt._allowFreiText = False Me.cbxAttachmentArt._value = "" Me.cbxAttachmentArt.FormattingEnabled = True - Me.cbxAttachmentArt.Location = New System.Drawing.Point(477, 510) + Me.cbxAttachmentArt.Location = New System.Drawing.Point(13, 598) Me.cbxAttachmentArt.Name = "cbxAttachmentArt" - Me.cbxAttachmentArt.Size = New System.Drawing.Size(132, 21) + Me.cbxAttachmentArt.Size = New System.Drawing.Size(145, 21) Me.cbxAttachmentArt.TabIndex = 131 ' 'Label4 @@ -729,9 +808,9 @@ Partial Class usrcntlFiskaluebersicht ' 'rtbAnmerkung ' - Me.rtbAnmerkung.Location = New System.Drawing.Point(144, 544) + Me.rtbAnmerkung.Location = New System.Drawing.Point(298, 487) Me.rtbAnmerkung.Name = "rtbAnmerkung" - Me.rtbAnmerkung.Size = New System.Drawing.Size(497, 99) + Me.rtbAnmerkung.Size = New System.Drawing.Size(403, 99) Me.rtbAnmerkung.TabIndex = 130 Me.rtbAnmerkung.Text = "" ' @@ -787,7 +866,7 @@ Partial Class usrcntlFiskaluebersicht Me.cbxVollmacht.AutoSize = True Me.cbxVollmacht.Enabled = False Me.cbxVollmacht.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxVollmacht.Location = New System.Drawing.Point(418, 71) + Me.cbxVollmacht.Location = New System.Drawing.Point(417, 49) Me.cbxVollmacht.Name = "cbxVollmacht" Me.cbxVollmacht.Size = New System.Drawing.Size(130, 17) Me.cbxVollmacht.TabIndex = 103 @@ -798,7 +877,7 @@ Partial Class usrcntlFiskaluebersicht ' Me.lblUnterlagen.AutoSize = True Me.lblUnterlagen.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblUnterlagen.Location = New System.Drawing.Point(4, 393) + Me.lblUnterlagen.Location = New System.Drawing.Point(4, 464) Me.lblUnterlagen.Name = "lblUnterlagen" Me.lblUnterlagen.Size = New System.Drawing.Size(98, 20) Me.lblUnterlagen.TabIndex = 113 @@ -819,7 +898,7 @@ Partial Class usrcntlFiskaluebersicht Me.txtVM._Waehrung = False Me.txtVM._WaehrungZeichen = False Me.txtVM.ForeColor = System.Drawing.Color.Black - Me.txtVM.Location = New System.Drawing.Point(588, 69) + Me.txtVM.Location = New System.Drawing.Point(587, 47) Me.txtVM.MaxLength = 10 Me.txtVM.MaxLineLength = -1 Me.txtVM.MaxLines_Warning = "" @@ -834,7 +913,7 @@ Partial Class usrcntlFiskaluebersicht Me.cbxBonitaet.AutoSize = True Me.cbxBonitaet.Enabled = False Me.cbxBonitaet.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxBonitaet.Location = New System.Drawing.Point(418, 48) + Me.cbxBonitaet.Location = New System.Drawing.Point(417, 26) Me.cbxBonitaet.Name = "cbxBonitaet" Me.cbxBonitaet.Size = New System.Drawing.Size(115, 17) Me.cbxBonitaet.TabIndex = 101 @@ -856,7 +935,7 @@ Partial Class usrcntlFiskaluebersicht Me.txtBon._Waehrung = False Me.txtBon._WaehrungZeichen = False Me.txtBon.ForeColor = System.Drawing.Color.Black - Me.txtBon.Location = New System.Drawing.Point(588, 45) + Me.txtBon.Location = New System.Drawing.Point(587, 23) Me.txtBon.MaxLength = 10 Me.txtBon.MaxLineLength = -1 Me.txtBon.MaxLines_Warning = "" @@ -885,9 +964,9 @@ Partial Class usrcntlFiskaluebersicht Me.cbxHomepage.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.cbxHomepage.Location = New System.Drawing.Point(8, 23) Me.cbxHomepage.Name = "cbxHomepage" - Me.cbxHomepage.Size = New System.Drawing.Size(86, 17) + Me.cbxHomepage.Size = New System.Drawing.Size(72, 17) Me.cbxHomepage.TabIndex = 98 - Me.cbxHomepage.Text = "Homepage" + Me.cbxHomepage.Text = "Website" Me.cbxHomepage.UseVisualStyleBackColor = True ' 'txtEORI @@ -905,13 +984,13 @@ Partial Class usrcntlFiskaluebersicht Me.txtEORI._Waehrung = False Me.txtEORI._WaehrungZeichen = True Me.txtEORI.ForeColor = System.Drawing.Color.Black - Me.txtEORI.Location = New System.Drawing.Point(144, 47) + Me.txtEORI.Location = New System.Drawing.Point(155, 47) Me.txtEORI.MaxLineLength = -1 Me.txtEORI.MaxLines_Warning = "" Me.txtEORI.MaxLines_Warning_Label = Nothing Me.txtEORI.Name = "txtEORI" Me.txtEORI.ReadOnly = True - Me.txtEORI.Size = New System.Drawing.Size(97, 20) + Me.txtEORI.Size = New System.Drawing.Size(86, 20) Me.txtEORI.TabIndex = 108 ' 'txtHomepage @@ -929,12 +1008,12 @@ Partial Class usrcntlFiskaluebersicht Me.txtHomepage._Waehrung = False Me.txtHomepage._WaehrungZeichen = True Me.txtHomepage.ForeColor = System.Drawing.Color.Black - Me.txtHomepage.Location = New System.Drawing.Point(144, 20) + Me.txtHomepage.Location = New System.Drawing.Point(155, 20) Me.txtHomepage.MaxLineLength = -1 Me.txtHomepage.MaxLines_Warning = "" Me.txtHomepage.MaxLines_Warning_Label = Nothing Me.txtHomepage.Name = "txtHomepage" - Me.txtHomepage.Size = New System.Drawing.Size(132, 20) + Me.txtHomepage.Size = New System.Drawing.Size(121, 20) Me.txtHomepage.TabIndex = 100 ' 'dgvUnterlagen @@ -946,13 +1025,13 @@ Partial Class usrcntlFiskaluebersicht Me.dgvUnterlagen.AllowUserToResizeRows = False Me.dgvUnterlagen.BackgroundColor = System.Drawing.Color.White Me.dgvUnterlagen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvUnterlagen.Location = New System.Drawing.Point(144, 399) + Me.dgvUnterlagen.Location = New System.Drawing.Point(13, 487) Me.dgvUnterlagen.MultiSelect = False Me.dgvUnterlagen.Name = "dgvUnterlagen" Me.dgvUnterlagen.ReadOnly = True Me.dgvUnterlagen.RowHeadersVisible = False Me.dgvUnterlagen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvUnterlagen.Size = New System.Drawing.Size(512, 107) + Me.dgvUnterlagen.Size = New System.Drawing.Size(248, 107) Me.dgvUnterlagen.TabIndex = 115 ' 'cbxUID @@ -960,7 +1039,7 @@ Partial Class usrcntlFiskaluebersicht Me.cbxUID.AutoSize = True Me.cbxUID.Enabled = False Me.cbxUID.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxUID.Location = New System.Drawing.Point(418, 24) + Me.cbxUID.Location = New System.Drawing.Point(8, 73) Me.cbxUID.Name = "cbxUID" Me.cbxUID.Size = New System.Drawing.Size(141, 17) Me.cbxUID.TabIndex = 105 @@ -982,13 +1061,13 @@ Partial Class usrcntlFiskaluebersicht Me.txtUID._Waehrung = False Me.txtUID._WaehrungZeichen = True Me.txtUID.ForeColor = System.Drawing.Color.Black - Me.txtUID.Location = New System.Drawing.Point(588, 21) + Me.txtUID.Location = New System.Drawing.Point(155, 71) Me.txtUID.MaxLineLength = -1 Me.txtUID.MaxLines_Warning = "" Me.txtUID.MaxLines_Warning_Label = Nothing Me.txtUID.Name = "txtUID" Me.txtUID.ReadOnly = True - Me.txtUID.Size = New System.Drawing.Size(70, 20) + Me.txtUID.Size = New System.Drawing.Size(86, 20) Me.txtUID.TabIndex = 106 ' 'usrcntlFiskaluebersicht @@ -1015,6 +1094,7 @@ Partial Class usrcntlFiskaluebersicht CType(Me.dgvFiskaluebersicht, System.ComponentModel.ISupportInitialize).EndInit() Me.MyPanel2.ResumeLayout(False) Me.MyPanel2.PerformLayout() + CType(Me.picOKSt, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.dgvZwischenh, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.dgvEmpfaenger, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.dgvLieferanten, System.ComponentModel.ISupportInitialize).EndInit() @@ -1067,11 +1147,11 @@ Partial Class usrcntlFiskaluebersicht Friend WithEvents Label9 As Label Friend WithEvents txtWaren As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label8 As Label - Friend WithEvents txtGriendungsjahr As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtGruendungsjahr As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label7 As Label Friend WithEvents txtGeschaeftszweck As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label5 As Label - Friend WithEvents txtSteuerberater As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtWebsiteSt As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label12 As Label Friend WithEvents txtGF As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label11 As Label @@ -1088,4 +1168,9 @@ Partial Class usrcntlFiskaluebersicht Friend WithEvents Label2 As Label Friend WithEvents lblAnmerkungen As Label Friend WithEvents lblBon As Label + Friend WithEvents txtSteuerberater As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label13 As Label + Friend WithEvents cbxVMOriginal As CheckBox + Friend WithEvents picOKSt As PictureBox + Friend WithEvents Button3 As Button End Class diff --git a/SDL/kunden/usrcntlFiskaluebersicht.vb b/SDL/kunden/usrcntlFiskaluebersicht.vb index 8e6c1be0..6ddca27a 100644 --- a/SDL/kunden/usrcntlFiskaluebersicht.vb +++ b/SDL/kunden/usrcntlFiskaluebersicht.vb @@ -1,9 +1,9 @@  +Imports System.Globalization Imports System.Net Imports System.Text.RegularExpressions +Imports Spire.Pdf.Graphics Imports VERAG_PROG_ALLGEMEIN -Imports VERAG_PROG_ALLGEMEIN.TESTJSON - Public Class usrcntlFiskaluebersicht @@ -43,7 +43,10 @@ Public Class usrcntlFiskaluebersicht Label2.Text = "Top 5 Lieferanten (" & year & ")" With dgvLieferanten .Columns.Clear() - .DataSource() = SQL.loadDgvBySql("SELECT Top(5) [AbsenderKundenNr] as KdNr, CASE WHEN [AbsenderKundenNr] IS NULL THEN '-' ELSE MAX(Absender) END as Firma, COUNT(*) as Anzahl FROM [Speditionsbuch] WHERE year(Abfertigungsdatum) = '" & year & "' AND " & kdNr & " In([AbsenderKundenNr], [EmpfängerKundenNr], [FrachtführerKundenNr], [VermittlerKundenNr], [EndempfängerKundenNr]) GROUP BY AbsenderKundenNr ORDER BY Anzahl DESC ", "FMZOLL") + .DataSource() = SQL.loadDgvBySql("SELECT Top(5) [AbsenderKundenNr] as KdNr, MAX(Absender) as Firma, COUNT(*) as Anzahl FROM [Speditionsbuch] WHERE year(Abfertigungsdatum) = '" & year & "' AND " & kdNr & " In([AbsenderKundenNr], [EmpfängerKundenNr], [FrachtführerKundenNr], [VermittlerKundenNr], [EndempfängerKundenNr]) GROUP BY AbsenderKundenNr ORDER BY Anzahl DESC ", "FMZOLL") + .Columns("KdNr").Width = 50 + .Columns("Firma").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns("Anzahl").Width = 40 End With @@ -56,7 +59,9 @@ Public Class usrcntlFiskaluebersicht With dgvEmpfaenger .Columns.Clear() .DataSource() = SQL.loadDgvBySql("SELECT Top(5) [EmpfängerKundenNr] as KdNr, CASE WHEN [EmpfängerKundenNr] IS NULL THEN '-' ELSE MAX(Empfänger) END as Firma, COUNT(*) as Anzahl FROM [Speditionsbuch] WHERE year(Abfertigungsdatum) = '" & year & "' AND " & kdNr & " IN([AbsenderKundenNr],[EmpfängerKundenNr],[FrachtführerKundenNr],[VermittlerKundenNr],[EndempfängerKundenNr]) GROUP BY EmpfängerKundenNr ORDER BY Anzahl DESC ", "FMZOLL") - + .Columns("KdNr").Width = 50 + .Columns("Firma").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns("Anzahl").Width = 40 End With End Sub @@ -67,7 +72,9 @@ Public Class usrcntlFiskaluebersicht With dgvZwischenh .Columns.Clear() .DataSource() = SQL.loadDgvBySql("SELECT [VermittlerKundenNr] as KdNr, CASE WHEN [VermittlerKundenNr] IS NULL THEN '-' ELSE MAX(Vermittler) END as Firma, COUNT(*) as Anzahl FROM [Speditionsbuch] WHERE year(Abfertigungsdatum) = '" & year & "' AND " & kdNr & " IN([AbsenderKundenNr],[EmpfängerKundenNr],[FrachtführerKundenNr],[VermittlerKundenNr],[EndempfängerKundenNr]) GROUP BY VermittlerKundenNr ORDER BY Anzahl DESC ", "FMZOLL") - '.Columns("KdNr").Width = 50 + .Columns("KdNr").Width = 50 + .Columns("Firma").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns("Anzahl").Width = 40 End With @@ -85,6 +92,7 @@ Public Class usrcntlFiskaluebersicht .Columns("fka_Name").HeaderText = "Name" .Columns("fka_Datum").HeaderText = "Datum" .Columns("fka_Art").HeaderText = "Doku-Art" + .Columns("fka_Name").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .ClearSelection() AddHandler .CellDoubleClick, Sub() @@ -118,6 +126,7 @@ Public Class usrcntlFiskaluebersicht cbxAttachmentArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Handelsregister", "HR")) cbxAttachmentArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Sonstiges", "Sonstiges")) cbxAttachmentArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Website", "Website")) + cbxAttachmentArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Website-Steuerberater", "Website-Steuerberater")) kdNr = _kdnr @@ -207,19 +216,28 @@ Public Class usrcntlFiskaluebersicht Private Sub btnPDFReport_Click(sender As Object, e As EventArgs) Handles btnPDFReport.Click Try + Dim listeUnterlagen As New List(Of String) + If dgvUnterlagen.Rows.Count > 0 Then - Dim rptFiskalkunden As New SDL.rptFiskalkunde(kdNr, fk.FK_Id, VM, BA, EORI, UID) - Dim rpt As New frmPrintLayout - rpt.Text = "" - rpt.Viewer.LoadDocument(rptFiskalkunden) + For Each row As DataGridViewRow In dgvUnterlagen.Rows + listeUnterlagen.Add(row.Cells("fka_Art").Value.ToString) + Next + End If - rpt.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous - rpt.Show() + Dim tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("Fiskalanalyse", ".pdf", , False) + Dim rptFiskalkunden As New SDL.rptFiskalkunde(kdNr, fk.FK_Id, VM, BA, EORI, UID, listeUnterlagen) + + Dim p As New GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport + rptFiskalkunden.Run(False) + p.NeverEmbedFonts = "" + p.Export(rptFiskalkunden.Document, tmpPath) Dim files As New List(Of String) - Dim outputFile As String = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("Merge.pdf", ".pdf", True,, "Merge") ' "result.pdf" + Dim outputFile As String = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("Merge.pdf", ".pdf", True,, "Merge") + + files.Add(tmpPath) If VM IsNot Nothing Then @@ -227,8 +245,11 @@ Public Class usrcntlFiskaluebersicht If VM.kdvm_emailId > 0 Then Dim MailFile = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(VM.kdvm_emailId) + 'Muss von Mail zu PDF konvertiert und dann der Liste angehängt werden! - 'files.Add(MailFile) + 'Dim Mailpath As String = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("mail.msg", ".msg", True,,) + 'files.Add(DATENVERVER_OPTIONS.getPDFViaSpirePDF_FromFile(MailFile, Mailpath)) + End If End If @@ -248,7 +269,7 @@ Public Class usrcntlFiskaluebersicht Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try - + Me.Cursor = Cursors.Default End Sub @@ -261,6 +282,7 @@ Public Class usrcntlFiskaluebersicht fk.FK_Abschlussdatum = Now() fk.FK_MaId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID fk.SAVE() + initDGVFiskaluebersicht() btnOK.Enabled = False btnSave.Enabled = False End If @@ -316,14 +338,13 @@ Public Class usrcntlFiskaluebersicht VM = New cKundenVollmachten(fk.FK_Vollmacht) txtVM.Text = VM.kdvm_erhalten_Datum.ToShortDateString End If - If checkNullStr(fk.FK_EORI) <> "" Then + If checkNullStr(fk.FK_EORI) <> "" Then EORI = New cEORIPruefung(fk.FK_EORI) txtEORI.Text = EORI.eori_datum.ToShortDateString End If If checkNullStr(fk.FK_UID) <> "" Then - UID = New cUIDPruefung(fk.FK_UID) txtVM.Text = UID.uid_Datum.ToShortDateString End If @@ -335,66 +356,39 @@ Public Class usrcntlFiskaluebersicht End If - - - 'txtVM.Text = checkNullStr(fk.FK_Vollmacht) - 'txtEORI.Text = checkNullStr(fk.FK_EORI) - 'txtUID.Text = checkNullStr(fk.FK_UID) - 'txtBon.Text = checkNullStr(fk.FK_Bonitaet) - cbxFiskalart._value = checkNullStr(fk.FK_Art) - txtHomepage.Text = checkNullStr(fk.FK_Homepage_URL) + txtHomepage.Text = checkNullStr(fk.FK_Website_URL) rtbAnmerkung.Text = checkNullStr(fk.FK_Anmerkung) rtfLieferanten.Text = checkNullStr(fk.FK_Lieferanten) rtfEmpfaenger.Text = checkNullStr(fk.FK_Empfaenger) rtfZwischenh.Text = checkNullStr(fk.FK_Zwischenhaendler) - txtGriendungsjahr.Text = checkNullStr(fk.FK_Gruendungsdatum) + txtGruendungsjahr.Text = checkNullStr(fk.FK_Gruendungsdatum) txtGeschaeftszweck.Text = checkNullStr(fk.FK_Geschaeftszweck) txtKredit.Text = checkNullStr(fk.FK_KreditMax) txtWaren.Text = checkNullStr(fk.FK_Waren) txtAnzMA.Text = checkNullStr(fk.FK_AnzahlMitarbeiter) txtGF.Text = checkNullStr(fk.FK_Geschaeftsfuehrer) - txtSteuerberater.Text = checkNullStr(fk.FK_Gesellschafter) - - If txtGriendungsjahr.Text = "" Then - txtGriendungsjahr.Text = BA.ba_GruendundsDatum - End If - - If txtKredit.Text = "" Then - txtKredit.Text = BA.ba_Hoechstkredit - End If - - - If txtGF.Text = "" Then - txtGF.Text = BA.ba_GFName - End If - - If txtGeschaeftszweck.Text = "" Then - txtGeschaeftszweck.Text = BA.ba_Geschaeftszweck - End If - - If txtAnzMA.Text = "" Then - txtAnzMA.Text = BA.ba_Mitarbeiter - End If - - If txtSteuerberater.Text = "" Then - txtSteuerberater.Text = BA.ba_GFName - End If - - If txtWaren.Text = "" Then - txtWaren.Text = SQL.getValueTxtBySql("SELECT Top(1) [Bemerkungen] as Bemerkungen FROM [Speditionsbuch] WHERE " & kdNr & " In([AbsenderKundenNr], [EmpfängerKundenNr], [FrachtführerKundenNr], [VermittlerKundenNr], [EndempfängerKundenNr]) AND ISNULL(CAST([Bemerkungen] as NVARCHAR(max)),'') <> '' Order by Abfertigungsdatum desc", "FMZOLL") - End If - - - + txtWebsiteSt.Text = checkNullStr(fk.FK_WebsiteSt_URL) + cbxVMOriginal.Checked = checkNullStr(fk.FK_VollmachtOriginal) + txtSteuerberater.Text = checkNullStr(fk.FK_Steuerberater) If txtBon.Text = "" Then Dim baid = SQL.getValueTxtBySql("SELECT TOP(1) ba_id FROM [tblBonitaetsauskunft] where ba_KundenNr=" & kdNr & " ORDER BY ba_Datum DESC", "FMZOLL") - BA = New cBonitaetsauskunft(baid) + If baid <> "" Then BA = New cBonitaetsauskunft(baid) If BA IsNot Nothing Then txtBon.Text = BA.ba_Datum.ToShortDateString + If txtGruendungsjahr.Text = "" Then txtGruendungsjahr.Text = BA.ba_GruendundsDatum + + If txtKredit.Text = "" Then txtKredit.Text = BA.ba_Hoechstkredit + + If txtGF.Text = "" Then txtGF.Text = BA.ba_GFName + + If txtGeschaeftszweck.Text = "" Then txtGeschaeftszweck.Text = BA.ba_Geschaeftszweck + + If txtAnzMA.Text = "" Then txtAnzMA.Text = BA.ba_Mitarbeiter + If ADRESSE.LandKz = "AT" Or ADRESSE.LandKz = "A" Then lblBon.Text = If(BA.ba_CreditSaveBonitaetsScore, "") Else @@ -403,15 +397,20 @@ Public Class usrcntlFiskaluebersicht End If End If - - + If txtWaren.Text = "" Then + txtWaren.Text = SQL.getValueTxtBySql("SELECT Top(1) [Bemerkungen] as Bemerkungen FROM [Speditionsbuch] WHERE " & kdNr & " In([AbsenderKundenNr], [EmpfängerKundenNr], [FrachtführerKundenNr], [VermittlerKundenNr], [EndempfängerKundenNr]) AND ISNULL(CAST([Bemerkungen] as NVARCHAR(max)),'') <> '' Order by Abfertigungsdatum desc", "FMZOLL") + End If If txtUID.Text = "" Then Dim UIDId = SQL.getValueTxtBySql("Select TOP(1) [uid_id] FROM [tblUIDPruefung] where uid_KundenNr='" & kdNr & "' AND UID_valid = 1 AND uid_stufe = 2 ORDER BY uid_Datum desc", "FMZOLL") - UID = New cUIDPruefung(UIDId) - If UID IsNot Nothing And IsDate(UID.uid_Datum) Then - txtUID.Text = CDate(UID.uid_Datum).ToShortDateString + + If UIDId <> "" Then + + UID = New cUIDPruefung(UIDId) + If UID IsNot Nothing And IsDate(UID.uid_Datum) Then + txtUID.Text = CDate(UID.uid_Datum).ToShortDateString + End If End If End If @@ -465,9 +464,12 @@ Public Class usrcntlFiskaluebersicht picOK.Visible = False End If + + If txtWebsiteSt.Text = "" Then picOKSt.Visible = False + If checkNullStr(KUNDE.EORITIN) <> "" Then - Dim EORI = cEORIPruefung.LOADByKdNrDate(kdNr) + EORI = cEORIPruefung.LOADByKdNrDate(kdNr) If EORI IsNot Nothing Then txtEORI.Text = CDate(EORI.eori_datum).ToShortDateString lblWarning.Text = "" @@ -514,14 +516,12 @@ Public Class usrcntlFiskaluebersicht If EORI IsNot Nothing Then fk.FK_EORI = EORI.eori_id - If BA IsNot Nothing Then fk.FK_Bonitaet = BA.ba_id + If UID IsNot Nothing Then fk.FK_UID = UID.uid_id - fk.FK_Homepage_URL = txtHomepage.Text - 'fk.FK_Vollmacht = txtVM.Text - 'fk.FK_Vollmacht = IIf(VM IsNot Nothing, VM.kdvm_Id, "") - 'fk.FK_UID = IIf(UID IsNot Nothing, UID.uid_id, "") - 'fk.FK_EORI = IIf(EORI IsNot Nothing, EORI.eori_id, "") + fk.FK_Website_URL = txtHomepage.Text + fk.FK_WebsiteSt_URL = txtWebsiteSt.Text fk.FK_Anmerkung = rtbAnmerkung.Text + fk.FK_VollmachtOriginal = cbxVMOriginal.Checked If txtKredit.Text <> "" Then fk.FK_KreditMax = Double.Parse(txtKredit.Text) @@ -530,11 +530,10 @@ Public Class usrcntlFiskaluebersicht fk.FK_Geschaeftsfuehrer = txtGF.Text fk.FK_Geschaeftszweck = txtGeschaeftszweck.Text fk.FK_AnzahlMitarbeiter = txtAnzMA.Text - fk.FK_Gesellschafter = txtSteuerberater.Text - fk.FK_Gruendungsdatum = txtGriendungsjahr.Text + fk.FK_Steuerberater = txtSteuerberater.Text + fk.FK_Gruendungsdatum = txtGruendungsjahr.Text fk.FK_Waren = txtWaren.Text - If checkNullStr(fk.FK_Empfaenger) = "" Then Dim txtEmpfaenger As String For Each row As DataGridViewRow In dgvEmpfaenger.Rows @@ -646,20 +645,27 @@ Public Class usrcntlFiskaluebersicht End Sub Private Sub txtHomepage_TextChanged(sender As Object, e As EventArgs) Handles txtHomepage.TextChanged + Dim valid If txtHomepage.Text <> "" Then If fk Is Nothing Then - cbxHomepage.Checked = picOK.Visible = IsValidURL(txtHomepage.Text) + valid = IsValidURL(txtHomepage.Text) + cbxHomepage.Checked = valid + picOK.Visible = valid Else - If fk.FK_Homepage_URL <> txtHomepage.Text Then - cbxHomepage.Checked = picOK.Visible = IsValidURL(txtHomepage.Text) + If fk.FK_Website_URL <> txtHomepage.Text Then + valid = IsValidURL(txtHomepage.Text) + cbxHomepage.Checked = valid + picOK.Visible = valid End If End If Else - cbxHomepage.Checked = picOK.Visible = False + cbxHomepage.Checked = False + picOK.Visible = False End If + End Sub @@ -719,7 +725,7 @@ Public Class usrcntlFiskaluebersicht For Each c As Control In MyPanel2.Controls - If Not c.GetType.FullName = "System.Windows.Forms.CheckBox" Then c.Enabled = Not locked + If (Not c.GetType.FullName = "System.Windows.Forms.CheckBox" Or c.Name = "cbxVMOriginal") Then c.Enabled = Not locked Next @@ -753,7 +759,13 @@ Public Class usrcntlFiskaluebersicht Public Sub clearTXT() Dim a As New List(Of Windows.Forms.Control) For Each c As Control In MyPanel2.Controls - If (c.GetType.FullName = "System.Windows.Forms.TextBox" Or c.GetType.FullName = "VERAG_PROG_ALLGEMEIN.MyTextBox") Then c.Text = "" + If (c.GetType.FullName = "System.Windows.Forms.TextBox" Or c.GetType.FullName = "VERAG_PROG_ALLGEMEIN.MyTextBox" Or c.GetType.FullName = "System.Windows.Forms.RichTextBox") Then c.Text = "" + If c.GetType.FullName = "VERAG_PROG_ALLGEMEIN.MyDatagridview" Then + Dim dgv As MyDatagridview = c + dgv = DirectCast(dgv, MyDatagridview) + dgv.Columns.Clear() + + End If Next End Sub @@ -764,7 +776,7 @@ Public Class usrcntlFiskaluebersicht txtHomepage.ForeColor = Color.Black - If fk.FK_Homepage_URL = txtHomepage.Text Then + If fk.FK_Website_URL = txtHomepage.Text Then Dim anh_list = New cFiskalkundenAnhaenge().LOAD_LIST_ByKdNr(fk.FK_Kdnr, fk.FK_Id, "Website") If anh_list.Count > 0 Then DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER(anh_list.ElementAt(0).fka_docId) @@ -816,7 +828,7 @@ Public Class usrcntlFiskaluebersicht ' fk.FK_Homepage_PDF = DS.da_id 'End If - fk.FK_Homepage_URL = url + fk.FK_Website_URL = url fk.SAVE() If Not cbxHomepage.Checked Then cbxHomepage.Checked = True @@ -831,18 +843,6 @@ Public Class usrcntlFiskaluebersicht Dim isValid = Rgx.IsMatch(URL) - If Not isValid Then - lblWarning.Text = "URL hat falsches Format" - txtHomepage.ForeColor = Color.Red - picOK.Visible = False - - Else - lblWarning.Text = "" - txtHomepage.ForeColor = Color.Black - picOK.Visible = True - End If - - Return isValid End Function @@ -868,21 +868,6 @@ Public Class usrcntlFiskaluebersicht End If End Sub - Private Sub Button3_Click(sender As Object, e As EventArgs) - If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Speditionsbuch", "AVISO") Then - - For Each ft As Form In Application.OpenForms - If ft.GetType.ToString = "SDL.frmSpeditionsbuchSuche" Then - ft.BringToFront() - Exit Sub - End If - Next - Me.Cursor = Cursors.WaitCursor - Dim sped As New SDL.frmSpeditionsbuchSuche - sped.Show() - Me.Cursor = Cursors.Default - End If - End Sub Private Sub btnAddAttachments_Click(sender As Object, e As EventArgs) Handles btnAddAttachments.Click @@ -916,7 +901,13 @@ Public Class usrcntlFiskaluebersicht If locked Then Dim mit = New VERAG_PROG_ALLGEMEIN.cMitarbeiter(fk.FK_MaId) - lblAbschluss.Text = mit.Fullname & " " & fk.FK_Abschlussdatum + lblAbschluss.Text = mit.Fullname + + If IsDate(fk.FK_Abschlussdatum) Then + 'Dim abschlussZP As DateTime + 'abschlussZP = DateTime.ParseExact(fk.FK_Abschlussdatum, "dd/MM/yyyy HH:mm:ss", CultureInfo.InvariantCulture) + lblAbschluss.Text &= " " & fk.FK_Abschlussdatum + End If Else lblAbschluss.Text = "" @@ -930,6 +921,8 @@ Public Class usrcntlFiskaluebersicht AddHandler CType(c, MyTextBox).TextChanged, AddressOf somethingChanged ElseIf TypeOf (c) Is TextBox Then AddHandler CType(c, TextBox).TextChanged, AddressOf somethingChanged + ElseIf TypeOf (c) Is RichTextBox Then + AddHandler CType(c, RichTextBox).TextChanged, AddressOf somethingChanged End If Next End Sub @@ -947,4 +940,83 @@ Public Class usrcntlFiskaluebersicht Next End Sub + Private Sub txtSteuerberaterWS_TextChanged(sender As Object, e As EventArgs) Handles txtWebsiteSt.TextChanged + If txtWebsiteSt.Text <> "" Then + If fk Is Nothing Then + picOKSt.Visible = IsValidURL(txtWebsiteSt.Text) + Else + If fk.FK_WebsiteSt_URL <> txtWebsiteSt.Text Then + picOKSt.Visible = IsValidURL(txtWebsiteSt.Text) + End If + + End If + + Else + picOKSt.Visible = False + + End If + End Sub + + Private Sub Button3_Click_1(sender As Object, e As EventArgs) Handles Button3.Click + + Dim url As String = "" + lblWarning.Text = "" + txtWebsiteSt.ForeColor = Color.Black + + + If fk.FK_WebsiteSt_URL = txtWebsiteSt.Text Then + Dim anh_list = New cFiskalkundenAnhaenge().LOAD_LIST_ByKdNr(fk.FK_Kdnr, fk.FK_Id, "Website-Steuerberater") + If anh_list.Count > 0 Then + DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER(anh_list.ElementAt(0).fka_docId) + DS.OPEN_SINGLE() + Exit Sub + End If + + End If + + If txtWebsiteSt.Text = "" Then + picOKSt.Visible = False + Exit Sub + End If + + If Not IsValidURL(txtWebsiteSt.Text) Then Exit Sub + + Dim req As System.Net.WebRequest + Dim res As System.Net.WebResponse + + Try + url = txtWebsiteSt.Text + req = System.Net.WebRequest.Create(url) + + res = req.GetResponse() + Catch ex As WebException + lblWarning.Text = ex.Message + txtWebsiteSt.ForeColor = Color.Red + picOKSt.Visible = False + Exit Sub + End Try + + + Dim pdf = VERAG_PROG_ALLGEMEIN.cFormularManager.getPDFViaSpirePDF_FromURL(url) 'UU langsam.... + + DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "FISKALKUNDENANHAENGE", fk.FK_Datum, "", "", "Website-Steuerberater", kdNr) + Dim fi As New System.IO.FileInfo(pdf) + Dim path = DS.uploadDataToDATENSERVER(pdf, fi.Name, fi.Extension) + + Dim ANH = New VERAG_PROG_ALLGEMEIN.cFiskalkundenAnhaenge() + ANH.fka_Art = "Website-Steuerberater" + ANH.fka_docId = DS.da_id + ANH.fka_Datum = Now() + ANH.fka_KdNr = kdNr + ANH.fka_fkId = fk.FK_Id + ANH.fka_Name = "Website-Steuerberater" + ANH.SAVE() + + + fk.FK_WebsiteSt_URL = url + fk.SAVE() + + initDGVUnterlagen() + + End Sub End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cFiskalkunden.vb b/VERAG_PROG_ALLGEMEIN/Classes/cFiskalkunden.vb index 719aa708..5f4e5f9b 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cFiskalkunden.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cFiskalkunden.vb @@ -8,16 +8,15 @@ Public Class cFiskalkunden Property FK_Datum As Object = Nothing Property FK_Art As Object = Nothing Property FK_locked As Object = Nothing - Property FK_Homepage As Object = Nothing Property FK_Bonitaet As Object = Nothing Property FK_Vollmacht As Object = Nothing Property FK_UID As Object = Nothing Property FK_EORI As Object = Nothing - Property FK_Homepage_URL As Object = Nothing - Property FK_Homepage_PDF As Object = Nothing - Property FK_DatenarchivId As Object = Nothing + Property FK_Website_URL As Object = Nothing + Property FK_WebsiteSt_URL As Object = Nothing + Property FK_VollmachtOriginal As Boolean Property FK_MaId As Object = Nothing - Property FK_Abschlussdatum As Object = Nothing + Property FK_Abschlussdatum As DateTime Property FK_Anmerkung As Object = Nothing Property FK_Lieferanten As Object = Nothing Property FK_Empfaenger As Object = Nothing @@ -28,9 +27,7 @@ Public Class cFiskalkunden Property FK_Geschaeftszweck As Object = Nothing Property FK_KreditMax As Object = Nothing Property FK_Geschaeftsfuehrer As Object = Nothing - Property FK_Gesellschafter As Object = Nothing - - + Property FK_Steuerberater As Object = Nothing Public hasEntry = False @@ -52,14 +49,13 @@ Public Class cFiskalkunden list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Datum", FK_Datum)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Art", FK_Art)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_locked", FK_locked)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Homepage", FK_Homepage)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Bonitaet", FK_Bonitaet)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Vollmacht", FK_Vollmacht)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_UID", FK_UID)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_EORI", FK_EORI)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Homepage_URL", FK_Homepage_URL)) - ' list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Homepage_PDF", FK_Homepage_PDF)) - ' list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_DatenarchivId", FK_DatenarchivId)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Website_URL", FK_Website_URL)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_WebsiteSt_URL", FK_WebsiteSt_URL)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_VollmachtOriginal", FK_VollmachtOriginal)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Anmerkung", FK_Anmerkung)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Abschlussdatum", FK_Abschlussdatum)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_MaId", FK_MaId)) @@ -72,7 +68,7 @@ Public Class cFiskalkunden list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Geschaeftszweck", FK_Geschaeftszweck)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_KreditMax", FK_KreditMax)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Geschaeftsfuehrer", FK_Geschaeftsfuehrer)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Gesellschafter", FK_Gesellschafter)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Steuerberater", FK_Steuerberater)) Return list End Function diff --git a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb index 49171b86..8fc63417 100644 --- a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb +++ b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb @@ -1300,7 +1300,6 @@ Public Class cFormularManager End Function - Public Shared Sub PrintViaGS(PDFFile As String, printerName As String) Try Dim assembly = System.Reflection.Assembly.GetExecutingAssembly() @@ -1938,6 +1937,31 @@ Public Class DATENVERVER_OPTIONS End Function + Public Shared Function getPDFViaSpirePDF_FromFile(File As String, Optional targetPath As String = "") As String + Try + If targetPath = "" Then targetPath = TMP_PATH + + VERAG_PROG_ALLGEMEIN.cProgramFunctions.spireLoadLicense() + Dim doc As New Spire.Pdf.PdfDocument '= New Spire.Pdf.PdfDocument(URL) + doc.LoadFromHTML(File, False, False, False) + 'doc.LoadFromFile(File) + If doc IsNot Nothing Then + doc.PageSettings.Size = Spire.Pdf.PdfPageSize.A4 + doc.PrintDocument.DefaultPageSettings.Landscape = True + doc.PageScaling = Spire.Pdf.PdfPrintPageScaling.FitSize + ' doc.PrinterName = printerName + ' doc.PrintDocument.Print() + doc.SaveToFile(targetPath) + End If + + Return targetPath + Catch ex As Exception + MsgBox(ex.Message & ex.StackTrace) + End Try + Return "" + End Function + + End Class Public Class barcodeToPdf