From c4d4ad937893e4c5bbe84993bbdde2fcc55a751f Mon Sep 17 00:00:00 2001
From: Alexandra <alexandra.becker@ownsoft.de>
Date: Fri, 26 Jan 2024 14:14:08 +0100
Subject: [PATCH] ProfEggersStiftung/RechnungPflege - Ansprechpartner angepasst

---
 .../RechnungPflege.Designer.cs                   |  4 +++-
 ReportImp/ProfEggersStiftung/RechnungPflege.cs   | 16 ++++++++++------
 .../ProfEggersStiftung/ServiceInvoiceReport.cs   |  2 --
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/ReportImp/ProfEggersStiftung/RechnungPflege.Designer.cs b/ReportImp/ProfEggersStiftung/RechnungPflege.Designer.cs
index a528a97f1..6c4ee307b 100644
--- a/ReportImp/ProfEggersStiftung/RechnungPflege.Designer.cs
+++ b/ReportImp/ProfEggersStiftung/RechnungPflege.Designer.cs
@@ -240,6 +240,8 @@ namespace ProfEggersStiftung
             // 
             // xrTableCell6
             // 
+            this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "CreatorName")});
             this.xrTableCell6.Name = "xrTableCell6";
             this.xrTableCell6.Text = "Katja Waldschmidt";
             this.xrTableCell6.Weight = 0.70712667704046073D;
@@ -247,7 +249,7 @@ namespace ProfEggersStiftung
             // xrTableCell7
             // 
             this.xrTableCell7.Name = "xrTableCell7";
-            this.xrTableCell7.Text = "0201/856955-2 verwaltung@eggers-stiftung.de";
+            this.xrTableCell7.Text = "[SenderContactPersonPhone] verwaltung@eggers-stiftung.de";
             this.xrTableCell7.Weight = 1.5230420736256078D;
             // 
             // xrTableCell8
diff --git a/ReportImp/ProfEggersStiftung/RechnungPflege.cs b/ReportImp/ProfEggersStiftung/RechnungPflege.cs
index dc3c08af2..c7f2ee630 100644
--- a/ReportImp/ProfEggersStiftung/RechnungPflege.cs
+++ b/ReportImp/ProfEggersStiftung/RechnungPflege.cs
@@ -29,36 +29,40 @@ namespace ProfEggersStiftung
 				lblMonat.Text = String.Format("Pflegekostenrechnung {0:MMMM yyyy} - {1:MMMM yyyy}", start, end);
 			}
 
-
 			decimal hourlyRate = 0;
-			
 			decimal hours = 0;
+
 			if (pRO.ServiceInvoicePeriods != null && pRO.ServiceInvoicePeriods.Count > 0)
 			{
 				foreach (var p in pRO.ServiceInvoicePeriods)
 				{
-
 					if (p.ServiceInvoiceItems != null && p.ServiceInvoiceItems.Count > 0)
 					{
-
 						foreach (var i in p.ServiceInvoiceItems)
 						{
 							if (i.HourlyRate.HasValue)
 							{
 								hourlyRate = i.HourlyRate.Value;
-
 							}
 
 							if (i.Hours.HasValue)
+                            {
 								hours += i.Hours.Value;
-                            
+							}
 						}
 					}
 				}
 			}
 
 			if (!String.IsNullOrEmpty(pRO.CustomerSalutation) && pRO.CustomerSalutation.ToLower() == "herr")
+            {
 				pRO.CustomerSalutation = "Herrn";
+			}
+
+			if (pRO.SenderContactPersonPhone == null)
+			{
+				pRO.SenderContactPersonPhone = "0201-8953322";
+			}
 
 			var absencetimes = pRO.InvoiceBase.SupportConceptCostBearerRelDc.SupportConcept.Customer.AbsenceTimes;
 
diff --git a/ReportImp/ProfEggersStiftung/ServiceInvoiceReport.cs b/ReportImp/ProfEggersStiftung/ServiceInvoiceReport.cs
index c72485473..1d870882f 100644
--- a/ReportImp/ProfEggersStiftung/ServiceInvoiceReport.cs
+++ b/ReportImp/ProfEggersStiftung/ServiceInvoiceReport.cs
@@ -60,9 +60,7 @@ namespace ProfEggersStiftung
 			if (pRO.SenderContactPersonPhone == null)
             {
 				pRO.SenderContactPersonPhone = "0201-8953322";
-
 			}
-
 			lblAbrechnungstext.Text = String.Format("{0:0.##} FLS x {1:c} = ", hours, hourlyRate);
 			
             this.bindingSource1.DataSource = pRO;