From b134b30194aa6124e8a2d0b33b65f5f0f61c08df Mon Sep 17 00:00:00 2001 From: HirschleM Date: Thu, 26 Jun 2025 14:09:44 +0200 Subject: [PATCH] MH: Default Rechnungen Anrede Fix --- Report/DefaultReports/InvoiceCustomerReport.cs | 3 +++ Report/DefaultReports/ServiceInvoiceReport.cs | 2 +- Report/DefaultReports/SettlementReport.cs | 2 +- Report/DefaultReports/SettlementReport2.cs | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Report/DefaultReports/InvoiceCustomerReport.cs b/Report/DefaultReports/InvoiceCustomerReport.cs index df70e94a0..32af09959 100644 --- a/Report/DefaultReports/InvoiceCustomerReport.cs +++ b/Report/DefaultReports/InvoiceCustomerReport.cs @@ -48,6 +48,9 @@ namespace BeWo.Report.DefaultReports } lblAddress.Text = sb.ToString(); + if (pRO.RecipientSalutation == "Sehr geehrte Damen und Herren,") + pRO.RecipientSalutation = "Guten Tag,"; + this.bindingSource1.DataSource = pRO; } } diff --git a/Report/DefaultReports/ServiceInvoiceReport.cs b/Report/DefaultReports/ServiceInvoiceReport.cs index dc601f6ea..02fe71982 100644 --- a/Report/DefaultReports/ServiceInvoiceReport.cs +++ b/Report/DefaultReports/ServiceInvoiceReport.cs @@ -28,7 +28,7 @@ namespace BeWo.Report.DefaultReports if (pRO.CustomerSalutation.IsNullOrEmpty()) { - lblAnrede.Text = "Guten Tag " + pRO.CustomerFirstName + " " + pRO.CustomerLastName + ","; + lblAnrede.Text = "Guten Tag,"; } SetzeAdresse(pRO); diff --git a/Report/DefaultReports/SettlementReport.cs b/Report/DefaultReports/SettlementReport.cs index 65730313b..faa9e1fd0 100644 --- a/Report/DefaultReports/SettlementReport.cs +++ b/Report/DefaultReports/SettlementReport.cs @@ -81,7 +81,7 @@ namespace BeWo.Report.DefaultReports.Alt if (pRO.Salutation1.IsNullOrEmpty() && pRO.Salutation2.IsNullOrEmpty()) { - lblAnrede.Text = "Guten Tag " + pRO.CustomerFirstName + " " + pRO.CustomerLastName + ","; + lblAnrede.Text = "Guten Tag,"; } this.bindingSource1.DataSource = pRO; diff --git a/Report/DefaultReports/SettlementReport2.cs b/Report/DefaultReports/SettlementReport2.cs index 0f07cde7c..aa25ece17 100644 --- a/Report/DefaultReports/SettlementReport2.cs +++ b/Report/DefaultReports/SettlementReport2.cs @@ -52,7 +52,7 @@ namespace BeWo.Report.DefaultReports if (pRO.Salutation1.IsNullOrEmpty() && pRO.Salutation2.IsNullOrEmpty()) { - lblAnrede.Text = "Guten Tag " + pRO.CustomerFirstName + " " + pRO.CustomerLastName + ","; + lblAnrede.Text = "Guten Tag,"; } this.bindingSource1.DataSource = pRO;