diff --git a/Report/DefaultReports/EmployeeKilometerauswertungsListReport.Designer.cs b/Report/DefaultReports/EmployeeKilometerauswertungsListReport.Designer.cs index 305411cb1..08327c9d8 100644 --- a/Report/DefaultReports/EmployeeKilometerauswertungsListReport.Designer.cs +++ b/Report/DefaultReports/EmployeeKilometerauswertungsListReport.Designer.cs @@ -85,7 +85,7 @@ namespace BeWo.Report.DefaultReports this.xrTableCell1.Borders = DevExpress.XtraPrinting.BorderSide.None; this.xrTableCell1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Employees2Entries.EmployeeName")}); - this.xrTableCell1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell1.Name = "xrTableCell1"; this.xrTableCell1.StylePriority.UseBorderColor = false; this.xrTableCell1.StylePriority.UseBorders = false; @@ -116,7 +116,8 @@ namespace BeWo.Report.DefaultReports this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabel7, this.xrTable1}); - this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.Detail1.HeightF = 83F; this.Detail1.Name = "Detail1"; this.Detail1.StylePriority.UseFont = false; @@ -125,7 +126,7 @@ namespace BeWo.Report.DefaultReports // this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Employees2Entries.TotalDistanceInMeters", "Kilometer gesamt: {0:}")}); - this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 50F); this.xrLabel7.Name = "xrLabel7"; this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -159,6 +160,8 @@ namespace BeWo.Report.DefaultReports this.xrTable4}); this.Detail2.HeightF = 25F; this.Detail2.Name = "Detail2"; + this.Detail2.SortFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] { + new DevExpress.XtraReports.UI.GroupField("Datum", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)}); // // xrTable4 // @@ -186,7 +189,7 @@ namespace BeWo.Report.DefaultReports // this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Employees2Entries.Entries.Datum", "{0:dd.MM.yyyy}")}); - this.xrTableCell3.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); this.xrTableCell3.Name = "xrTableCell3"; this.xrTableCell3.StylePriority.UseFont = false; this.xrTableCell3.StylePriority.UseTextAlignment = false; @@ -197,7 +200,7 @@ namespace BeWo.Report.DefaultReports // this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Employees2Entries.Entries.TimeRange")}); - this.xrTableCell8.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); this.xrTableCell8.Name = "xrTableCell8"; this.xrTableCell8.StylePriority.UseFont = false; this.xrTableCell8.StylePriority.UseTextAlignment = false; @@ -209,7 +212,7 @@ namespace BeWo.Report.DefaultReports // this.xrTableCell4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Employees2Entries.Entries.DistanceInMeters", "{0:0.##}")}); - this.xrTableCell4.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); this.xrTableCell4.Name = "xrTableCell4"; this.xrTableCell4.StylePriority.UseFont = false; this.xrTableCell4.StylePriority.UseTextAlignment = false; @@ -220,7 +223,7 @@ namespace BeWo.Report.DefaultReports // this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Employees2Entries.Entries.CustomerName")}); - this.xrTableCell9.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); this.xrTableCell9.Name = "xrTableCell9"; this.xrTableCell9.StylePriority.UseFont = false; this.xrTableCell9.StylePriority.UsePadding = false; @@ -241,7 +244,7 @@ namespace BeWo.Report.DefaultReports this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTable2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrTable2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable2.Name = "xrTable2"; this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { @@ -318,7 +321,7 @@ namespace BeWo.Report.DefaultReports // this.xrLabel2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "MonthInformation", "Zeitraum: {0:MMMM yyyy}")}); - this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F); + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 12F); this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -327,7 +330,7 @@ namespace BeWo.Report.DefaultReports // // xrLabel1 // - this.xrLabel1.Font = new System.Drawing.Font("Arial", 14F); + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 14F); this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrLabel1.Multiline = true; this.xrLabel1.Name = "xrLabel1"; @@ -346,18 +349,18 @@ namespace BeWo.Report.DefaultReports // // xrPageInfo2 // - this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F); - this.xrPageInfo2.Format = "Seite {0} von {1}"; + this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(382.5002F, 25F); this.xrPageInfo2.Name = "xrPageInfo2"; this.xrPageInfo2.SizeF = new System.Drawing.SizeF(243.3297F, 23F); this.xrPageInfo2.StyleName = "PageInfo"; this.xrPageInfo2.StylePriority.UseFont = false; this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrPageInfo2.TextFormatString = "Seite {0} von {1}"; // // xrPageInfo1 // - this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F); + this.xrPageInfo1.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); this.xrPageInfo1.Name = "xrPageInfo1"; this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime; @@ -371,7 +374,7 @@ namespace BeWo.Report.DefaultReports this.Title.BorderColor = System.Drawing.SystemColors.ControlText; this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None; this.Title.BorderWidth = 1F; - this.Title.Font = new System.Drawing.Font("Times New Roman", 24F); + this.Title.Font = new DevExpress.Drawing.DXFont("Times New Roman", 24F); this.Title.ForeColor = System.Drawing.Color.Black; this.Title.Name = "Title"; // @@ -381,7 +384,7 @@ namespace BeWo.Report.DefaultReports this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText; this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None; this.FieldCaption.BorderWidth = 1F; - this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold); + this.FieldCaption.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.FieldCaption.ForeColor = System.Drawing.Color.Black; this.FieldCaption.Name = "FieldCaption"; // @@ -391,7 +394,7 @@ namespace BeWo.Report.DefaultReports this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText; this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None; this.PageInfo.BorderWidth = 1F; - this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F); + this.PageInfo.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F); this.PageInfo.ForeColor = System.Drawing.Color.Black; this.PageInfo.Name = "PageInfo"; // @@ -401,7 +404,7 @@ namespace BeWo.Report.DefaultReports this.DataField.BorderColor = System.Drawing.SystemColors.ControlText; this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None; this.DataField.BorderWidth = 1F; - this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F); + this.DataField.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F); this.DataField.ForeColor = System.Drawing.SystemColors.ControlText; this.DataField.Name = "DataField"; // @@ -436,7 +439,7 @@ namespace BeWo.Report.DefaultReports this.ComponentStorage.AddRange(new System.ComponentModel.IComponent[] { this.objectDataSource1}); this.DataSource = this.objectDataSource1; - this.Margins = new System.Drawing.Printing.Margins(75, 75, 50, 50); + this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 50F, 50F); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; @@ -445,7 +448,7 @@ namespace BeWo.Report.DefaultReports this.FieldCaption, this.PageInfo, this.DataField}); - this.Version = "17.1"; + this.Version = "23.2"; ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); diff --git a/Report/DefaultReports/EmployeeKilometerauswertungsListReport.resx b/Report/DefaultReports/EmployeeKilometerauswertungsListReport.resx index 2662eac07..d58980a38 100644 --- a/Report/DefaultReports/EmployeeKilometerauswertungsListReport.resx +++ b/Report/DefaultReports/EmployeeKilometerauswertungsListReport.resx @@ -117,7 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - \ No newline at end of file diff --git a/Report/DefaultReports/EmployeeKilometerauswertungsReport.designer.cs b/Report/DefaultReports/EmployeeKilometerauswertungsReport.designer.cs index e758b8388..89635765c 100644 --- a/Report/DefaultReports/EmployeeKilometerauswertungsReport.designer.cs +++ b/Report/DefaultReports/EmployeeKilometerauswertungsReport.designer.cs @@ -82,7 +82,8 @@ namespace BeWo.Report.DefaultReports // this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabel13}); - this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.Detail1.HeightF = 46.16668F; this.Detail1.Name = "Detail1"; this.Detail1.StylePriority.UseFont = false; @@ -91,7 +92,7 @@ namespace BeWo.Report.DefaultReports // this.xrLabel13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalDistanceInMeters", "Kilometer gesamt: {0:0.##}")}); - this.xrLabel13.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F); this.xrLabel13.Name = "xrLabel13"; this.xrLabel13.SizeF = new System.Drawing.SizeF(677.0001F, 25F); @@ -128,6 +129,8 @@ namespace BeWo.Report.DefaultReports this.Detail2.KeepTogether = true; this.Detail2.KeepTogetherWithDetailReports = true; this.Detail2.Name = "Detail2"; + this.Detail2.SortFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] { + new DevExpress.XtraReports.UI.GroupField("Datum", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)}); // // xrTable4 // @@ -156,7 +159,7 @@ namespace BeWo.Report.DefaultReports this.xrTableCell3.CanGrow = false; this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.Datum", "{0:dd.MM.yyyy}")}); - this.xrTableCell3.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); this.xrTableCell3.Name = "xrTableCell3"; this.xrTableCell3.StylePriority.UseFont = false; this.xrTableCell3.StylePriority.UseTextAlignment = false; @@ -167,7 +170,7 @@ namespace BeWo.Report.DefaultReports // this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.TimeRange")}); - this.xrTableCell2.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); this.xrTableCell2.Name = "xrTableCell2"; this.xrTableCell2.StylePriority.UseFont = false; this.xrTableCell2.StylePriority.UseTextAlignment = false; @@ -180,7 +183,7 @@ namespace BeWo.Report.DefaultReports this.xrTableCell4.CanGrow = false; this.xrTableCell4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.DistanceInMeters", "{0:0.##}")}); - this.xrTableCell4.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); this.xrTableCell4.Name = "xrTableCell4"; this.xrTableCell4.StylePriority.UseFont = false; this.xrTableCell4.StylePriority.UseTextAlignment = false; @@ -192,7 +195,7 @@ namespace BeWo.Report.DefaultReports this.xrTableCell9.CanGrow = false; this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.CustomerName")}); - this.xrTableCell9.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); this.xrTableCell9.Name = "xrTableCell9"; this.xrTableCell9.StylePriority.UseFont = false; this.xrTableCell9.StylePriority.UsePadding = false; @@ -219,7 +222,7 @@ namespace BeWo.Report.DefaultReports this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTable2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrTable2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable2.Name = "xrTable2"; this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { @@ -293,7 +296,7 @@ namespace BeWo.Report.DefaultReports // this.xrLabel2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "MonthInformation", "Zeitraum: {0:MMMM yyyy}")}); - this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F); + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 12F); this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 24.99999F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); @@ -303,7 +306,7 @@ namespace BeWo.Report.DefaultReports // // xrLabel1 // - this.xrLabel1.Font = new System.Drawing.Font("Arial", 14F); + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 14F); this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrLabel1.Multiline = true; this.xrLabel1.Name = "xrLabel1"; @@ -322,18 +325,18 @@ namespace BeWo.Report.DefaultReports // // xrPageInfo2 // - this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F); - this.xrPageInfo2.Format = "Seite {0} von {1}"; + this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(382.4996F, 25F); this.xrPageInfo2.Name = "xrPageInfo2"; this.xrPageInfo2.SizeF = new System.Drawing.SizeF(243.3336F, 23F); this.xrPageInfo2.StyleName = "PageInfo"; this.xrPageInfo2.StylePriority.UseFont = false; this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrPageInfo2.TextFormatString = "Seite {0} von {1}"; // // xrPageInfo1 // - this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F); + this.xrPageInfo1.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(7.999929F, 25F); this.xrPageInfo1.Name = "xrPageInfo1"; this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime; @@ -347,7 +350,7 @@ namespace BeWo.Report.DefaultReports this.Title.BorderColor = System.Drawing.SystemColors.ControlText; this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None; this.Title.BorderWidth = 1F; - this.Title.Font = new System.Drawing.Font("Times New Roman", 24F); + this.Title.Font = new DevExpress.Drawing.DXFont("Times New Roman", 24F); this.Title.ForeColor = System.Drawing.Color.Black; this.Title.Name = "Title"; // @@ -357,7 +360,7 @@ namespace BeWo.Report.DefaultReports this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText; this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None; this.FieldCaption.BorderWidth = 1F; - this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold); + this.FieldCaption.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.FieldCaption.ForeColor = System.Drawing.Color.Black; this.FieldCaption.Name = "FieldCaption"; // @@ -367,7 +370,7 @@ namespace BeWo.Report.DefaultReports this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText; this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None; this.PageInfo.BorderWidth = 1F; - this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F); + this.PageInfo.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F); this.PageInfo.ForeColor = System.Drawing.Color.Black; this.PageInfo.Name = "PageInfo"; // @@ -377,7 +380,7 @@ namespace BeWo.Report.DefaultReports this.DataField.BorderColor = System.Drawing.SystemColors.ControlText; this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None; this.DataField.BorderWidth = 1F; - this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F); + this.DataField.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F); this.DataField.ForeColor = System.Drawing.SystemColors.ControlText; this.DataField.Name = "DataField"; // @@ -420,7 +423,7 @@ namespace BeWo.Report.DefaultReports this.ComponentStorage.AddRange(new System.ComponentModel.IComponent[] { this.objectDataSource1}); this.DataSource = this.objectDataSource1; - this.Margins = new System.Drawing.Printing.Margins(75, 75, 50, 50); + this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 50F, 50F); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; @@ -429,7 +432,7 @@ namespace BeWo.Report.DefaultReports this.FieldCaption, this.PageInfo, this.DataField}); - this.Version = "17.1"; + this.Version = "23.2"; ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.objectDataSource1)).EndInit(); diff --git a/Report/DefaultReports/EmployeeKilometerauswertungsReport.resx b/Report/DefaultReports/EmployeeKilometerauswertungsReport.resx index 2662eac07..d58980a38 100644 --- a/Report/DefaultReports/EmployeeKilometerauswertungsReport.resx +++ b/Report/DefaultReports/EmployeeKilometerauswertungsReport.resx @@ -117,7 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - \ No newline at end of file