diff --git a/ReportImp/BeWoAmrath/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/BeWoAmrath/CustomMitarbeiterstundenkontoBerechnung.cs index 3b5acea38..c3ba3f40c 100644 --- a/ReportImp/BeWoAmrath/CustomMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/BeWoAmrath/CustomMitarbeiterstundenkontoBerechnung.cs @@ -128,6 +128,7 @@ namespace BeWo.BeWoAmrath if (AddServiceRecordToDuration(item)) { decimal duration = 0; + flsIstFK = 0; if (item.GroupRoundedDuration.HasValue) { @@ -147,7 +148,10 @@ namespace BeWo.BeWoAmrath } duration *= prozent / 100; - flsIstFK += duration; + if (prozent != 100) + { + flsIstFK = duration; + } } else { @@ -163,7 +167,10 @@ namespace BeWo.BeWoAmrath duration *= prozent / 100; - flsIstFK = duration; + if (prozent != 100) + { + flsIstFK = duration; + } } if (item.ServiceDescription != null && diff --git a/ReportImp/BeWoAmrath/ServicesOverviewReport.Designer.cs b/ReportImp/BeWoAmrath/ServicesOverviewReport.Designer.cs index 91549466d..c18b3d5f6 100644 --- a/ReportImp/BeWoAmrath/ServicesOverviewReport.Designer.cs +++ b/ReportImp/BeWoAmrath/ServicesOverviewReport.Designer.cs @@ -670,13 +670,13 @@ namespace BeWo.BeWoAmrath // xrLabel7 // this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(337.2079F, 229.6668F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(325.9165F, 229.6668F); this.xrLabel7.Name = "xrLabel7"; this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(161.5834F, 17.99997F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(174.0834F, 17.99997F); this.xrLabel7.StylePriority.UseBorders = false; this.xrLabel7.StylePriority.UseFont = false; - this.xrLabel7.Text = "Unterschrift Klient"; + this.xrLabel7.Text = "Unterschrift Leistungsempfänger"; // // xrLabel8 //