diff --git a/ReportImp/skmRheydt/ServiceInvoiceReport.cs b/ReportImp/skmRheydt/ServiceInvoiceReport.cs index 0acfd71bc..bffd0dc07 100644 --- a/ReportImp/skmRheydt/ServiceInvoiceReport.cs +++ b/ReportImp/skmRheydt/ServiceInvoiceReport.cs @@ -16,8 +16,8 @@ namespace SkmRheydt public void SetReportDataSource(ServiceInvoiceRO pRO) { - // seit Juli 2025 smk moenchengladbach, vorher smk rheydt - if (pRO.InvoiceBase != null && pRO.InvoiceBase.InvoiceDate < new DateTime(2025, 7, 1)) + // ab Februar 2026 smk moenchengladbach, vorher smk rheydt + if (pRO.InvoiceBase != null && pRO.InvoiceBase.InvoiceDate < new DateTime(2026, 02, 01)) { pictureBoxLogoMg.Visible = false; richTextHeaderMg.Visible = false; diff --git a/ReportImp/skmRheydt/ServicesOverviewReport.Designer.cs b/ReportImp/skmRheydt/ServicesOverviewReport.Designer.cs index 05b0d822f..c95855618 100644 --- a/ReportImp/skmRheydt/ServicesOverviewReport.Designer.cs +++ b/ReportImp/skmRheydt/ServicesOverviewReport.Designer.cs @@ -52,8 +52,11 @@ namespace SkmRheydt this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.richTextHeaderRy = new DevExpress.XtraReports.UI.XRRichText(); + this.pictureBoxLogoMg = new DevExpress.XtraReports.UI.XRPictureBox(); this.richTextHeaderMg = new DevExpress.XtraReports.UI.XRRichText(); this.pictureBoxLogoRy = new DevExpress.XtraReports.UI.XRPictureBox(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); @@ -79,6 +82,8 @@ namespace SkmRheydt this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.richTextFooterRy = new DevExpress.XtraReports.UI.XRRichText(); + this.richTextFooterMg = new DevExpress.XtraReports.UI.XRRichText(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); @@ -90,19 +95,14 @@ namespace SkmRheydt this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldGruppe = new DevExpress.XtraReports.UI.CalculatedField(); - this.richTextFooterMg = new DevExpress.XtraReports.UI.XRRichText(); - this.pictureBoxLogoMg = new DevExpress.XtraReports.UI.XRPictureBox(); - this.richTextHeaderRy = new DevExpress.XtraReports.UI.XRRichText(); - this.richTextFooterRy = new DevExpress.XtraReports.UI.XRRichText(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.richTextHeaderRy)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.richTextHeaderMg)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.richTextFooterMg)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.richTextHeaderRy)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.richTextFooterRy)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.richTextFooterMg)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -343,6 +343,10 @@ namespace SkmRheydt this.xrTableCell23.Text = "xrTableCell23"; this.xrTableCell23.Weight = 0.18534328467512831D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + // // formattingRuleStartDate // this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]"; @@ -363,6 +367,26 @@ namespace SkmRheydt this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; // + // richTextHeaderRy + // + this.richTextHeaderRy.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.richTextHeaderRy.LocationFloat = new DevExpress.Utils.PointFloat(431.4601F, 94.36001F); + this.richTextHeaderRy.Name = "richTextHeaderRy"; + this.richTextHeaderRy.SerializableRtfString = resources.GetString("richTextHeaderRy.SerializableRtfString"); + this.richTextHeaderRy.SizeF = new System.Drawing.SizeF(233.5414F, 175.64F); + this.richTextHeaderRy.StylePriority.UseBorders = false; + this.richTextHeaderRy.Visible = false; + // + // pictureBoxLogoMg + // + this.pictureBoxLogoMg.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.pictureBoxLogoMg.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("pictureBoxLogoMg.ImageSource")); + this.pictureBoxLogoMg.LocationFloat = new DevExpress.Utils.PointFloat(429.4601F, 0F); + this.pictureBoxLogoMg.Name = "pictureBoxLogoMg"; + this.pictureBoxLogoMg.SizeF = new System.Drawing.SizeF(95.61945F, 89.36F); + this.pictureBoxLogoMg.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + this.pictureBoxLogoMg.StylePriority.UseBorders = false; + // // richTextHeaderMg // this.richTextHeaderMg.Borders = DevExpress.XtraPrinting.BorderSide.None; @@ -580,6 +604,25 @@ namespace SkmRheydt this.bottomMarginBand1.HeightF = 95.31013F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // + // richTextFooterRy + // + this.richTextFooterRy.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.richTextFooterRy.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.richTextFooterRy.Name = "richTextFooterRy"; + this.richTextFooterRy.SerializableRtfString = resources.GetString("richTextFooterRy.SerializableRtfString"); + this.richTextFooterRy.SizeF = new System.Drawing.SizeF(665.0014F, 73.85818F); + this.richTextFooterRy.StylePriority.UseBorders = false; + this.richTextFooterRy.Visible = false; + // + // richTextFooterMg + // + this.richTextFooterMg.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.richTextFooterMg.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.richTextFooterMg.Name = "richTextFooterMg"; + this.richTextFooterMg.SerializableRtfString = resources.GetString("richTextFooterMg.SerializableRtfString"); + this.richTextFooterMg.SizeF = new System.Drawing.SizeF(665.0014F, 73.85818F); + this.richTextFooterMg.StylePriority.UseBorders = false; + // // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -688,49 +731,6 @@ namespace SkmRheydt this.fieldGruppe.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldGruppe.Name = "fieldGruppe"; // - // richTextFooterMg - // - this.richTextFooterMg.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.richTextFooterMg.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.richTextFooterMg.Name = "richTextFooterMg"; - this.richTextFooterMg.SerializableRtfString = resources.GetString("richTextFooterMg.SerializableRtfString"); - this.richTextFooterMg.SizeF = new System.Drawing.SizeF(665.0014F, 73.85818F); - this.richTextFooterMg.StylePriority.UseBorders = false; - // - // pictureBoxLogoMg - // - this.pictureBoxLogoMg.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.pictureBoxLogoMg.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("pictureBoxLogoMg.ImageSource")); - this.pictureBoxLogoMg.LocationFloat = new DevExpress.Utils.PointFloat(429.4601F, 0F); - this.pictureBoxLogoMg.Name = "pictureBoxLogoMg"; - this.pictureBoxLogoMg.SizeF = new System.Drawing.SizeF(95.61945F, 89.36F); - this.pictureBoxLogoMg.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - this.pictureBoxLogoMg.StylePriority.UseBorders = false; - // - // richTextHeaderRy - // - this.richTextHeaderRy.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.richTextHeaderRy.LocationFloat = new DevExpress.Utils.PointFloat(431.4601F, 94.36001F); - this.richTextHeaderRy.Name = "richTextHeaderRy"; - this.richTextHeaderRy.SerializableRtfString = resources.GetString("richTextHeaderRy.SerializableRtfString"); - this.richTextHeaderRy.SizeF = new System.Drawing.SizeF(233.5414F, 175.64F); - this.richTextHeaderRy.StylePriority.UseBorders = false; - this.richTextHeaderRy.Visible = false; - // - // richTextFooterRy - // - this.richTextFooterRy.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.richTextFooterRy.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.richTextFooterRy.Name = "richTextFooterRy"; - this.richTextFooterRy.SerializableRtfString = resources.GetString("richTextFooterRy.SerializableRtfString"); - this.richTextFooterRy.SizeF = new System.Drawing.SizeF(665.0014F, 73.85818F); - this.richTextFooterRy.StylePriority.UseBorders = false; - this.richTextFooterRy.Visible = false; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); - // // Stundenzettel // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -762,12 +762,12 @@ namespace SkmRheydt this.Watermarks.Add(xrWatermark1); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.richTextHeaderRy)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.richTextHeaderMg)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.richTextFooterMg)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.richTextHeaderRy)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.richTextFooterRy)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.richTextFooterMg)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } diff --git a/ReportImp/skmRheydt/ServicesOverviewReport.cs b/ReportImp/skmRheydt/ServicesOverviewReport.cs index 81b75e586..16296d444 100644 --- a/ReportImp/skmRheydt/ServicesOverviewReport.cs +++ b/ReportImp/skmRheydt/ServicesOverviewReport.cs @@ -22,8 +22,8 @@ namespace SkmRheydt cellTitel.Text = "Leistungsnachweis nach BeWo §67"; } - // seit Juli 2025 smk moenchengladbach, vorher smk rheydt - if (pRO.StartDate < new DateTime(2025, 7, 1)) + // ab Februar 2026 smk moenchengladbach, vorher smk rheydt + if (pRO.StartDate < new DateTime(2026, 02, 01)) { pictureBoxLogoMg.Visible = false; richTextHeaderMg.Visible = false; diff --git a/ReportImp/skmRheydt/SettlementReport2.cs b/ReportImp/skmRheydt/SettlementReport2.cs index 1871f6b34..f0701e29c 100644 --- a/ReportImp/skmRheydt/SettlementReport2.cs +++ b/ReportImp/skmRheydt/SettlementReport2.cs @@ -19,8 +19,8 @@ namespace SkmRheydt public void SetReportDataSource(Settlement2RO pRO) { - // seit Juli 2025 smk moenchengladbach, vorher smk rheydt - if (pRO.InvoiceDate < new DateTime(2025, 7, 1)) + // ab Februar 2026 smk moenchengladbach, vorher smk rheydt + if (pRO.InvoiceDate < new DateTime(2026, 02, 01)) { pictureBoxLogoMg.Visible = false; richTextHeaderMg.Visible = false;