diff --git a/Report/DefaultReports/InvoiceCustomerReport.Designer.cs b/Report/DefaultReports/InvoiceCustomerReport.Designer.cs index 110abe9fc..d3326ba7c 100644 --- a/Report/DefaultReports/InvoiceCustomerReport.Designer.cs +++ b/Report/DefaultReports/InvoiceCustomerReport.Designer.cs @@ -51,7 +51,7 @@ namespace BeWo.Report.DefaultReports this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblAnrede = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); @@ -214,12 +214,12 @@ namespace BeWo.Report.DefaultReports this.lblAddress, this.xrTable3, this.xrLabel6, - this.xrLabel5, + this.lblAnrede, this.xrLabel4, this.xrLabel3, this.xrLabel2, this.xrTable2}); - this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F); + this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.ReportHeader.HeightF = 518.875F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; @@ -362,21 +362,22 @@ namespace BeWo.Report.DefaultReports this.xrLabel6.StylePriority.UseFont = false; this.xrLabel6.Text = "für den Betreuungszeitraum [AccountingPeriod] berechnen wir folgende Leistungen:"; // - // xrLabel5 + // lblAnrede // - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 413.875F); - this.xrLabel5.Multiline = true; - this.xrLabel5.Name = "xrLabel5"; - this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel5.SizeF = new System.Drawing.SizeF(581.4177F, 17.00003F); - this.xrLabel5.StylePriority.UseFont = false; - this.xrLabel5.Text = "[RecipientSalutation]"; + this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 413.875F); + this.lblAnrede.Multiline = true; + this.lblAnrede.Name = "lblAnrede"; + this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblAnrede.SizeF = new System.Drawing.SizeF(581.4177F, 17.00003F); + this.lblAnrede.StylePriority.UseFont = false; + this.lblAnrede.Text = "[RecipientSalutation]"; // // xrLabel4 // this.xrLabel4.BackColor = System.Drawing.Color.Transparent; this.xrLabel4.CanShrink = true; - this.xrLabel4.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 363.875F); this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; @@ -391,7 +392,8 @@ namespace BeWo.Report.DefaultReports // this.xrLabel3.BackColor = System.Drawing.Color.Transparent; this.xrLabel3.CanShrink = true; - this.xrLabel3.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 346.875F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -405,7 +407,8 @@ namespace BeWo.Report.DefaultReports // this.xrLabel2.BackColor = System.Drawing.Color.Transparent; this.xrLabel2.CanShrink = true; - this.xrLabel2.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 321.875F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -550,7 +553,7 @@ namespace BeWo.Report.DefaultReports this.xrLabel12, this.lblNotice, this.xrTable4}); - this.ReportFooter.Font = new System.Drawing.Font("Verdana", 10F); + this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.ReportFooter.HeightF = 247.5417F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; @@ -588,7 +591,7 @@ namespace BeWo.Report.DefaultReports // lblNotice // this.lblNotice.CanShrink = true; - this.lblNotice.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Italic); + this.lblNotice.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Italic); this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 46.54166F); this.lblNotice.Name = "lblNotice"; this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -617,7 +620,7 @@ namespace BeWo.Report.DefaultReports | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell23.BorderWidth = 2F; - this.xrTableCell23.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold); + this.xrTableCell23.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell23.Name = "xrTableCell23"; this.xrTableCell23.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F); this.xrTableCell23.StylePriority.UseBorders = false; @@ -631,12 +634,10 @@ namespace BeWo.Report.DefaultReports // // topMarginBand1 // - this.topMarginBand1.HeightF = 100F; this.topMarginBand1.Name = "topMarginBand1"; // // bottomMarginBand1 // - this.bottomMarginBand1.HeightF = 100F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // // DetailReport @@ -652,7 +653,7 @@ namespace BeWo.Report.DefaultReports // this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable1}); - this.Detail1.Font = new System.Drawing.Font("Verdana", 9.75F); + this.Detail1.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F); this.Detail1.HeightF = 25F; this.Detail1.Name = "Detail1"; this.Detail1.StylePriority.UseFont = false; @@ -674,11 +675,11 @@ namespace BeWo.Report.DefaultReports this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new System.Drawing.Printing.Margins(75, 75, 100, 100); + this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 100F, 100F); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; - this.Version = "17.1"; + this.Version = "23.2"; ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); @@ -694,7 +695,7 @@ namespace BeWo.Report.DefaultReports private System.Windows.Forms.BindingSource bindingSource1; private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; private DevExpress.XtraReports.UI.XRLabel xrLabel6; - private DevExpress.XtraReports.UI.XRLabel xrLabel5; + private DevExpress.XtraReports.UI.XRLabel lblAnrede; private DevExpress.XtraReports.UI.XRLabel xrLabel4; private DevExpress.XtraReports.UI.XRLabel xrLabel3; private DevExpress.XtraReports.UI.XRLabel xrLabel2; diff --git a/Report/DefaultReports/InvoiceCustomerReport.resx b/Report/DefaultReports/InvoiceCustomerReport.resx index 0f60e7858..c7e0d4bdf 100644 --- a/Report/DefaultReports/InvoiceCustomerReport.resx +++ b/Report/DefaultReports/InvoiceCustomerReport.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/ReportObjects/InvoiceCustomerRO.cs b/Report/ReportObjects/InvoiceCustomerRO.cs index 9d5bfbdb0..f88246536 100644 --- a/Report/ReportObjects/InvoiceCustomerRO.cs +++ b/Report/ReportObjects/InvoiceCustomerRO.cs @@ -142,16 +142,27 @@ namespace BeWo.Report.ReportObjects if (p.Sex == Sex.Male) { result.RecipientSalutationAddressField = "Herrn"; - result.RecipientSalutation = "Sehr geehrter Herr"; + result.RecipientSalutation = "Sehr geehrter Herr " + p.LastName+ ","; } - else + else if (p.Sex == Sex.Female) { result.RecipientSalutationAddressField = "Frau"; - result.RecipientSalutation = "Sehr geehrte Frau"; + result.RecipientSalutation = "Sehr geehrte Frau " + p.LastName + ","; } - result.RecipientSalutation = String.Format("{0} {1},", result.RecipientSalutation, p.LastName); + else if (p.Sex == Sex.Divers || !p.Sex.HasValue) + { + result.RecipientSalutationAddressField = ""; + result.RecipientSalutation = "Guten Tag " + p.FirstName + " " + p.LastName + ","; + } + //} - result.CustomerSalutation = p.Sex == Sex.Male ? "Herr" : "Frau"; + if (p.Sex == Sex.Male) + result.CustomerSalutation = "Herr"; + else if (p.Sex == Sex.Female) + result.CustomerSalutation = "Frau"; + else + result.CustomerSalutation = ""; + if (p.Address != null) { result.CustomerStreet = p.Address.Street;