diff --git a/SDL/kunden/Berichte/rptFiskalkunde.Designer.vb b/SDL/kunden/Berichte/rptFiskalkunde.Designer.vb index 347c4a79..1c511bfe 100644 --- a/SDL/kunden/Berichte/rptFiskalkunde.Designer.vb +++ b/SDL/kunden/Berichte/rptFiskalkunde.Designer.vb @@ -117,6 +117,14 @@ Partial Public Class rptFiskalkunde Me.Line3 = New GrapeCity.ActiveReports.SectionReportModel.Line() Me.ReportInfo2 = New GrapeCity.ActiveReports.SectionReportModel.ReportInfo() Me.lblDat = New GrapeCity.ActiveReports.SectionReportModel.Label() + Me.Shape39 = New GrapeCity.ActiveReports.SectionReportModel.Shape() + Me.Shape40 = New GrapeCity.ActiveReports.SectionReportModel.Shape() + Me.Shape41 = New GrapeCity.ActiveReports.SectionReportModel.Shape() + Me.txtUVM = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.txtUVMNein = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.txtUVMJa = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.Shape42 = New GrapeCity.ActiveReports.SectionReportModel.Shape() + Me.Label22 = New GrapeCity.ActiveReports.SectionReportModel.Label() CType(Me.picVERAG, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label5, System.ComponentModel.ISupportInitialize).BeginInit() @@ -174,6 +182,10 @@ Partial Public Class rptFiskalkunde CType(Me.Label28, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ReportInfo2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblDat, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtUVM, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtUVMNein, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtUVMJa, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.Label22, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me, System.ComponentModel.ISupportInitialize).BeginInit() ' 'PageHeader @@ -206,7 +218,7 @@ Partial Public Class rptFiskalkunde ' 'Detail ' - 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.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.Shape39, Me.Shape40, Me.Shape41, Me.txtUVM, Me.txtUVMNein, Me.txtUVMJa, Me.Shape42, Me.Label22}) Me.Detail.Height = 6.456694! Me.Detail.Name = "Detail" ' @@ -373,7 +385,7 @@ Partial Public Class rptFiskalkunde 'Shape2 ' Me.Shape2.Height = 0.25! - Me.Shape2.Left = 3.212! + Me.Shape2.Left = 3.202! Me.Shape2.Name = "Shape2" Me.Shape2.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) Me.Shape2.Top = 0.851! @@ -382,10 +394,10 @@ Partial Public Class rptFiskalkunde 'Shape3 ' Me.Shape3.Height = 0.25! - Me.Shape3.Left = 3.602! + Me.Shape3.Left = 3.592! Me.Shape3.Name = "Shape3" Me.Shape3.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape3.Top = 0.8510001! + Me.Shape3.Top = 0.851! Me.Shape3.Width = 3.878! ' 'Shape4 @@ -395,7 +407,7 @@ Partial Public Class rptFiskalkunde 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.802! + Me.Shape4.Width = 2.792! ' 'Shape5 ' @@ -409,7 +421,7 @@ Partial Public Class rptFiskalkunde 'Shape6 ' Me.Shape6.Height = 0.25! - Me.Shape6.Left = 3.212! + Me.Shape6.Left = 3.202! Me.Shape6.Name = "Shape6" Me.Shape6.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) Me.Shape6.Top = 1.101! @@ -418,7 +430,7 @@ Partial Public Class rptFiskalkunde 'Shape7 ' Me.Shape7.Height = 0.25! - Me.Shape7.Left = 3.602! + Me.Shape7.Left = 3.592! Me.Shape7.Name = "Shape7" Me.Shape7.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) Me.Shape7.Top = 1.101! @@ -431,7 +443,7 @@ Partial Public Class rptFiskalkunde Me.Shape8.Name = "Shape8" Me.Shape8.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) Me.Shape8.Top = 1.351! - Me.Shape8.Width = 2.802! + Me.Shape8.Width = 2.792! ' 'Shape9 ' @@ -445,7 +457,7 @@ Partial Public Class rptFiskalkunde 'Shape10 ' Me.Shape10.Height = 0.25! - Me.Shape10.Left = 3.212! + Me.Shape10.Left = 3.202! Me.Shape10.Name = "Shape10" Me.Shape10.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) Me.Shape10.Top = 1.351! @@ -454,7 +466,7 @@ Partial Public Class rptFiskalkunde 'Shape11 ' Me.Shape11.Height = 0.25! - Me.Shape11.Left = 3.602! + Me.Shape11.Left = 3.592! Me.Shape11.Name = "Shape11" Me.Shape11.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) Me.Shape11.Top = 1.351! @@ -467,7 +479,7 @@ Partial Public Class rptFiskalkunde Me.Shape12.Name = "Shape12" Me.Shape12.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) Me.Shape12.Top = 1.101! - Me.Shape12.Width = 2.802! + Me.Shape12.Width = 2.792! ' 'Shape13 ' @@ -481,7 +493,7 @@ Partial Public Class rptFiskalkunde 'Shape14 ' Me.Shape14.Height = 0.25! - Me.Shape14.Left = 3.212! + Me.Shape14.Left = 3.202! Me.Shape14.Name = "Shape14" Me.Shape14.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) Me.Shape14.Top = 1.601! @@ -490,7 +502,7 @@ Partial Public Class rptFiskalkunde 'Shape15 ' Me.Shape15.Height = 0.25! - Me.Shape15.Left = 3.602! + Me.Shape15.Left = 3.592! Me.Shape15.Name = "Shape15" Me.Shape15.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) Me.Shape15.Top = 1.601! @@ -508,7 +520,7 @@ Partial Public Class rptFiskalkunde 'Shape18 ' Me.Shape18.Height = 0.25! - Me.Shape18.Left = 3.212! + Me.Shape18.Left = 3.202! Me.Shape18.Name = "Shape18" Me.Shape18.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) Me.Shape18.Top = 1.851! @@ -517,7 +529,7 @@ Partial Public Class rptFiskalkunde 'Shape19 ' Me.Shape19.Height = 0.25! - Me.Shape19.Left = 3.602! + Me.Shape19.Left = 3.592! Me.Shape19.Name = "Shape19" Me.Shape19.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) Me.Shape19.Top = 1.851! @@ -629,6 +641,7 @@ Partial Public Class rptFiskalkunde Me.txtHRja.Name = "txtHRja" Me.txtHRja.Style = "color: Black; text-align: center" Me.txtHRja.SummaryGroup = "" + Me.txtHRja.Text = Nothing Me.txtHRja.Top = 1.165! Me.txtHRja.Width = 0.3! ' @@ -641,6 +654,7 @@ Partial Public Class rptFiskalkunde Me.txtHRnein.Name = "txtHRnein" Me.txtHRnein.Style = "color: Black; text-align: center" Me.txtHRnein.SummaryGroup = "" + Me.txtHRnein.Text = Nothing Me.txtHRnein.Top = 1.172! Me.txtHRnein.Width = 0.3! ' @@ -653,6 +667,7 @@ Partial Public Class rptFiskalkunde Me.txtWSja.Name = "txtWSja" Me.txtWSja.Style = "color: Black; text-align: center" Me.txtWSja.SummaryGroup = "" + Me.txtWSja.Text = Nothing Me.txtWSja.Top = 0.8930001! Me.txtWSja.Width = 0.3! ' @@ -665,6 +680,7 @@ Partial Public Class rptFiskalkunde Me.txtWSnein.Name = "txtWSnein" Me.txtWSnein.Style = "color: Black; text-align: center" Me.txtWSnein.SummaryGroup = "" + Me.txtWSnein.Text = Nothing Me.txtWSnein.Top = 0.8930001! Me.txtWSnein.Width = 0.3! ' @@ -677,6 +693,7 @@ Partial Public Class rptFiskalkunde Me.txtBONnein.Name = "txtBONnein" Me.txtBONnein.Style = "color: Black; text-align: center" Me.txtBONnein.SummaryGroup = "" + Me.txtBONnein.Text = Nothing Me.txtBONnein.Top = 1.417! Me.txtBONnein.Width = 0.3! ' @@ -689,6 +706,7 @@ Partial Public Class rptFiskalkunde Me.txtBONja.Name = "txtBONja" Me.txtBONja.Style = "color: Black; text-align: center" Me.txtBONja.SummaryGroup = "" + Me.txtBONja.Text = Nothing Me.txtBONja.Top = 1.417! Me.txtBONja.Width = 0.3! ' @@ -701,6 +719,7 @@ Partial Public Class rptFiskalkunde Me.txtUmsatzJa.Name = "txtUmsatzJa" Me.txtUmsatzJa.Style = "color: Black; text-align: center" Me.txtUmsatzJa.SummaryGroup = "" + Me.txtUmsatzJa.Text = Nothing Me.txtUmsatzJa.Top = 1.643! Me.txtUmsatzJa.Width = 0.3! ' @@ -713,6 +732,7 @@ Partial Public Class rptFiskalkunde Me.txtUmsatzNein.Name = "txtUmsatzNein" Me.txtUmsatzNein.Style = "color: Black; text-align: center" Me.txtUmsatzNein.SummaryGroup = "" + Me.txtUmsatzNein.Text = Nothing Me.txtUmsatzNein.Top = 1.643! Me.txtUmsatzNein.Width = 0.3! ' @@ -725,6 +745,7 @@ Partial Public Class rptFiskalkunde Me.txtVMNein.Name = "txtVMNein" Me.txtVMNein.Style = "color: Black; text-align: center" Me.txtVMNein.SummaryGroup = "" + Me.txtVMNein.Text = Nothing Me.txtVMNein.Top = 1.91! Me.txtVMNein.Width = 0.3! ' @@ -737,6 +758,7 @@ Partial Public Class rptFiskalkunde Me.txtVMJa.Name = "txtVMJa" Me.txtVMJa.Style = "color: Black; text-align: center" Me.txtVMJa.SummaryGroup = "" + Me.txtVMJa.Text = Nothing Me.txtVMJa.Top = 1.91! Me.txtVMJa.Width = 0.3! ' @@ -747,7 +769,7 @@ Partial Public Class rptFiskalkunde Me.Shape16.Name = "Shape16" Me.Shape16.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) Me.Shape16.Top = 1.601! - Me.Shape16.Width = 2.802! + Me.Shape16.Width = 2.792! ' 'Shape20 ' @@ -756,7 +778,7 @@ Partial Public Class rptFiskalkunde Me.Shape20.Name = "Shape20" Me.Shape20.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) Me.Shape20.Top = 1.851! - Me.Shape20.Width = 2.802! + Me.Shape20.Width = 2.792! ' 'Label8 ' @@ -797,270 +819,270 @@ Partial Public Class rptFiskalkunde 'Shape21 ' Me.Shape21.Height = 0.25! - Me.Shape21.Left = 0.01! + Me.Shape21.Left = 0.00000001024455! Me.Shape21.Name = "Shape21" Me.Shape21.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape21.Top = 2.101! + Me.Shape21.Top = 2.351! Me.Shape21.Width = 2.802! ' 'Shape22 ' Me.Shape22.Height = 0.25! - Me.Shape22.Left = 0.01! + Me.Shape22.Left = 0.00000001024455! Me.Shape22.Name = "Shape22" Me.Shape22.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape22.Top = 2.351! + Me.Shape22.Top = 2.601! Me.Shape22.Width = 2.802! ' 'Shape23 ' Me.Shape23.Height = 0.25! - Me.Shape23.Left = 0.01! + Me.Shape23.Left = 0.00000001024455! Me.Shape23.Name = "Shape23" Me.Shape23.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape23.Top = 2.601! + Me.Shape23.Top = 2.851! Me.Shape23.Width = 2.802! ' 'Shape24 ' Me.Shape24.Height = 0.25! - Me.Shape24.Left = 0.01! + Me.Shape24.Left = 0.00000001024455! Me.Shape24.Name = "Shape24" Me.Shape24.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape24.Top = 2.851! + Me.Shape24.Top = 3.101! Me.Shape24.Width = 2.802! ' 'Shape25 ' Me.Shape25.Height = 0.25! - Me.Shape25.Left = 0.01! + Me.Shape25.Left = 0.00000001024455! Me.Shape25.Name = "Shape25" Me.Shape25.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape25.Top = 3.101! + Me.Shape25.Top = 3.351! Me.Shape25.Width = 2.802! ' 'Shape26 ' Me.Shape26.Height = 0.25! - Me.Shape26.Left = 0.01! + Me.Shape26.Left = 0.00000001024455! Me.Shape26.Name = "Shape26" Me.Shape26.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape26.Top = 3.351! + Me.Shape26.Top = 3.601! Me.Shape26.Width = 2.802! ' 'Shape27 ' Me.Shape27.Height = 0.25! - Me.Shape27.Left = 0.00999999! + Me.Shape27.Left = 9.313226E-10! Me.Shape27.Name = "Shape27" Me.Shape27.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape27.Top = 3.601! + Me.Shape27.Top = 3.851! Me.Shape27.Width = 2.802! ' 'Shape28 ' Me.Shape28.Height = 0.25! - Me.Shape28.Left = 0.01! + Me.Shape28.Left = 0.00000001024455! Me.Shape28.Name = "Shape28" Me.Shape28.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape28.Top = 3.851! + Me.Shape28.Top = 4.101! Me.Shape28.Width = 2.802! ' 'Shape29 ' Me.Shape29.Height = 0.25! - Me.Shape29.Left = 0.00999999! + Me.Shape29.Left = 9.313226E-10! Me.Shape29.Name = "Shape29" Me.Shape29.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape29.Top = 4.101! + Me.Shape29.Top = 4.351! Me.Shape29.Width = 2.802! ' 'Shape30 ' Me.Shape30.Height = 0.25! - Me.Shape30.Left = 2.812! + Me.Shape30.Left = 2.802! Me.Shape30.Name = "Shape30" Me.Shape30.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape30.Top = 2.101! + Me.Shape30.Top = 2.351! Me.Shape30.Width = 4.668! ' 'Shape31 ' Me.Shape31.Height = 0.25! - Me.Shape31.Left = 2.812! + Me.Shape31.Left = 2.802! Me.Shape31.Name = "Shape31" Me.Shape31.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape31.Top = 2.351! + Me.Shape31.Top = 2.601! Me.Shape31.Width = 4.668! ' 'Shape32 ' Me.Shape32.Height = 0.25! - Me.Shape32.Left = 2.812! + Me.Shape32.Left = 2.802! Me.Shape32.Name = "Shape32" Me.Shape32.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape32.Top = 2.851! + Me.Shape32.Top = 3.101! Me.Shape32.Width = 4.668! ' 'Shape33 ' Me.Shape33.Height = 0.25! - Me.Shape33.Left = 2.812! + Me.Shape33.Left = 2.802! Me.Shape33.Name = "Shape33" Me.Shape33.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape33.Top = 3.101! + Me.Shape33.Top = 3.351! Me.Shape33.Width = 4.668! ' 'Shape34 ' Me.Shape34.Height = 0.25! - Me.Shape34.Left = 2.812! + Me.Shape34.Left = 2.802! Me.Shape34.Name = "Shape34" Me.Shape34.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape34.Top = 2.601! + Me.Shape34.Top = 2.851! Me.Shape34.Width = 4.668! ' 'Shape35 ' Me.Shape35.Height = 0.25! - Me.Shape35.Left = 2.812! + Me.Shape35.Left = 2.802! Me.Shape35.Name = "Shape35" Me.Shape35.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape35.Top = 3.351! + Me.Shape35.Top = 3.601! Me.Shape35.Width = 4.668! ' 'Shape36 ' Me.Shape36.Height = 0.25! - Me.Shape36.Left = 2.812! + Me.Shape36.Left = 2.802! Me.Shape36.Name = "Shape36" Me.Shape36.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape36.Top = 3.851! + Me.Shape36.Top = 4.101! Me.Shape36.Width = 4.668! ' 'Shape37 ' Me.Shape37.Height = 0.25! - Me.Shape37.Left = 2.812! + Me.Shape37.Left = 2.802! Me.Shape37.Name = "Shape37" Me.Shape37.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape37.Top = 4.101! + Me.Shape37.Top = 4.351! Me.Shape37.Width = 4.668! ' 'Shape38 ' Me.Shape38.Height = 0.25! - Me.Shape38.Left = 2.812! + Me.Shape38.Left = 2.802! Me.Shape38.Name = "Shape38" Me.Shape38.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) - Me.Shape38.Top = 3.601! + Me.Shape38.Top = 3.851! Me.Shape38.Width = 4.668! ' 'Label13 ' Me.Label13.Height = 0.1574803! Me.Label13.HyperLink = Nothing - Me.Label13.Left = 0.05! + Me.Label13.Left = 0.04000001! Me.Label13.Name = "Label13" Me.Label13.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: left; ddo-char-set: " & "1" Me.Label13.Text = "Geschäftszweck" - Me.Label13.Top = 2.16! + Me.Label13.Top = 2.41! Me.Label13.Width = 2.73! ' 'Label14 ' Me.Label14.Height = 0.1574803! Me.Label14.HyperLink = Nothing - Me.Label14.Left = 0.05! + Me.Label14.Left = 0.04000001! Me.Label14.Name = "Label14" Me.Label14.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: left; ddo-char-set: " & "1" Me.Label14.Text = "Gründungsjahr:" - Me.Label14.Top = 2.402! + Me.Label14.Top = 2.652! Me.Label14.Width = 2.718! ' 'Label15 ' Me.Label15.Height = 0.157! Me.Label15.HyperLink = Nothing - Me.Label15.Left = 0.05! + Me.Label15.Left = 0.04000001! Me.Label15.Name = "Label15" Me.Label15.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: left; ddo-char-set: " & "1" Me.Label15.Text = "Anzahl Mitarbeiter:" - Me.Label15.Top = 2.643! + Me.Label15.Top = 2.893! Me.Label15.Width = 2.718! ' 'Label16 ' Me.Label16.Height = 0.157! Me.Label16.HyperLink = Nothing - Me.Label16.Left = 0.05! + Me.Label16.Left = 0.04000001! Me.Label16.Name = "Label16" Me.Label16.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: left; ddo-char-set: " & "1" Me.Label16.Text = "Höchstkredit:" - Me.Label16.Top = 2.883! + Me.Label16.Top = 3.133! Me.Label16.Width = 2.718! ' 'Label17 ' Me.Label17.Height = 0.157! Me.Label17.HyperLink = Nothing - Me.Label17.Left = 0.05! + Me.Label17.Left = 0.04000001! Me.Label17.Name = "Label17" Me.Label17.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: left; ddo-char-set: " & "1" Me.Label17.Text = "Import von welchen Waren" - Me.Label17.Top = 3.167! + Me.Label17.Top = 3.417! Me.Label17.Width = 2.718! ' 'Label18 ' Me.Label18.Height = 0.157! Me.Label18.HyperLink = Nothing - Me.Label18.Left = 0.05! + Me.Label18.Left = 0.04000001! Me.Label18.Name = "Label18" Me.Label18.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: left; ddo-char-set: " & "1" Me.Label18.Text = "Gesellschafter:" - Me.Label18.Top = 3.41! + Me.Label18.Top = 3.66! Me.Label18.Width = 2.718! ' 'Label19 ' Me.Label19.Height = 0.157! Me.Label19.HyperLink = Nothing - Me.Label19.Left = 0.05! + Me.Label19.Left = 0.04000001! Me.Label19.Name = "Label19" Me.Label19.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: left; ddo-char-set: " & "1" Me.Label19.Text = "Geschäftsführer:" - Me.Label19.Top = 3.66! + Me.Label19.Top = 3.91! Me.Label19.Width = 2.698! ' 'Label20 ' Me.Label20.Height = 0.157! Me.Label20.HyperLink = Nothing - Me.Label20.Left = 0.05! + Me.Label20.Left = 0.04000001! Me.Label20.Name = "Label20" Me.Label20.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: left; ddo-char-set: " & "1" Me.Label20.Text = "Steuerberater:" - Me.Label20.Top = 3.882! + Me.Label20.Top = 4.132! Me.Label20.Width = 2.698! ' 'Label21 ' Me.Label21.Height = 0.157! Me.Label21.HyperLink = Nothing - Me.Label21.Left = 0.05! + Me.Label21.Left = 0.04000001! Me.Label21.Name = "Label21" Me.Label21.Style = "font-size: 8.25pt; font-weight: bold" Me.Label21.Text = "Sonstiges" - Me.Label21.Top = 4.17! + Me.Label21.Top = 4.42! Me.Label21.Width = 2.718! ' 'txtGZ @@ -1068,12 +1090,12 @@ Partial Public Class rptFiskalkunde Me.txtGZ.DataField = "" Me.txtGZ.DistinctField = "" Me.txtGZ.Height = 0.1574803! - Me.txtGZ.Left = 2.891! + Me.txtGZ.Left = 2.881! Me.txtGZ.Name = "txtGZ" Me.txtGZ.Style = "color: Black" Me.txtGZ.SummaryGroup = "" Me.txtGZ.Text = "-" - Me.txtGZ.Top = 2.16! + Me.txtGZ.Top = 2.41! Me.txtGZ.Width = 4.508! ' 'txtGJ @@ -1081,12 +1103,12 @@ Partial Public Class rptFiskalkunde Me.txtGJ.DataField = "" Me.txtGJ.DistinctField = "" Me.txtGJ.Height = 0.1574803! - Me.txtGJ.Left = 2.891! + Me.txtGJ.Left = 2.881! Me.txtGJ.Name = "txtGJ" Me.txtGJ.Style = "color: Black" Me.txtGJ.SummaryGroup = "" Me.txtGJ.Text = "-" - Me.txtGJ.Top = 2.402! + Me.txtGJ.Top = 2.652! Me.txtGJ.Width = 4.508! ' 'txtAnzMA @@ -1094,12 +1116,12 @@ Partial Public Class rptFiskalkunde Me.txtAnzMA.DataField = "" Me.txtAnzMA.DistinctField = "" Me.txtAnzMA.Height = 0.1574803! - Me.txtAnzMA.Left = 2.891! + Me.txtAnzMA.Left = 2.881! Me.txtAnzMA.Name = "txtAnzMA" Me.txtAnzMA.Style = "color: Black" Me.txtAnzMA.SummaryGroup = "" Me.txtAnzMA.Text = "-" - Me.txtAnzMA.Top = 2.643! + Me.txtAnzMA.Top = 2.893! Me.txtAnzMA.Width = 4.508! ' 'txtKredit @@ -1107,12 +1129,12 @@ Partial Public Class rptFiskalkunde Me.txtKredit.DataField = "" Me.txtKredit.DistinctField = "" Me.txtKredit.Height = 0.1574803! - Me.txtKredit.Left = 2.891! + Me.txtKredit.Left = 2.881! Me.txtKredit.Name = "txtKredit" Me.txtKredit.Style = "color: Black" Me.txtKredit.SummaryGroup = "" Me.txtKredit.Text = "-" - Me.txtKredit.Top = 2.883! + Me.txtKredit.Top = 3.133! Me.txtKredit.Width = 4.508! ' 'txtImport @@ -1120,12 +1142,12 @@ Partial Public Class rptFiskalkunde Me.txtImport.DataField = "" Me.txtImport.DistinctField = "" Me.txtImport.Height = 0.1574803! - Me.txtImport.Left = 2.891! + Me.txtImport.Left = 2.881! Me.txtImport.Name = "txtImport" Me.txtImport.Style = "color: Black" Me.txtImport.SummaryGroup = "" Me.txtImport.Text = "-" - Me.txtImport.Top = 3.167! + Me.txtImport.Top = 3.417! Me.txtImport.Width = 4.508! ' 'txtGesellschafter @@ -1133,12 +1155,12 @@ Partial Public Class rptFiskalkunde Me.txtGesellschafter.DataField = "" Me.txtGesellschafter.DistinctField = "" Me.txtGesellschafter.Height = 0.1574803! - Me.txtGesellschafter.Left = 2.891! + Me.txtGesellschafter.Left = 2.881! Me.txtGesellschafter.Name = "txtGesellschafter" Me.txtGesellschafter.Style = "color: Black" Me.txtGesellschafter.SummaryGroup = "" Me.txtGesellschafter.Text = "-" - Me.txtGesellschafter.Top = 3.408! + Me.txtGesellschafter.Top = 3.658! Me.txtGesellschafter.Width = 4.508! ' 'txtGF @@ -1146,12 +1168,12 @@ Partial Public Class rptFiskalkunde Me.txtGF.DataField = "" Me.txtGF.DistinctField = "" Me.txtGF.Height = 0.1574803! - Me.txtGF.Left = 2.891! + Me.txtGF.Left = 2.881! Me.txtGF.Name = "txtGF" Me.txtGF.Style = "color: Black" Me.txtGF.SummaryGroup = "" Me.txtGF.Text = "-" - Me.txtGF.Top = 3.66! + Me.txtGF.Top = 3.91! Me.txtGF.Width = 4.508! ' 'txtSteuerberater @@ -1159,12 +1181,12 @@ Partial Public Class rptFiskalkunde Me.txtSteuerberater.DataField = "" Me.txtSteuerberater.DistinctField = "" Me.txtSteuerberater.Height = 0.1574803! - Me.txtSteuerberater.Left = 2.891! + Me.txtSteuerberater.Left = 2.881! Me.txtSteuerberater.Name = "txtSteuerberater" Me.txtSteuerberater.Style = "color: Black" Me.txtSteuerberater.SummaryGroup = "" Me.txtSteuerberater.Text = "-" - Me.txtSteuerberater.Top = 3.902! + Me.txtSteuerberater.Top = 4.152! Me.txtSteuerberater.Width = 4.508! ' 'txtSonstiges @@ -1172,12 +1194,11 @@ Partial Public Class rptFiskalkunde Me.txtSonstiges.DataField = "" Me.txtSonstiges.DistinctField = "" Me.txtSonstiges.Height = 0.1574803! - Me.txtSonstiges.Left = 2.891! + Me.txtSonstiges.Left = 2.881! Me.txtSonstiges.Name = "txtSonstiges" Me.txtSonstiges.Style = "color: Black" Me.txtSonstiges.SummaryGroup = "" - Me.txtSonstiges.Text = "-" - Me.txtSonstiges.Top = 4.143! + Me.txtSonstiges.Top = 4.393! Me.txtSonstiges.Width = 4.508! ' 'lblKontrolle @@ -1188,8 +1209,8 @@ Partial Public Class rptFiskalkunde Me.lblKontrolle.Left = 4.841! Me.lblKontrolle.Name = "lblKontrolle" Me.lblKontrolle.Style = "color: Black; font-size: 8pt; text-align: left" - Me.lblKontrolle.Text = "Mittwoch, 02.11.2016" - Me.lblKontrolle.Top = 5.001! + Me.lblKontrolle.Text = "" + Me.lblKontrolle.Top = 5.22! Me.lblKontrolle.Width = 2.649606! ' 'PageFooter @@ -1243,6 +1264,93 @@ Partial Public Class rptFiskalkunde Me.lblDat.Top = 0.08622044! Me.lblDat.Width = 2.649606! ' + 'Shape39 + ' + Me.Shape39.Height = 0.25! + Me.Shape39.Left = 2.802! + Me.Shape39.Name = "Shape39" + Me.Shape39.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) + Me.Shape39.Top = 2.101! + Me.Shape39.Width = 0.4! + ' + 'Shape40 + ' + Me.Shape40.Height = 0.25! + Me.Shape40.Left = 3.202! + Me.Shape40.Name = "Shape40" + Me.Shape40.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) + Me.Shape40.Top = 2.101! + Me.Shape40.Width = 0.4! + ' + 'Shape41 + ' + Me.Shape41.Height = 0.25! + Me.Shape41.Left = 3.592! + Me.Shape41.Name = "Shape41" + Me.Shape41.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) + Me.Shape41.Top = 2.101! + Me.Shape41.Width = 3.878! + ' + 'txtUVM + ' + Me.txtUVM.DataField = "" + Me.txtUVM.DistinctField = "" + Me.txtUVM.Height = 0.157! + Me.txtUVM.Left = 3.667! + Me.txtUVM.Name = "txtUVM" + Me.txtUVM.Style = "color: Black" + Me.txtUVM.SummaryGroup = "" + Me.txtUVM.Text = "-" + Me.txtUVM.Top = 2.16! + Me.txtUVM.Width = 3.732! + ' + 'txtUVMNein + ' + Me.txtUVMNein.DataField = "" + Me.txtUVMNein.DistinctField = "" + Me.txtUVMNein.Height = 0.15! + Me.txtUVMNein.Left = 3.25! + Me.txtUVMNein.Name = "txtUVMNein" + Me.txtUVMNein.Style = "color: Black; text-align: center" + Me.txtUVMNein.SummaryGroup = "" + Me.txtUVMNein.Text = Nothing + Me.txtUVMNein.Top = 2.16! + Me.txtUVMNein.Width = 0.3! + ' + 'txtUVMJa + ' + Me.txtUVMJa.DataField = "" + Me.txtUVMJa.DistinctField = "" + Me.txtUVMJa.Height = 0.15! + Me.txtUVMJa.Left = 2.843! + Me.txtUVMJa.Name = "txtUVMJa" + Me.txtUVMJa.Style = "color: Black; text-align: center" + Me.txtUVMJa.SummaryGroup = "" + Me.txtUVMJa.Text = Nothing + Me.txtUVMJa.Top = 2.16! + Me.txtUVMJa.Width = 0.3! + ' + 'Shape42 + ' + Me.Shape42.Height = 0.25! + Me.Shape42.Left = 0.01000023! + Me.Shape42.Name = "Shape42" + Me.Shape42.RoundingRadius = New GrapeCity.ActiveReports.Controls.CornersRadius(10.0!, Nothing, Nothing, Nothing, Nothing) + Me.Shape42.Top = 2.101! + Me.Shape42.Width = 2.792! + ' + 'Label22 + ' + Me.Label22.Height = 0.1574803! + Me.Label22.HyperLink = Nothing + Me.Label22.Left = 0.05000025! + Me.Label22.Name = "Label22" + Me.Label22.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: left; ddo-char-set: " & + "1" + Me.Label22.Text = "Untervollmacht liegt vor ?:" + Me.Label22.Top = 2.153! + Me.Label22.Width = 2.718! + ' 'rptFiskalkunde ' Me.PageSettings.Margins.Bottom = 0.3937008! @@ -1318,6 +1426,10 @@ Partial Public Class rptFiskalkunde CType(Me.Label28, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ReportInfo2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblDat, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtUVM, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtUVMNein, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtUVMJa, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.Label22, System.ComponentModel.ISupportInitialize).EndInit() CType(Me, System.ComponentModel.ISupportInitialize).EndInit() End Sub @@ -1418,4 +1530,12 @@ Partial Public Class rptFiskalkunde Private WithEvents txtSteuerberater As GrapeCity.ActiveReports.SectionReportModel.TextBox Private WithEvents txtSonstiges As GrapeCity.ActiveReports.SectionReportModel.TextBox Private WithEvents lblKontrolle As GrapeCity.ActiveReports.SectionReportModel.Label + Private WithEvents Shape39 As GrapeCity.ActiveReports.SectionReportModel.Shape + Private WithEvents Shape40 As GrapeCity.ActiveReports.SectionReportModel.Shape + Private WithEvents Shape41 As GrapeCity.ActiveReports.SectionReportModel.Shape + Private WithEvents txtUVM As GrapeCity.ActiveReports.SectionReportModel.TextBox + Private WithEvents txtUVMNein As GrapeCity.ActiveReports.SectionReportModel.TextBox + Private WithEvents txtUVMJa As GrapeCity.ActiveReports.SectionReportModel.TextBox + Private WithEvents Shape42 As GrapeCity.ActiveReports.SectionReportModel.Shape + Private WithEvents Label22 As GrapeCity.ActiveReports.SectionReportModel.Label End Class diff --git a/SDL/kunden/Berichte/rptFiskalkunde.vb b/SDL/kunden/Berichte/rptFiskalkunde.vb index d158d446..5a4f2e71 100644 --- a/SDL/kunden/Berichte/rptFiskalkunde.vb +++ b/SDL/kunden/Berichte/rptFiskalkunde.vb @@ -12,9 +12,10 @@ Public Class rptFiskalkunde Dim BR As cBonitaetsauskunft Dim EORI As cEORIPruefung Dim UID As cUIDPruefung + Dim UVM As cKundenVollmachten 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, unterlagenliste As List(Of String), 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, UVM As cKundenVollmachten, unterlagenliste As List(Of String), Optional Firma As String = "VERAG") ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() @@ -26,6 +27,7 @@ Public Class rptFiskalkunde Me.BR = BR Me.EORI = EORI Me.UID = UID + Me.UVM = UVM Me.unterlagenliste = unterlagenliste ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. @@ -62,6 +64,24 @@ Public Class rptFiskalkunde txtVMNein.Text = "X" End If + If UVM IsNot Nothing Then + + If UVM.kdvm_emailId > 0 Then + txtUVM.Text = " Untervollmacht per Mail erhalten " + txtUVMJa.Text = "X" + ElseIf VM.kdvm_datenarchivId > 0 Then + txtUVM.Text = " Untervollmacht liegt vor " + txtUVMJa.Text = "X" + Else + txtUVM.Text = " Untervollmacht liegt NICHT vor " + txtUVMNein.Text = "X" + End If + + If IsDate(UVM.kdvm_erhalten_Datum) Then txtUVM.Text &= CDate(UVM.kdvm_erhalten_Datum).ToShortDateString + Else + txtUVMNein.Text = "X" + End If + If BR IsNot Nothing Then txtBon.Text = "Bonitätsklasse" diff --git a/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb b/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb index 5ae346c8..ed0658b7 100644 --- a/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb +++ b/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb @@ -39,6 +39,8 @@ 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.cbxUntervm = New System.Windows.Forms.CheckBox() + Me.txtUVM = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.picOKSt = New System.Windows.Forms.PictureBox() Me.Button3 = New System.Windows.Forms.Button() Me.txtSteuerberater = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -284,6 +286,8 @@ 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.cbxUntervm) + Me.MyPanel2.Controls.Add(Me.txtUVM) Me.MyPanel2.Controls.Add(Me.picOKSt) Me.MyPanel2.Controls.Add(Me.Button3) Me.MyPanel2.Controls.Add(Me.txtSteuerberater) @@ -339,6 +343,43 @@ Partial Class usrcntlFiskaluebersicht Me.MyPanel2.Size = New System.Drawing.Size(721, 657) Me.MyPanel2.TabIndex = 110 ' + 'cbxUntervm + ' + Me.cbxUntervm.AutoSize = True + Me.cbxUntervm.Enabled = False + Me.cbxUntervm.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxUntervm.Location = New System.Drawing.Point(421, 71) + Me.cbxUntervm.Name = "cbxUntervm" + Me.cbxUntervm.Size = New System.Drawing.Size(160, 17) + Me.cbxUntervm.TabIndex = 182 + Me.cbxUntervm.Text = "aktuelle Untervollmacht" + Me.cbxUntervm.UseVisualStyleBackColor = True + ' + 'txtUVM + ' + Me.txtUVM._DateTimeOnly = False + Me.txtUVM._numbersOnly = False + Me.txtUVM._numbersOnlyKommastellen = "" + Me.txtUVM._numbersOnlyTrennzeichen = False + Me.txtUVM._Prozent = False + Me.txtUVM._ShortDateNew = False + Me.txtUVM._ShortDateOnly = True + Me.txtUVM._TimeOnly = False + Me.txtUVM._TimeOnly_Seconds = False + Me.txtUVM._value = "" + Me.txtUVM._Waehrung = False + Me.txtUVM._WaehrungZeichen = False + Me.txtUVM.ForeColor = System.Drawing.Color.Black + Me.txtUVM.Location = New System.Drawing.Point(587, 69) + Me.txtUVM.MaxLength = 10 + Me.txtUVM.MaxLineLength = -1 + Me.txtUVM.MaxLines_Warning = "" + Me.txtUVM.MaxLines_Warning_Label = Nothing + Me.txtUVM.Name = "txtUVM" + Me.txtUVM.ReadOnly = True + Me.txtUVM.Size = New System.Drawing.Size(68, 20) + Me.txtUVM.TabIndex = 183 + ' 'picOKSt ' Me.picOKSt.BackgroundImage = Global.SDL.My.Resources.Resources.ok @@ -400,18 +441,18 @@ Partial Class usrcntlFiskaluebersicht ' 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.Location = New System.Drawing.Point(421, 91) Me.cbxVMOriginal.Name = "cbxVMOriginal" - Me.cbxVMOriginal.Size = New System.Drawing.Size(215, 17) + Me.cbxVMOriginal.Size = New System.Drawing.Size(237, 17) Me.cbxVMOriginal.TabIndex = 177 - Me.cbxVMOriginal.Text = "Vollmacht im Original vorhanden?" + Me.cbxVMOriginal.Text = "Vollmacht(en) 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.Location = New System.Drawing.Point(542, 28) Me.lblBon.Name = "lblBon" Me.lblBon.Size = New System.Drawing.Size(11, 13) Me.lblBon.TabIndex = 139 @@ -535,7 +576,7 @@ Partial Class usrcntlFiskaluebersicht ' 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.Location = New System.Drawing.Point(283, 464) Me.lblAnmerkungen.Name = "lblAnmerkungen" Me.lblAnmerkungen.Size = New System.Drawing.Size(120, 20) Me.lblAnmerkungen.TabIndex = 166 @@ -632,12 +673,12 @@ 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, 165) + Me.txtKredit.Location = New System.Drawing.Point(155, 165) Me.txtKredit.MaxLineLength = -1 Me.txtKredit.MaxLines_Warning = "" Me.txtKredit.MaxLines_Warning_Label = Nothing Me.txtKredit.Name = "txtKredit" - Me.txtKredit.Size = New System.Drawing.Size(97, 20) + Me.txtKredit.Size = New System.Drawing.Size(86, 20) Me.txtKredit.TabIndex = 160 ' 'txtAnzMA @@ -655,12 +696,12 @@ 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, 139) + Me.txtAnzMA.Location = New System.Drawing.Point(155, 139) Me.txtAnzMA.MaxLineLength = -1 Me.txtAnzMA.MaxLines_Warning = "" Me.txtAnzMA.MaxLines_Warning_Label = Nothing Me.txtAnzMA.Name = "txtAnzMA" - Me.txtAnzMA.Size = New System.Drawing.Size(97, 20) + Me.txtAnzMA.Size = New System.Drawing.Size(86, 20) Me.txtAnzMA.TabIndex = 159 ' 'Label9 @@ -688,12 +729,12 @@ 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(143, 214) + Me.txtWaren.Location = New System.Drawing.Point(155, 214) Me.txtWaren.MaxLineLength = -1 Me.txtWaren.MaxLines_Warning = "" Me.txtWaren.MaxLines_Warning_Label = Nothing Me.txtWaren.Name = "txtWaren" - Me.txtWaren.Size = New System.Drawing.Size(512, 20) + Me.txtWaren.Size = New System.Drawing.Size(500, 20) Me.txtWaren.TabIndex = 157 ' 'Label8 @@ -721,13 +762,13 @@ Partial Class usrcntlFiskaluebersicht 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.Location = New System.Drawing.Point(155, 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.Size = New System.Drawing.Size(86, 20) Me.txtGruendungsjahr.TabIndex = 155 ' 'Label7 @@ -755,12 +796,12 @@ 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(143, 191) + Me.txtGeschaeftszweck.Location = New System.Drawing.Point(155, 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(512, 20) + Me.txtGeschaeftszweck.Size = New System.Drawing.Size(500, 20) Me.txtGeschaeftszweck.TabIndex = 153 ' 'Label5 @@ -808,9 +849,9 @@ Partial Class usrcntlFiskaluebersicht ' 'rtbAnmerkung ' - Me.rtbAnmerkung.Location = New System.Drawing.Point(298, 487) + Me.rtbAnmerkung.Location = New System.Drawing.Point(287, 487) Me.rtbAnmerkung.Name = "rtbAnmerkung" - Me.rtbAnmerkung.Size = New System.Drawing.Size(403, 99) + Me.rtbAnmerkung.Size = New System.Drawing.Size(414, 107) Me.rtbAnmerkung.TabIndex = 130 Me.rtbAnmerkung.Text = "" ' @@ -866,7 +907,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(417, 49) + Me.cbxVollmacht.Location = New System.Drawing.Point(421, 49) Me.cbxVollmacht.Name = "cbxVollmacht" Me.cbxVollmacht.Size = New System.Drawing.Size(130, 17) Me.cbxVollmacht.TabIndex = 103 @@ -913,7 +954,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(417, 26) + Me.cbxBonitaet.Location = New System.Drawing.Point(421, 26) Me.cbxBonitaet.Name = "cbxBonitaet" Me.cbxBonitaet.Size = New System.Drawing.Size(115, 17) Me.cbxBonitaet.TabIndex = 101 @@ -1025,13 +1066,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(13, 487) + Me.dgvUnterlagen.Location = New System.Drawing.Point(8, 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(248, 107) + Me.dgvUnterlagen.Size = New System.Drawing.Size(268, 107) Me.dgvUnterlagen.TabIndex = 115 ' 'cbxUID @@ -1173,4 +1214,6 @@ Partial Class usrcntlFiskaluebersicht Friend WithEvents cbxVMOriginal As CheckBox Friend WithEvents picOKSt As PictureBox Friend WithEvents Button3 As Button + Friend WithEvents cbxUntervm As CheckBox + Friend WithEvents txtUVM As VERAG_PROG_ALLGEMEIN.MyTextBox End Class diff --git a/SDL/kunden/usrcntlFiskaluebersicht.vb b/SDL/kunden/usrcntlFiskaluebersicht.vb index 6ddca27a..bf4ab5ee 100644 --- a/SDL/kunden/usrcntlFiskaluebersicht.vb +++ b/SDL/kunden/usrcntlFiskaluebersicht.vb @@ -19,7 +19,9 @@ Public Class usrcntlFiskaluebersicht Dim UID As cUIDPruefung Dim EORI As cEORIPruefung Dim VM As cKundenVollmachten + Dim UVM As cKundenVollmachten Dim year As Integer + Dim daysWithinDocumentAreValid = 30 Sub initDGVFiskaluebersicht() @@ -176,7 +178,7 @@ Public Class usrcntlFiskaluebersicht Dim hint As String If checkDateIsValid(input, hint) Then fk = New VERAG_PROG_ALLGEMEIN.cFiskalkunden() - fk.FK_Datum = input + fk.FK_Datum = CDate(input) fk.FK_Kdnr = kdNr fk.FK_Art = cbxFiskalart._value fk.SAVE() @@ -227,7 +229,7 @@ Public Class usrcntlFiskaluebersicht 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 rptFiskalkunden As New SDL.rptFiskalkunde(kdNr, fk.FK_Id, VM, BA, EORI, UID, UVM, listeUnterlagen) Dim p As New GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport rptFiskalkunden.Run(False) @@ -253,6 +255,21 @@ Public Class usrcntlFiskaluebersicht End If End If + + If UVM IsNot Nothing Then + If UVM.kdvm_datenarchivId > 0 Then files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(UVM.kdvm_datenarchivId)) + If UVM.kdvm_emailId > 0 Then + + Dim MailFile = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(UVM.kdvm_emailId) + + 'Muss von Mail zu PDF konvertiert und dann der Liste angehängt werden! + '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 + + If BA IsNot Nothing Then If BA.ba_datenarchivId > 0 Then files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(BA.ba_datenarchivId)) End If @@ -339,6 +356,12 @@ Public Class usrcntlFiskaluebersicht txtVM.Text = VM.kdvm_erhalten_Datum.ToShortDateString End If + If checkNullStr(fk.FK_Untervollmacht) <> "" Then + UVM = New cKundenVollmachten(fk.FK_Untervollmacht) + txtUVM.Text = UVM.kdvm_erhalten_Datum.ToShortDateString + End If + + If checkNullStr(fk.FK_EORI) <> "" Then EORI = New cEORIPruefung(fk.FK_EORI) txtEORI.Text = EORI.eori_datum.ToShortDateString @@ -456,6 +479,18 @@ Public Class usrcntlFiskaluebersicht End If End If + If txtUVM.Text = "" And cbxFiskalart._value <> "" Then + Dim uvmId = SQL.getValueTxtBySql("SELECT Top(1) abf.[kdvm_id] FROM [tblKundenVollmachtenArt] as art INNER Join(select * from [tblKundenVollmachten]) as abf on art.[kdvma_Id]=abf.[kdvm_kdvmaId] WHERE art.kdvma_visible = 1 And abf.kdvm_erhalten = 1 And ISNULL(abf.[kdvm_geloescht], 0)!= 1 And [kdvm_KundenNr] ='" & kdNr & "' AND [kdvm_kdvmaId]=6 Order BY abf.kdvm_erhalten_Datum desc", "FMZOLL") + + If uvmId <> "" Then + UVM = New cKundenVollmachten(uvmId) + If IsDate(UVM.kdvm_erhalten_Datum) Then txtUVM.Text = CDate(UVM.kdvm_erhalten_Datum).ToShortDateString + End If + + End If + + + If txtHomepage.Text <> "" Then cbxHomepage.Checked = IsValidURL(txtHomepage.Text) @@ -514,6 +549,8 @@ Public Class usrcntlFiskaluebersicht If VM IsNot Nothing Then fk.FK_Vollmacht = VM.kdvm_Id + If UVM IsNot Nothing Then fk.FK_Untervollmacht = UVM.kdvm_Id + If EORI IsNot Nothing Then fk.FK_EORI = EORI.eori_id If UID IsNot Nothing Then fk.FK_UID = UID.uid_id @@ -586,7 +623,7 @@ Public Class usrcntlFiskaluebersicht Private Sub txtBon_TextChanged(sender As Object, e As EventArgs) Handles txtBon.TextChanged If txtBon._value <> "" Then Dim a As Date = Date.ParseExact(txtBon._value, "dd.MM.yyyy", System.Globalization.DateTimeFormatInfo.InvariantInfo) - If a > fk.FK_Datum.AddDays(-30) Then + If a > fk.FK_Datum.AddDays(-daysWithinDocumentAreValid) Then cbxBonitaet.Checked = True txtBon.ForeColor = Color.Black Else @@ -602,7 +639,7 @@ Public Class usrcntlFiskaluebersicht Private Sub txtVM_TextChanged(sender As Object, e As EventArgs) Handles txtVM.TextChanged If txtVM._value <> "" Then Dim a As Date = Date.ParseExact(txtVM._value, "dd.MM.yyyy", System.Globalization.DateTimeFormatInfo.InvariantInfo) - If a > fk.FK_Datum.AddDays(-30) Then + If a > fk.FK_Datum.AddDays(-daysWithinDocumentAreValid) Then cbxVollmacht.Checked = True txtVM.ForeColor = Color.Black Else @@ -614,10 +651,26 @@ Public Class usrcntlFiskaluebersicht End If End Sub + Private Sub txtUVM_TextChanged(sender As Object, e As EventArgs) Handles txtUVM.TextChanged + If txtUVM._value <> "" Then + Dim a As Date = Date.ParseExact(txtUVM._value, "dd.MM.yyyy", System.Globalization.DateTimeFormatInfo.InvariantInfo) + If a > fk.FK_Datum.AddDays(-daysWithinDocumentAreValid) Then + cbxUntervm.Checked = True + txtUVM.ForeColor = Color.Black + Else + cbxUntervm.Checked = False + txtUVM.ForeColor = Color.Red + End If + Else + cbxUntervm.Checked = False + End If + End Sub + + Private Sub txtUID_TextChanged(sender As Object, e As EventArgs) Handles txtUID.TextChanged If txtUID._value <> "" Then Dim a As Date = Date.ParseExact(txtUID._value, "dd.MM.yyyy", System.Globalization.DateTimeFormatInfo.InvariantInfo) - If a > fk.FK_Datum.AddDays(-30) Then + If a > fk.FK_Datum.AddDays(-daysWithinDocumentAreValid) Then cbxUID.Checked = True txtUID.ForeColor = Color.Black Else @@ -632,7 +685,7 @@ Public Class usrcntlFiskaluebersicht Private Sub txtEORI_TextChanged(sender As Object, e As EventArgs) Handles txtEORI.TextChanged If txtEORI._value <> "" Then Dim a As Date = Date.ParseExact(txtEORI._value, "dd.MM.yyyy", System.Globalization.DateTimeFormatInfo.InvariantInfo) - If a > fk.FK_Datum.AddDays(-30) Then + If a > fk.FK_Datum.AddDays(-daysWithinDocumentAreValid) Then cbxEORI.Checked = True txtEORI.ForeColor = Color.Black Else diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cFiskalkunden.vb b/VERAG_PROG_ALLGEMEIN/Classes/cFiskalkunden.vb index 5f4e5f9b..a18e1624 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cFiskalkunden.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cFiskalkunden.vb @@ -10,13 +10,14 @@ Public Class cFiskalkunden Property FK_locked As Object = Nothing Property FK_Bonitaet As Object = Nothing Property FK_Vollmacht As Object = Nothing + Property FK_Untervollmacht As Object = Nothing Property FK_UID As Object = Nothing Property FK_EORI 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 DateTime + Property FK_Abschlussdatum As Object = Nothing Property FK_Anmerkung As Object = Nothing Property FK_Lieferanten As Object = Nothing Property FK_Empfaenger As Object = Nothing @@ -51,6 +52,7 @@ Public Class cFiskalkunden list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_locked", FK_locked)) 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_Untervollmacht", FK_Untervollmacht)) 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_Website_URL", FK_Website_URL))