diff --git a/ReportImp/MuenchenerAidsHilfeEV/Invoicing/CustomInvoiceCreation.cs b/ReportImp/MuenchenerAidsHilfeEV/Invoicing/CustomInvoiceCreation.cs index 6a1f4b617..d6e78121c 100644 --- a/ReportImp/MuenchenerAidsHilfeEV/Invoicing/CustomInvoiceCreation.cs +++ b/ReportImp/MuenchenerAidsHilfeEV/Invoicing/CustomInvoiceCreation.cs @@ -72,33 +72,52 @@ namespace MuenchenerAidsHilfeEV.Invoicing { laengerAls31 = customer.AbsenceTimes .Where(at => at.Start.HasValue && at.End.HasValue && ((at.End - at.Start).Value.TotalDays + 1 > 31)).ToList(); + + // Abwesenheit künstlich um 1 tag verkürzen, da der letzte Abwesenheitstag wieder als anwesend gilt + //foreach (var item in laengerAls31) + // item.End = item.End.Value.AddDays(-1); } Dictionary tagessatz2unitCount = new Dictionary(); + // Zum Debuggen Liste mit allen Tagen, die abgerechnet werden, damit man sehen kann, welcher zu viel/zu wenig ist + List debug = new List(); + var start = startDate; while (start <= endDate) { + if (start.Day == 30 && start.Month == 5) + { + + } + // Wenn eine Abwesenheit den aktuellen Tag enthält prüfen, ob er schon > 31 ist und wenn nein, ob es eine pauschale Bewilligung gibt var abs = laengerAls31.FirstOrDefault(l => l.AbsenceSpan.ContainsDate(start)); bool abrechenbar = true; - bool abwesend = false; + bool alsAbwesendAbrechnen = false; if (abs != null) { - abwesend = true; - - // Abwesenheit künstlich um 1 tag verkürzen, da der letzte Abwesenheitstag wieder als anwesend gilt - abs.End = abs.End.Value.AddDays(-1); - var absStart = new DateTime(abs.Start.Value.Year, abs.Start.Value.Month, abs.Start.Value.Day); int tage = 1; while (absStart < abs.End) { + if (absStart.Day == 30 && absStart.Month == 5) + { + + } + // Wenn der abzurechnende Tag nach dem 31. einer Abwesenheit liegt prüfen, ob er abgerechnet werden soll oder nicht if (absStart.Date == start.Date && tage > 31 || scap.ApprovedFixedAmount != null) { - // Wenn ein Betrag > 0 zurückkommt existiert eine Bewilligung mit Tagessatz speziell für die Abwesenheit, sonst nicht abrechnen - if (GetTagespauschale(scap, start, abwesend) == 0) + alsAbwesendAbrechnen = true; + // Wenn eine Bewilligung mit Tagessatz speziell für die Abwesenheit existiert, prüfen ob der Betrag > 0 ist + if (scap.ApprovedFixedAmount != null) + { + if (GetTagespauschale(scap, start, true) == 0) + abrechenbar = false; + } + // Gibt es keine spezielle Bewilligung mit einem Betrag, darf nicht abgerechnet werden + else abrechenbar = false; break; } @@ -109,7 +128,9 @@ namespace MuenchenerAidsHilfeEV.Invoicing } if (abrechenbar) { - var pauschale = GetTagespauschale(scap, start, abwesend); + debug.Add(start); + // alsAbwesendAbrechnen ist nur true, wenn es für den Zeitraum eine Bewilligung mit Pauschalbetrag gibt + var pauschale = GetTagespauschale(scap, start, alsAbwesendAbrechnen); if (!tagessatz2unitCount.ContainsKey(pauschale)) tagessatz2unitCount.Add(pauschale, 1); diff --git a/ReportImp/MuenchenerAidsHilfeEV/MuenchenerAidsHilfeEV.csproj b/ReportImp/MuenchenerAidsHilfeEV/MuenchenerAidsHilfeEV.csproj index 5819a412a..f37efa919 100644 --- a/ReportImp/MuenchenerAidsHilfeEV/MuenchenerAidsHilfeEV.csproj +++ b/ReportImp/MuenchenerAidsHilfeEV/MuenchenerAidsHilfeEV.csproj @@ -31,6 +31,7 @@ 4 + @@ -42,6 +43,7 @@ + diff --git a/ReportImp/MuenchenerAidsHilfeEV/ServiceInvoiceReport.Designer.cs b/ReportImp/MuenchenerAidsHilfeEV/ServiceInvoiceReport.Designer.cs index c31787f26..4b2fa6587 100644 --- a/ReportImp/MuenchenerAidsHilfeEV/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/MuenchenerAidsHilfeEV/ServiceInvoiceReport.Designer.cs @@ -44,6 +44,13 @@ namespace MuenchenerAidsHilfeEV this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); this.lblEinrichtungsnummer = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); @@ -75,7 +82,6 @@ namespace MuenchenerAidsHilfeEV this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); this.DetailReport2 = new DevExpress.XtraReports.UI.DetailReportBand(); @@ -88,23 +94,18 @@ namespace MuenchenerAidsHilfeEV this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.ReportFooter2 = new DevExpress.XtraReports.UI.ReportFooterBand(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // @@ -231,6 +232,105 @@ namespace MuenchenerAidsHilfeEV this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // + // xrTable5 + // + this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 435.7917F); + this.xrTable5.Name = "xrTable5"; + this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow23}); + this.xrTable5.SizeF = new System.Drawing.SizeF(677F, 25F); + // + // xrTableRow23 + // + this.xrTableRow23.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell32, + this.xrTableCell37, + this.xrTableCell33, + this.xrTableCell36, + this.xrTableCell34}); + this.xrTableRow23.Name = "xrTableRow23"; + this.xrTableRow23.Weight = 1D; + // + // xrTableCell32 + // + this.xrTableCell32.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell32.Name = "xrTableCell32"; + this.xrTableCell32.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell32.StylePriority.UseBackColor = false; + this.xrTableCell32.StylePriority.UseBorderColor = false; + this.xrTableCell32.StylePriority.UseBorders = false; + this.xrTableCell32.StylePriority.UsePadding = false; + this.xrTableCell32.StylePriority.UseTextAlignment = false; + this.xrTableCell32.Text = "Zeitraum"; + this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell32.Weight = 0.75332349160221157D; + // + // xrTableCell37 + // + this.xrTableCell37.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell37.Name = "xrTableCell37"; + this.xrTableCell37.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell37.StylePriority.UseBackColor = false; + this.xrTableCell37.StylePriority.UseBorderColor = false; + this.xrTableCell37.StylePriority.UseBorders = false; + this.xrTableCell37.StylePriority.UsePadding = false; + this.xrTableCell37.StylePriority.UseTextAlignment = false; + this.xrTableCell37.Text = "Betreuungsschlüssel "; + this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell37.Weight = 0.7221196454948301D; + // + // xrTableCell33 + // + this.xrTableCell33.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell33.Name = "xrTableCell33"; + this.xrTableCell33.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell33.StylePriority.UseBackColor = false; + this.xrTableCell33.StylePriority.UseBorderColor = false; + this.xrTableCell33.StylePriority.UseBorders = false; + this.xrTableCell33.StylePriority.UsePadding = false; + this.xrTableCell33.StylePriority.UseTextAlignment = false; + this.xrTableCell33.Text = "Tage"; + this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell33.Weight = 0.4431314566991178D; + // + // xrTableCell36 + // + this.xrTableCell36.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell36.Name = "xrTableCell36"; + this.xrTableCell36.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell36.StylePriority.UseBackColor = false; + this.xrTableCell36.StylePriority.UseBorderColor = false; + this.xrTableCell36.StylePriority.UseBorders = false; + this.xrTableCell36.StylePriority.UsePadding = false; + this.xrTableCell36.StylePriority.UseTextAlignment = false; + this.xrTableCell36.Text = "Satz"; + this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell36.Weight = 0.44313146796853364D; + // + // xrTableCell34 + // + this.xrTableCell34.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell34.Name = "xrTableCell34"; + this.xrTableCell34.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell34.StylePriority.UseBackColor = false; + this.xrTableCell34.StylePriority.UseBorderColor = false; + this.xrTableCell34.StylePriority.UseBorders = false; + this.xrTableCell34.StylePriority.UsePadding = false; + this.xrTableCell34.StylePriority.UseTextAlignment = false; + this.xrTableCell34.Text = "Gesamt"; + this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell34.Weight = 0.63829393823530678D; + // // lblEinrichtungsnummer // this.lblEinrichtungsnummer.BackColor = System.Drawing.Color.Transparent; @@ -571,17 +671,6 @@ namespace MuenchenerAidsHilfeEV this.xrTableCell1.StylePriority.UseTextAlignment = false; this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; this.xrTableCell1.Weight = 1D; - // - // xrLabel15 - // - this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 67.08334F); - this.xrLabel15.Multiline = true; - this.xrLabel15.Name = "xrLabel15"; - this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel15.SizeF = new System.Drawing.SizeF(666.9999F, 59.50002F); - this.xrLabel15.StylePriority.UseFont = false; - this.xrLabel15.Text = "Zahlung sofort nach Rechnungserhalt ohne Abzug.\r\n\r\nDiese Rechnung wurde maschinel" + - "l erstellt und ist ohne Unterschrift gültig."; // // DetailReport // @@ -607,7 +696,6 @@ namespace MuenchenerAidsHilfeEV this.DetailReport2.DataSource = this.bindingSource1; this.DetailReport2.Level = 0; this.DetailReport2.Name = "DetailReport2"; - this.DetailReport2.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand; // // Detail3 // @@ -714,11 +802,16 @@ namespace MuenchenerAidsHilfeEV // // GroupFooter1 // - this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.GroupFooter1.HeightF = 0F; + this.GroupFooter1.Name = "GroupFooter1"; + // + // ReportFooter2 + // + this.ReportFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabel1, this.xrLabel15}); - this.GroupFooter1.HeightF = 126.5834F; - this.GroupFooter1.Name = "GroupFooter1"; + this.ReportFooter2.HeightF = 111.4583F; + this.ReportFooter2.Name = "ReportFooter2"; // // xrLabel1 // @@ -726,7 +819,7 @@ namespace MuenchenerAidsHilfeEV new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim", "Gesamtsumme: {0}")}); this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(420.9999F, 0F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(420.9967F, 0F); this.xrLabel1.Name = "xrLabel1"; this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F); this.xrLabel1.SizeF = new System.Drawing.SizeF(255.8333F, 25F); @@ -736,104 +829,16 @@ namespace MuenchenerAidsHilfeEV this.xrLabel1.Text = "xrLabel1"; this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; // - // xrTable5 + // xrLabel15 // - this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 435.7917F); - this.xrTable5.Name = "xrTable5"; - this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow23}); - this.xrTable5.SizeF = new System.Drawing.SizeF(677F, 25F); - // - // xrTableRow23 - // - this.xrTableRow23.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell32, - this.xrTableCell37, - this.xrTableCell33, - this.xrTableCell36, - this.xrTableCell34}); - this.xrTableRow23.Name = "xrTableRow23"; - this.xrTableRow23.Weight = 1D; - // - // xrTableCell32 - // - this.xrTableCell32.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell32.Name = "xrTableCell32"; - this.xrTableCell32.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell32.StylePriority.UseBackColor = false; - this.xrTableCell32.StylePriority.UseBorderColor = false; - this.xrTableCell32.StylePriority.UseBorders = false; - this.xrTableCell32.StylePriority.UsePadding = false; - this.xrTableCell32.StylePriority.UseTextAlignment = false; - this.xrTableCell32.Text = "Zeitraum"; - this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell32.Weight = 0.75332349160221157D; - // - // xrTableCell37 - // - this.xrTableCell37.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell37.Name = "xrTableCell37"; - this.xrTableCell37.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell37.StylePriority.UseBackColor = false; - this.xrTableCell37.StylePriority.UseBorderColor = false; - this.xrTableCell37.StylePriority.UseBorders = false; - this.xrTableCell37.StylePriority.UsePadding = false; - this.xrTableCell37.StylePriority.UseTextAlignment = false; - this.xrTableCell37.Text = "Betreuungsschlüssel "; - this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell37.Weight = 0.7221196454948301D; - // - // xrTableCell33 - // - this.xrTableCell33.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell33.Name = "xrTableCell33"; - this.xrTableCell33.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell33.StylePriority.UseBackColor = false; - this.xrTableCell33.StylePriority.UseBorderColor = false; - this.xrTableCell33.StylePriority.UseBorders = false; - this.xrTableCell33.StylePriority.UsePadding = false; - this.xrTableCell33.StylePriority.UseTextAlignment = false; - this.xrTableCell33.Text = "Tage"; - this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell33.Weight = 0.4431314566991178D; - // - // xrTableCell36 - // - this.xrTableCell36.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell36.Name = "xrTableCell36"; - this.xrTableCell36.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell36.StylePriority.UseBackColor = false; - this.xrTableCell36.StylePriority.UseBorderColor = false; - this.xrTableCell36.StylePriority.UseBorders = false; - this.xrTableCell36.StylePriority.UsePadding = false; - this.xrTableCell36.StylePriority.UseTextAlignment = false; - this.xrTableCell36.Text = "Satz"; - this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell36.Weight = 0.44313146796853364D; - // - // xrTableCell34 - // - this.xrTableCell34.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell34.Name = "xrTableCell34"; - this.xrTableCell34.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell34.StylePriority.UseBackColor = false; - this.xrTableCell34.StylePriority.UseBorderColor = false; - this.xrTableCell34.StylePriority.UseBorders = false; - this.xrTableCell34.StylePriority.UsePadding = false; - this.xrTableCell34.StylePriority.UseTextAlignment = false; - this.xrTableCell34.Text = "Gesamt"; - this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell34.Weight = 0.63829393823530678D; + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 51.95827F); + this.xrLabel15.Multiline = true; + this.xrLabel15.Name = "xrLabel15"; + this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel15.SizeF = new System.Drawing.SizeF(666.9999F, 59.50002F); + this.xrLabel15.StylePriority.UseFont = false; + this.xrLabel15.Text = "Zahlung sofort nach Rechnungserhalt ohne Abzug.\r\n\r\nDiese Rechnung wurde maschinel" + + "l erstellt und ist ohne Unterschrift gültig."; // // bindingSource1 // @@ -847,7 +852,8 @@ namespace MuenchenerAidsHilfeEV this.topMarginBand1, this.bottomMarginBand1, this.Page1, - this.DetailReport}); + this.DetailReport, + this.ReportFooter2}); this.DataSource = this.bindingSource1; this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; this.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { @@ -865,10 +871,10 @@ namespace MuenchenerAidsHilfeEV ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); @@ -889,7 +895,6 @@ namespace MuenchenerAidsHilfeEV private DevExpress.XtraReports.UI.XRTable xrTable2; private DevExpress.XtraReports.UI.XRTableRow xrTableRow4; private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; - private DevExpress.XtraReports.UI.XRLabel xrLabel15; private DevExpress.XtraReports.UI.DetailReportBand DetailReport; private DevExpress.XtraReports.UI.DetailBand Detail1; private DevExpress.XtraReports.UI.DetailReportBand DetailReport2; @@ -903,7 +908,6 @@ namespace MuenchenerAidsHilfeEV private DevExpress.XtraReports.UI.XRTableCell xrTableCell47; private DevExpress.XtraReports.UI.XRLabel lblAdresse; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; - private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; private DevExpress.XtraReports.UI.XRLabel xrLabel6; private DevExpress.XtraReports.UI.XRLabel xrLabel10; @@ -941,5 +945,8 @@ namespace MuenchenerAidsHilfeEV private DevExpress.XtraReports.UI.XRTableCell xrTableCell33; private DevExpress.XtraReports.UI.XRTableCell xrTableCell36; private DevExpress.XtraReports.UI.XRTableCell xrTableCell34; + private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter2; + private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRLabel xrLabel15; } }