From 68795f1565792da65833994a363ff8403db41be0 Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Thu, 16 May 2024 13:53:55 +0200 Subject: [PATCH 1/5] MH: TeamPfeil Summen bei Rechnungspositionen --- ReportImp/TeamPfeil/ServiceInvoiceReportQualifikation.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReportImp/TeamPfeil/ServiceInvoiceReportQualifikation.cs b/ReportImp/TeamPfeil/ServiceInvoiceReportQualifikation.cs index 1155b0942..9c601b31d 100644 --- a/ReportImp/TeamPfeil/ServiceInvoiceReportQualifikation.cs +++ b/ReportImp/TeamPfeil/ServiceInvoiceReportQualifikation.cs @@ -81,7 +81,7 @@ namespace TeamPfeil { pRO.NotBillableNote += "\n \t \t \t "; } - pRO.NotBillableNote += string.Format("{0:0.##} h x {1:0.00} € {2}", ii.Hours, ii.HourlyRate, ii.ServiceDescription); + pRO.NotBillableNote += string.Format("{0:0.##} h x {1:0.00} € {2} = {3:c}", ii.Hours, ii.HourlyRate, ii.ServiceDescription, ii.NetAmount); } } } From d96cbc488b5dea7f3fc420e200d9fc2823922653 Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Fri, 17 May 2024 10:55:35 +0200 Subject: [PATCH 2/5] MH: VKM Hamm Stundenkonto Hotfix --- ...stomerMitarbeiterstundenkontoBerechnung.cs | 17 +++--- .../VkmHamm/Mitarbeiterarbeitszeitkonto.cs | 5 +- .../Mitarbeiterarbeitszeitkonto.designer.cs | 60 +++++++++++++++---- .../Mitarbeiterstundenkonto.designer.cs | 42 ++++++------- 4 files changed, 83 insertions(+), 41 deletions(-) diff --git a/ReportImp/VkmHamm/CustomerMitarbeiterstundenkontoBerechnung.cs b/ReportImp/VkmHamm/CustomerMitarbeiterstundenkontoBerechnung.cs index 33c5a23de..b311726ee 100644 --- a/ReportImp/VkmHamm/CustomerMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/VkmHamm/CustomerMitarbeiterstundenkontoBerechnung.cs @@ -277,7 +277,7 @@ namespace VkmHamm { base.CreateEmployeeDetails(ro); - if (ro.EmployeeDetailList.Count > 0) + if (ro.ReportStartDate >= new DateTime(2024, 02, 01) && ro.EmployeeDetailList.Count > 0) { foreach (var ed in ro.EmployeeDetailList) { @@ -304,9 +304,9 @@ namespace VkmHamm if (ed.Ueberstunden > toleranzstundenVorFaktor.Value) { var ueberstundenFuerFaktor = ed.Ueberstunden.Value - toleranzstundenVorFaktor.Value; - ed.Custom15 = ueberstundenFuerFaktor * (1 + toleranzstundenVorFaktor.Value / ed.SollProWoche); + ed.Custom15 = ueberstundenFuerFaktor * 1.25m; // Auf Stunden, die den Korridor überschritten haben, kommt der Faktor 1,25 drauf - ed.Ueberstunden = toleranzstundenVorFaktor; + ed.Ueberstunden = toleranzstundenVorFaktor; // Ãœberstunden werden dann auf die Korridorstunden gesetzt, da die Stunden mit Faktor extra dargestellt werden ed.UeberstundenGesamt += (ed.Ueberstunden + ed.Custom15) - (ed.Ueberstunden + ueberstundenFuerFaktor); } } @@ -317,6 +317,9 @@ namespace VkmHamm } protected override decimal? BerechneUeberstunden(MitarbeiterstundenkontoRO.EmployeeDetail ed, decimal? ueberstundenStd, Contract contract, DateTime start, DateTime ende) { + if (start < new DateTime(2024, 02, 01)) + return ueberstundenStd; + if (ed.UeberstundenVormonat == null) ed.UeberstundenVormonat = 0; if (ed.UeberstundenGesamt == null) @@ -328,7 +331,7 @@ namespace VkmHamm { var toleranzstundenVorFaktor = contract.ProbationPeriod2.Value; var ueberstundenFuerFaktor = ueberstunden - toleranzstundenVorFaktor; - var bonusDurchKorridorStunden = ueberstundenFuerFaktor * (1 + toleranzstundenVorFaktor / ed.SollProWoche) - ueberstundenFuerFaktor; + var bonusDurchKorridorStunden = ueberstundenFuerFaktor * 1.25m - ueberstundenFuerFaktor; ed.UeberstundenGesamt += ueberstunden + bonusDurchKorridorStunden + ed.UeberstundenVormonat; @@ -399,21 +402,21 @@ namespace VkmHamm private bool IsUrlaubAbsenceServiceRecord(ServiceRecord item) { - if (item.Notice != null && item.Notice.Length > 0 && item.Notice.Trim().ToLower() == "urlaub") + if (item.Start.HasValue && item.Start.Value >= new DateTime(2024, 04, 1) && item.Notice != null && item.Notice.Length > 0 && item.Notice.Trim().ToLower() == "urlaub") return true; return false; } private bool IsKrankAbsenceServiceRecord(ServiceRecord item) { - if (item.Notice != null && item.Notice.Length > 0 && item.Notice.Trim().ToLower() == "krank") + if (item.Start.HasValue && item.Start.Value >= new DateTime(2024, 04, 1) && item.Notice != null && item.Notice.Length > 0 && item.Notice.Trim().ToLower() == "krank") return true; return false; } public virtual bool IsServiceRecordFehlzeit(ServiceRecord sr) { - if (sr.Notice != null && sr.Notice.Length > 0 && (sr.Notice.Trim().ToLower() == "krank" || sr.Notice.Trim().ToLower() == "urlaub")) + if (sr.Start.HasValue && sr.Start.Value >= new DateTime(2024, 04, 1) && sr.Notice != null && sr.Notice.Length > 0 && (sr.Notice.Trim().ToLower() == "krank" || sr.Notice.Trim().ToLower() == "urlaub")) return true; return false; } diff --git a/ReportImp/VkmHamm/Mitarbeiterarbeitszeitkonto.cs b/ReportImp/VkmHamm/Mitarbeiterarbeitszeitkonto.cs index db7cd6ac9..4dea1616d 100644 --- a/ReportImp/VkmHamm/Mitarbeiterarbeitszeitkonto.cs +++ b/ReportImp/VkmHamm/Mitarbeiterarbeitszeitkonto.cs @@ -39,7 +39,10 @@ namespace VkmHamm { ed.Regelarbeitszeit = String.Format("{0:0.00} Stunden pro Woche", c.WeeklyTotalHours); } - } + + tcStundenkorridor.Text = String.Format("{0:0.00}", c.ProbationPeriod2); + + } ed.UrlaubUndKrankheit = 0; foreach (var day in ed.Days) diff --git a/ReportImp/VkmHamm/Mitarbeiterarbeitszeitkonto.designer.cs b/ReportImp/VkmHamm/Mitarbeiterarbeitszeitkonto.designer.cs index 61c502a41..925949950 100644 --- a/ReportImp/VkmHamm/Mitarbeiterarbeitszeitkonto.designer.cs +++ b/ReportImp/VkmHamm/Mitarbeiterarbeitszeitkonto.designer.cs @@ -124,6 +124,9 @@ namespace VkmHamm this.fieldSumHoliday2 = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldIstArbeitszeit = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldUeberstundenGesamt = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow(); + this.tcStundenkorridor = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); @@ -399,7 +402,7 @@ namespace VkmHamm this.lblMonat, this.xrTable2}); this.GroupHeader3.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.GroupHeader3.HeightF = 120F; + this.GroupHeader3.HeightF = 136.6667F; this.GroupHeader3.Level = 1; this.GroupHeader3.Name = "GroupHeader3"; this.GroupHeader3.PageBreak = DevExpress.XtraReports.UI.PageBreak.BeforeBand; @@ -427,8 +430,9 @@ namespace VkmHamm this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow1, this.xrTableRow8, - this.xrTableRow10}); - this.xrTable2.SizeF = new System.Drawing.SizeF(552.2002F, 54F); + this.xrTableRow10, + this.xrTableRow7}); + this.xrTable2.SizeF = new System.Drawing.SizeF(623.0334F, 72F); this.xrTable2.StylePriority.UseBorders = false; this.xrTable2.StylePriority.UseFont = false; this.xrTable2.StylePriority.UsePadding = false; @@ -453,7 +457,7 @@ namespace VkmHamm this.xrTableCell1.StylePriority.UseTextAlignment = false; this.xrTableCell1.Text = "Mitarbeiter/in:"; this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell1.Weight = 0.138246012405208D; + this.xrTableCell1.Weight = 0.24072693199653611D; // // xrTableCell25 // @@ -465,7 +469,7 @@ namespace VkmHamm this.xrTableCell25.StylePriority.UseFont = false; this.xrTableCell25.StylePriority.UseTextAlignment = false; this.xrTableCell25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell25.Weight = 0.49791629021026568D; + this.xrTableCell25.Weight = 0.47703886236140913D; // // xrTableRow8 // @@ -485,7 +489,7 @@ namespace VkmHamm this.xrTableCell6.StylePriority.UseTextAlignment = false; this.xrTableCell6.Text = "Regelarbeitszeit:"; this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell6.Weight = 0.138246012405208D; + this.xrTableCell6.Weight = 0.24072693199653611D; // // cellRegelarbeitszeit // @@ -496,7 +500,7 @@ namespace VkmHamm this.cellRegelarbeitszeit.StylePriority.UseTextAlignment = false; this.cellRegelarbeitszeit.Text = "cellRegelarbeitszeit"; this.cellRegelarbeitszeit.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.cellRegelarbeitszeit.Weight = 0.49791629021026573D; + this.cellRegelarbeitszeit.Weight = 0.47703886236140919D; // // xrTableRow10 // @@ -518,7 +522,7 @@ namespace VkmHamm this.xrTableCell21.StylePriority.UseTextAlignment = false; this.xrTableCell21.Text = "Soll-Stunden:"; this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell21.Weight = 0.138246012405208D; + this.xrTableCell21.Weight = 0.24072693199653611D; // // xrTableCell24 // @@ -527,7 +531,7 @@ namespace VkmHamm this.xrTableCell24.Name = "xrTableCell24"; this.xrTableCell24.StylePriority.UseTextAlignment = false; this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell24.Weight = 0.17215478017129932D; + this.xrTableCell24.Weight = 0.12036345318862508D; // // xrTableCell28 // @@ -537,7 +541,7 @@ namespace VkmHamm this.xrTableCell28.StylePriority.UseTextAlignment = false; this.xrTableCell28.Text = "Arbeitstage diesen Monat:"; this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell28.Weight = 0.213129273221085D; + this.xrTableCell28.Weight = 0.21404195164570988D; // // xrTableCell23 // @@ -547,7 +551,7 @@ namespace VkmHamm this.xrTableCell23.StylePriority.UseFont = false; this.xrTableCell23.StylePriority.UseTextAlignment = false; this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell23.Weight = 0.11263223681788141D; + this.xrTableCell23.Weight = 0.14263345752707424D; // // GroupFooter2 // @@ -784,7 +788,7 @@ namespace VkmHamm this.xrTableCell32.StylePriority.UseBorders = false; this.xrTableCell32.StylePriority.UsePadding = false; this.xrTableCell32.StylePriority.UseTextAlignment = false; - this.xrTableCell32.Text = "Korridorstunden"; + this.xrTableCell32.Text = "Korridorstunden mit Faktor"; this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell32.Weight = 0.22133305845875073D; // @@ -1082,6 +1086,35 @@ namespace VkmHamm this.fieldUeberstundenGesamt.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldUeberstundenGesamt.Name = "fieldUeberstundenGesamt"; // + // xrTableRow7 + // + this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell36, + this.tcStundenkorridor}); + this.xrTableRow7.Name = "xrTableRow7"; + this.xrTableRow7.Weight = 0.75540991165010141D; + // + // tcStundenkorridor + // + this.tcStundenkorridor.Multiline = true; + this.tcStundenkorridor.Name = "tcStundenkorridor"; + this.tcStundenkorridor.StylePriority.UseTextAlignment = false; + this.tcStundenkorridor.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.tcStundenkorridor.Weight = 0.47703886236140919D; + // + // xrTableCell36 + // + this.xrTableCell36.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell36.Multiline = true; + this.xrTableCell36.Name = "xrTableCell36"; + this.xrTableCell36.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell36.StylePriority.UseFont = false; + this.xrTableCell36.StylePriority.UsePadding = false; + this.xrTableCell36.StylePriority.UseTextAlignment = false; + this.xrTableCell36.Text = "Monatlicher Stundenkorridor:"; + this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell36.Weight = 0.24072693199653614D; + // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); @@ -1224,5 +1257,8 @@ namespace VkmHamm private DevExpress.XtraReports.UI.XRTableCell xrTableCell30; private DevExpress.XtraReports.UI.XRTableCell xrTableCell32; private DevExpress.XtraReports.UI.XRTableCell xrTableCell33; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow7; + private DevExpress.XtraReports.UI.XRTableCell tcStundenkorridor; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell36; } } diff --git a/ReportImp/VkmHamm/Mitarbeiterstundenkonto.designer.cs b/ReportImp/VkmHamm/Mitarbeiterstundenkonto.designer.cs index ba3e3bc27..4006f1987 100644 --- a/ReportImp/VkmHamm/Mitarbeiterstundenkonto.designer.cs +++ b/ReportImp/VkmHamm/Mitarbeiterstundenkonto.designer.cs @@ -42,6 +42,7 @@ namespace VkmHamm this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); @@ -55,6 +56,7 @@ namespace VkmHamm this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); @@ -68,6 +70,7 @@ namespace VkmHamm this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.lblMonat = new DevExpress.XtraReports.UI.XRLabel(); this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand(); @@ -80,9 +83,6 @@ namespace VkmHamm this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); - this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -201,6 +201,13 @@ namespace VkmHamm this.xrTableCell25.Text = "xrTableCell25"; this.xrTableCell25.Weight = 0.09017132551848514D; // + // xrTableCell8 + // + this.xrTableCell8.Multiline = true; + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.Text = "[Custom15!0.00]"; + this.xrTableCell8.Weight = 0.09017132551848514D; + // // xrTableCell24 // this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -318,6 +325,13 @@ namespace VkmHamm this.xrTableCell13.Text = "Überstd. neu"; this.xrTableCell13.Weight = 0.090171327991870776D; // + // xrTableCell7 + // + this.xrTableCell7.Multiline = true; + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Text = "Korridorstunden mit Faktor"; + this.xrTableCell7.Weight = 0.090171327991870776D; + // // xrTableCell14 // this.xrTableCell14.Name = "xrTableCell14"; @@ -422,6 +436,10 @@ namespace VkmHamm this.xrTableCell51.Name = "xrTableCell51"; this.xrTableCell51.Weight = 0.085078439807117892D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); + // // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -528,24 +546,6 @@ namespace VkmHamm this.bottomMarginBand1.HeightF = 30F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // - // xrTableCell7 - // - this.xrTableCell7.Multiline = true; - this.xrTableCell7.Name = "xrTableCell7"; - this.xrTableCell7.Text = "Korridorstunden"; - this.xrTableCell7.Weight = 0.090171327991870776D; - // - // xrTableCell8 - // - this.xrTableCell8.Multiline = true; - this.xrTableCell8.Name = "xrTableCell8"; - this.xrTableCell8.Text = "[Custom15!0.00]"; - this.xrTableCell8.Weight = 0.09017132551848514D; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); - // // Mitarbeiterstundenkonto // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { From f25db17b69582006374d2b997cb39538bfcb4174 Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Fri, 17 May 2024 14:06:26 +0200 Subject: [PATCH 3/5] =?UTF-8?q?MH:=20Abwesenheitspr=C3=BCfung=20Feinschlif?= =?UTF-8?q?f?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../VkmHamm/CustomerMitarbeiterstundenkontoBerechnung.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ReportImp/VkmHamm/CustomerMitarbeiterstundenkontoBerechnung.cs b/ReportImp/VkmHamm/CustomerMitarbeiterstundenkontoBerechnung.cs index b311726ee..a87743712 100644 --- a/ReportImp/VkmHamm/CustomerMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/VkmHamm/CustomerMitarbeiterstundenkontoBerechnung.cs @@ -50,7 +50,7 @@ namespace VkmHamm { var dd = dayToDetail[sr.Start.Value.Day]; - if (!IsServiceRecordFehlzeit(sr) && AddServiceRecordToDuration(sr)) + if (/*!IsServiceRecordFehlzeit(sr) && */AddServiceRecordToDuration(sr)) { decimal duration = GetDuration(sr, ed); if (IsUrlaubAbsenceServiceRecord(sr)) @@ -200,7 +200,7 @@ namespace VkmHamm { if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null) { - if (item.ServiceDescription.ServiceCategory.Name == "Arbeitszeit") + if (item.ServiceDescription.ServiceCategory.Name == "Arbeitszeit" && !IsKrankAbsenceServiceRecord(item) && !IsUrlaubAbsenceServiceRecord(item)) { return true; } From a78db393e828b531115cf4b40ebbc6b769033089 Mon Sep 17 00:00:00 2001 From: Kojo Date: Fri, 17 May 2024 14:17:42 +0200 Subject: [PATCH 4/5] =?UTF-8?q?HphBersenbrueckFreizeitUndReisen:=20Rechnun?= =?UTF-8?q?g=20auch=20f=C3=BCr=20Tagesfahrten?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Abrechnung/CustomInvoiceCreation.cs | 54 ++++++++++++++----- 1 file changed, 42 insertions(+), 12 deletions(-) diff --git a/ReportImp/HphBersenbrueckFreizeitUndReisen/Abrechnung/CustomInvoiceCreation.cs b/ReportImp/HphBersenbrueckFreizeitUndReisen/Abrechnung/CustomInvoiceCreation.cs index 9a5791d71..c4db343f0 100644 --- a/ReportImp/HphBersenbrueckFreizeitUndReisen/Abrechnung/CustomInvoiceCreation.cs +++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/Abrechnung/CustomInvoiceCreation.cs @@ -34,7 +34,7 @@ namespace HphBersenbrueckFreizeitUndReisen.Abrechnung //Reisen sollen getrennt abgerechnet werden. List serviceRecordsReise = new List(); List serviceRecordsKurzurlaub = new List(); - //List serviceRecordsTagesfahrt = new List(); + List serviceRecordsTagesfahrt = new List(); List serviceRecordsNichtUrlaubUndReise = new List(); foreach (var item in alleServiceRecords) @@ -45,10 +45,16 @@ namespace HphBersenbrueckFreizeitUndReisen.Abrechnung } else if (item.ServiceDescription.Name.ToLower().Contains("kurzurlaub")) { + // keine zweite Rechnung aufmachen, deshalb zu Reisen serviceRecordsReise.Add(item); } - else - { + else if (item.ServiceDescription.Name.ToLower().Contains("tagesfahrt")) + { + // keine zweite Rechnung aufmachen, deshalb zu Reisen + serviceRecordsReise.Add(item); + } + else + { serviceRecordsNichtUrlaubUndReise.Add(item); } } @@ -119,7 +125,6 @@ namespace HphBersenbrueckFreizeitUndReisen.Abrechnung { invoiceList.AddRange(invoices); invoiceCounter++; - } } if (serviceRecordsKurzurlaub.Count > 0) @@ -130,7 +135,16 @@ namespace HphBersenbrueckFreizeitUndReisen.Abrechnung { invoiceList.AddRange(invoices); invoiceCounter++; + } + } + if (serviceRecordsTagesfahrt.Count > 0) + { + var invoices = CreatePflegekassenRechnungen(invoiceCounter, pflegekasse, customer, invoicePeriod, sc, serviceRecordsTagesfahrt); + if (invoices != null && invoices.Count > 0) + { + invoiceList.AddRange(invoices); + invoiceCounter++; } } } @@ -145,10 +159,8 @@ namespace HphBersenbrueckFreizeitUndReisen.Abrechnung { SetzeInvoiceItemDescription(rg, pflegekassenRechnungen); - invoiceList.Add(rg); invoiceCounter++; - } } @@ -179,16 +191,26 @@ namespace HphBersenbrueckFreizeitUndReisen.Abrechnung invoiceCounter++; } } - } - } - + if (serviceRecordsTagesfahrt.Count > 0) + { + var rglist = CreateSelbstzahlerRechnungen(invoiceCounter, customer, invoicePeriod, sc, serviceRecordsTagesfahrt); + + foreach (var rg in rglist) + { + if (rg.GetTotalClaim() > 0) + { + invoiceList.Add(rg); + invoiceCounter++; + } + } + } + } + if (invoiceList.Count == 0) { //return base.GenerateServiceInvoices(costBearerOid, invoicePeriod, supportConcepts2ServiceRecords); } - - } var result = invoiceList.Select(item => MapperFactory.ServiceInvoiceDC_ServiceInvoice.MapToNewDC(item)).ToList(); @@ -280,16 +302,20 @@ namespace HphBersenbrueckFreizeitUndReisen.Abrechnung { return info.ServiceDescription; } - if (desc.Contains("reisen") || desc.Contains("kurzurlaub")) + if (desc.Contains("reisen") || desc.Contains("kurzurlaub") || desc.Contains("tagesfahrt")) { if (info.Pflegegrad.HasValue && info.Pflegegrad.Value != Pflegegrad.KeinGrad && info.Pflegegrad.Value != Pflegegrad.PflegegradBeantragt) { if (desc.Contains("kurzurlaub")) return "Betreuungskosten Kurzurlaub mit Pflegegrad"; + if (desc.Contains("tagesfahrt")) + return "Betreuungskosten Tagesfahrt mit Pflegegrad"; return "Betreuungskosten mit Pflegegrad"; } if (desc.Contains("kurzurlaub")) return "Betreuungskosten Kurzurlaub ohne Pflegegrad"; + if (desc.Contains("tagesfahrt")) + return "Betreuungskosten Tagesfahrt ohne Pflegegrad"; return "Betreuungskosten ohne Pflegegrad"; } if (cat.Contains("§45")) @@ -380,6 +406,10 @@ namespace HphBersenbrueckFreizeitUndReisen.Abrechnung { minuten = 60; } + else if (sr.ServiceDescription.Name.Contains("Tagesfahrt")) + { + minuten = 60; + } else if (sr.ServiceDescription.Name.ToLower().Contains("reisen")) { //Setze Minuten auf 60 * Anzahl Tage From 88263b9d174557660bd9d757241570a7d038004f Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Fri, 17 May 2024 14:28:01 +0200 Subject: [PATCH 5/5] MH: PROgymnasiumBensberg Rechnungsadresse + Unterschrift Klient weg --- .../Invoicing/SettlementInvoiceCreation.cs | 9 +- .../Quittierungsbeleg.Designer.cs | 53 +- .../PROgymnasiumBensberg/Quittierungsbeleg.cs | 2 +- .../SettlementReport2.Designer.cs | 796 ++++++++++-------- 4 files changed, 444 insertions(+), 416 deletions(-) diff --git a/ReportImp/PROgymnasiumBensberg/Invoicing/SettlementInvoiceCreation.cs b/ReportImp/PROgymnasiumBensberg/Invoicing/SettlementInvoiceCreation.cs index d333d8857..4c5be7eae 100644 --- a/ReportImp/PROgymnasiumBensberg/Invoicing/SettlementInvoiceCreation.cs +++ b/ReportImp/PROgymnasiumBensberg/Invoicing/SettlementInvoiceCreation.cs @@ -47,5 +47,12 @@ namespace PROgymnasiumBensberg { return c2s.ServiceRecords.OrderBy(s => s.Start).Where(s => !s.ServiceDescription.ServiceCategory.Name.ToLower().Contains("assistenz")).ToList(); } - } + + public override void CreateRecipientInformation(Settlement2DC settlementInvoice, CostBearer2SupportConcept c2s) + { + base.CreateRecipientInformation(settlementInvoice, c2s); + + settlementInvoice.RecipientPostBox = c2s.CostBearer.Organisation.Address.AddressLine1; + } + } } diff --git a/ReportImp/PROgymnasiumBensberg/Quittierungsbeleg.Designer.cs b/ReportImp/PROgymnasiumBensberg/Quittierungsbeleg.Designer.cs index 8037227a3..4afdc0cf5 100644 --- a/ReportImp/PROgymnasiumBensberg/Quittierungsbeleg.Designer.cs +++ b/ReportImp/PROgymnasiumBensberg/Quittierungsbeleg.Designer.cs @@ -124,9 +124,6 @@ namespace PROgymnasiumBensberg this.tcOptional2 = new DevExpress.XtraReports.UI.XRTableCell(); this.tcSummeStundenMitFaktor = new DevExpress.XtraReports.UI.XRTableCell(); this.lblFehlkontakt = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); - this.lblUnterschriftKlient = new DevExpress.XtraReports.UI.XRLabel(); this.lblUnterschriftMitarbeiter = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); @@ -845,15 +842,12 @@ namespace PROgymnasiumBensberg this.xrTableAbwesenheiten, this.xrTable1, this.lblFehlkontakt, - this.xrLabel18, - this.xrPictureBox2, - this.lblUnterschriftKlient, this.lblUnterschriftMitarbeiter, this.xrLabel13, this.xrLabel12, this.xrPictureBox1, this.xrLabel17}); - this.GroupFooter1.HeightF = 402.9168F; + this.GroupFooter1.HeightF = 412.9168F; this.GroupFooter1.KeepTogether = true; this.GroupFooter1.Name = "GroupFooter1"; // @@ -1320,47 +1314,11 @@ namespace PROgymnasiumBensberg this.lblFehlkontakt.Text = "F = Fehlkontakt"; this.lblFehlkontakt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; // - // xrLabel18 - // - this.xrLabel18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerSignatureDate", "{0:dd.MM.yyyy}")}); - this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(0F, 347.4168F); - this.xrLabel18.Name = "xrLabel18"; - this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel18.SizeF = new System.Drawing.SizeF(137.3333F, 35.50002F); - this.xrLabel18.StylePriority.UseTextAlignment = false; - this.xrLabel18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; - // - // xrPictureBox2 - // - this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "CustomerSignature")}); - this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(137.3332F, 347.4168F); - this.xrPictureBox2.Name = "xrPictureBox2"; - this.xrPictureBox2.SizeF = new System.Drawing.SizeF(199.3611F, 35.50002F); - this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - // - // lblUnterschriftKlient - // - this.lblUnterschriftKlient.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.lblUnterschriftKlient.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(0F, 382.9168F); - this.lblUnterschriftKlient.Name = "lblUnterschriftKlient"; - this.lblUnterschriftKlient.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.lblUnterschriftKlient.SizeF = new System.Drawing.SizeF(336.6944F, 20F); - this.lblUnterschriftKlient.StylePriority.UseBackColor = false; - this.lblUnterschriftKlient.StylePriority.UseBorders = false; - this.lblUnterschriftKlient.StylePriority.UseFont = false; - this.lblUnterschriftKlient.StylePriority.UsePadding = false; - this.lblUnterschriftKlient.StylePriority.UseTextAlignment = false; - this.lblUnterschriftKlient.Text = "Datum, Unterschrift Klient/in"; - this.lblUnterschriftKlient.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - // // lblUnterschriftMitarbeiter // this.lblUnterschriftMitarbeiter.Borders = DevExpress.XtraPrinting.BorderSide.Top; this.lblUnterschriftMitarbeiter.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.lblUnterschriftMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(398.3054F, 382.9168F); + this.lblUnterschriftMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(402.7501F, 392.9168F); this.lblUnterschriftMitarbeiter.Name = "lblUnterschriftMitarbeiter"; this.lblUnterschriftMitarbeiter.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.lblUnterschriftMitarbeiter.SizeF = new System.Drawing.SizeF(336.6944F, 19.99998F); @@ -1406,7 +1364,7 @@ namespace PROgymnasiumBensberg // this.xrPictureBox1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "EmployeeSignature")}); - this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(535.6388F, 347.4168F); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(540.0834F, 357.4168F); this.xrPictureBox1.Name = "xrPictureBox1"; this.xrPictureBox1.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint"; this.xrPictureBox1.SizeF = new System.Drawing.SizeF(199.3611F, 35.50002F); @@ -1417,7 +1375,7 @@ namespace PROgymnasiumBensberg this.xrLabel17.BackColor = System.Drawing.Color.Transparent; this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeSignatureDate", "{0:dd.MM.yyyy}")}); - this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(398.8098F, 347.4168F); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(403.2545F, 357.4168F); this.xrLabel17.Name = "xrLabel17"; this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel17.SizeF = new System.Drawing.SizeF(136.8289F, 35.50002F); @@ -1521,13 +1479,10 @@ namespace PROgymnasiumBensberg private DevExpress.XtraReports.UI.CalculatedField fieldKontaktArt; private DevExpress.XtraReports.UI.XRLabel xrLabel13; private DevExpress.XtraReports.UI.XRLabel xrLabel12; - private DevExpress.XtraReports.UI.XRLabel lblUnterschriftKlient; private DevExpress.XtraReports.UI.XRLabel lblUnterschriftMitarbeiter; private DevExpress.XtraReports.UI.XRPictureBox picSignature; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; private DevExpress.XtraReports.UI.XRLabel xrLabel17; - private DevExpress.XtraReports.UI.XRLabel xrLabel18; - private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2; private DevExpress.XtraReports.UI.XRLabel lblFehlkontakt; private DevExpress.XtraReports.UI.XRTable xrTable1; private DevExpress.XtraReports.UI.XRTableRow xrTableRow9; diff --git a/ReportImp/PROgymnasiumBensberg/Quittierungsbeleg.cs b/ReportImp/PROgymnasiumBensberg/Quittierungsbeleg.cs index 39f6d51ee..eec64e46a 100644 --- a/ReportImp/PROgymnasiumBensberg/Quittierungsbeleg.cs +++ b/ReportImp/PROgymnasiumBensberg/Quittierungsbeleg.cs @@ -197,7 +197,7 @@ namespace PROgymnasiumBensberg if (newRows > 0) { - lblUnterschriftKlient.Top += newRows * 20; + //lblUnterschriftKlient.Top += newRows * 20; lblUnterschriftMitarbeiter.Top += newRows * 20; } } diff --git a/ReportImp/PROgymnasiumBensberg/SettlementReport2.Designer.cs b/ReportImp/PROgymnasiumBensberg/SettlementReport2.Designer.cs index 5838552a2..244115a4f 100644 --- a/ReportImp/PROgymnasiumBensberg/SettlementReport2.Designer.cs +++ b/ReportImp/PROgymnasiumBensberg/SettlementReport2.Designer.cs @@ -34,18 +34,21 @@ namespace PROgymnasiumBensberg DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); this.rowErbrachteLeistung = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); - this.RecipientPostCodeAndTown = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel_RecipientStreet = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel_RecipientDivision = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel_RecipientContactPerson = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); + this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow20 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -67,31 +70,23 @@ namespace PROgymnasiumBensberg this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.lblPlusMinusFLS = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblVergFLS = new DevExpress.XtraReports.UI.XRLabel(); + this.lblGelFLS = new DevExpress.XtraReports.UI.XRLabel(); + this.lblBewFLS = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel9 = 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(); + this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldApprovedFLSWithFactor = new DevExpress.XtraReports.UI.CalculatedField(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); - this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); - this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); - this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); - this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); - this.lblBewFLS = new DevExpress.XtraReports.UI.XRLabel(); - this.lblGelFLS = new DevExpress.XtraReports.UI.XRLabel(); - this.lblVergFLS = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); - this.lblPlusMinusFLS = new DevExpress.XtraReports.UI.XRLabel(); - this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -99,6 +94,8 @@ namespace PROgymnasiumBensberg this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); + this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -124,15 +121,26 @@ namespace PROgymnasiumBensberg this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -152,6 +160,22 @@ namespace PROgymnasiumBensberg this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; // + // xrPictureBox2 + // + this.xrPictureBox2.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox2.ImageSource")); + this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(451.7499F, 20.41664F); + this.xrPictureBox2.Name = "xrPictureBox2"; + this.xrPictureBox2.SizeF = new System.Drawing.SizeF(91.66672F, 89.58334F); + this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // + // xrRichText1 + // + this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); + this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 96.5F); + this.xrRichText1.Name = "xrRichText1"; + this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); + this.xrRichText1.SizeF = new System.Drawing.SizeF(353.4583F, 23F); + // // xrTable1 // this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight; @@ -187,6 +211,66 @@ namespace PROgymnasiumBensberg this.xrTableCell22.Text = "Zeitkorridor"; this.xrTableCell22.Weight = 1.290560426965224D; // + // xrTableCell1 + // + this.xrTableCell1.BorderColor = System.Drawing.Color.Black; + this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell1.Multiline = true; + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell1.StylePriority.UseBorderColor = false; + this.xrTableCell1.StylePriority.UseBorders = false; + this.xrTableCell1.StylePriority.UseFont = false; + this.xrTableCell1.Text = "FLS-Anzahl"; + this.xrTableCell1.Weight = 0.92735989325869406D; + // + // xrTableCell4 + // + this.xrTableCell4.BorderColor = System.Drawing.Color.Black; + this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell4.Multiline = true; + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell4.StylePriority.UseBorderColor = false; + this.xrTableCell4.StylePriority.UseBorders = false; + this.xrTableCell4.StylePriority.UseFont = false; + this.xrTableCell4.Text = "Faktor"; + this.xrTableCell4.Weight = 0.927359893258694D; + // + // xrTableCell5 + // + this.xrTableCell5.BorderColor = System.Drawing.Color.Black; + this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell5.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell5.Multiline = true; + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell5.StylePriority.UseBorderColor = false; + this.xrTableCell5.StylePriority.UseBorders = false; + this.xrTableCell5.StylePriority.UseFont = false; + this.xrTableCell5.Text = "Einzelpreis €"; + this.xrTableCell5.Weight = 0.927359893258694D; + // + // xrTableCell2 + // + this.xrTableCell2.BorderColor = System.Drawing.Color.Black; + this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell2.Multiline = true; + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell2.StylePriority.UseBorderColor = false; + this.xrTableCell2.StylePriority.UseBorders = false; + this.xrTableCell2.StylePriority.UseFont = false; + this.xrTableCell2.Text = "Anspruch €"; + this.xrTableCell2.Weight = 0.927359893258694D; + // // ruleRateFactorNull // this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?"; @@ -216,66 +300,6 @@ namespace PROgymnasiumBensberg this.xrLabel5.StylePriority.UseFont = false; this.xrLabel5.Text = "Sehr geehrte Damen und Herren!"; // - // RecipientPostCodeAndTown - // - this.RecipientPostCodeAndTown.CanShrink = true; - this.RecipientPostCodeAndTown.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0F, 68.00003F); - this.RecipientPostCodeAndTown.Name = "RecipientPostCodeAndTown"; - this.RecipientPostCodeAndTown.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.RecipientPostCodeAndTown.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.RecipientPostCodeAndTown.SizeF = new System.Drawing.SizeF(292F, 17F); - this.RecipientPostCodeAndTown.StylePriority.UseFont = false; - this.RecipientPostCodeAndTown.Text = "[RecipientPostCodeAndTown]"; - // - // xrLabel_RecipientStreet - // - this.xrLabel_RecipientStreet.CanShrink = true; - this.xrLabel_RecipientStreet.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0F, 51.00002F); - this.xrLabel_RecipientStreet.Name = "xrLabel_RecipientStreet"; - this.xrLabel_RecipientStreet.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel_RecipientStreet.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrLabel_RecipientStreet.SizeF = new System.Drawing.SizeF(292F, 17F); - this.xrLabel_RecipientStreet.StylePriority.UseFont = false; - this.xrLabel_RecipientStreet.Text = "[RecipientStreet]"; - // - // xrLabel_RecipientDivision - // - this.xrLabel_RecipientDivision.CanShrink = true; - this.xrLabel_RecipientDivision.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 34.00002F); - this.xrLabel_RecipientDivision.Name = "xrLabel_RecipientDivision"; - this.xrLabel_RecipientDivision.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel_RecipientDivision.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrLabel_RecipientDivision.SizeF = new System.Drawing.SizeF(292F, 17F); - this.xrLabel_RecipientDivision.StylePriority.UseFont = false; - this.xrLabel_RecipientDivision.Text = "[RecipientDivision]"; - // - // xrLabel_RecipientContactPerson - // - this.xrLabel_RecipientContactPerson.CanShrink = true; - this.xrLabel_RecipientContactPerson.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0F, 17.00001F); - this.xrLabel_RecipientContactPerson.Name = "xrLabel_RecipientContactPerson"; - this.xrLabel_RecipientContactPerson.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel_RecipientContactPerson.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrLabel_RecipientContactPerson.SizeF = new System.Drawing.SizeF(292F, 17F); - this.xrLabel_RecipientContactPerson.StylePriority.UseFont = false; - this.xrLabel_RecipientContactPerson.Text = "[RecipientContactPerson]"; - // - // xrLabel1 - // - this.xrLabel1.CanShrink = true; - this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrLabel1.Name = "xrLabel1"; - this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel1.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrLabel1.SizeF = new System.Drawing.SizeF(292F, 17F); - this.xrLabel1.StylePriority.UseFont = false; - this.xrLabel1.Text = "[RecipientOrganisation]"; - // // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -291,6 +315,29 @@ namespace PROgymnasiumBensberg this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // + // xrLabel16 + // + this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Arial", 7F); + this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(453F, 208.8333F); + this.xrLabel16.Multiline = true; + this.xrLabel16.Name = "xrLabel16"; + this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel16.SizeF = new System.Drawing.SizeF(225F, 59.24988F); + this.xrLabel16.StylePriority.UseFont = false; + this.xrLabel16.Text = "Bensberger Bank e.G.\r\nIBAN: DE52 3706 2124 0007 1000 27\r\nBIC: GENODED 1BGL\r\n\r\nMit" + + "glied im Paritätischen\r\n"; + // + // xrLabel11 + // + this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 226.5416F); + this.xrLabel11.Multiline = true; + this.xrLabel11.Name = "xrLabel11"; + this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(225F, 41.54155F); + this.xrLabel11.StylePriority.UseFont = false; + this.xrLabel11.Text = "Karin Weyer\r\n-Verwaltung-"; + // // xrLabel10 // this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 10F); @@ -466,6 +513,8 @@ namespace PROgymnasiumBensberg // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable5, + this.xrLabel17, this.lblPlusMinusFLS, this.xrLabel19, this.lblVergFLS, @@ -480,11 +529,6 @@ namespace PROgymnasiumBensberg this.xrLabel2, this.xrLabel8, this.xrLabel7, - this.xrLabel1, - this.xrLabel_RecipientContactPerson, - this.xrLabel_RecipientDivision, - this.xrLabel_RecipientStreet, - this.RecipientPostCodeAndTown, this.xrLabel5, this.xrLabel6, this.xrTable1}); @@ -493,6 +537,152 @@ namespace PROgymnasiumBensberg this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // + // lblPlusMinusFLS + // + this.lblPlusMinusFLS.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.lblPlusMinusFLS.LocationFloat = new DevExpress.Utils.PointFloat(435.0833F, 266.25F); + this.lblPlusMinusFLS.Name = "lblPlusMinusFLS"; + this.lblPlusMinusFLS.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblPlusMinusFLS.SizeF = new System.Drawing.SizeF(85.74997F, 17.00003F); + this.lblPlusMinusFLS.StylePriority.UseFont = false; + // + // xrLabel19 + // + this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(349.3333F, 266.25F); + this.xrLabel19.Name = "xrLabel19"; + this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel19.SizeF = new System.Drawing.SizeF(85.74997F, 17.00003F); + this.xrLabel19.StylePriority.UseFont = false; + this.xrLabel19.Text = "Plus/Minus"; + // + // lblVergFLS + // + this.lblVergFLS.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.lblVergFLS.LocationFloat = new DevExpress.Utils.PointFloat(194.0833F, 283.25F); + this.lblVergFLS.Name = "lblVergFLS"; + this.lblVergFLS.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblVergFLS.SizeF = new System.Drawing.SizeF(97.91666F, 17F); + this.lblVergFLS.StylePriority.UseFont = false; + // + // lblGelFLS + // + this.lblGelFLS.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.lblGelFLS.LocationFloat = new DevExpress.Utils.PointFloat(194.0833F, 266.25F); + this.lblGelFLS.Name = "lblGelFLS"; + this.lblGelFLS.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblGelFLS.SizeF = new System.Drawing.SizeF(97.91666F, 17F); + this.lblGelFLS.StylePriority.UseFont = false; + // + // lblBewFLS + // + this.lblBewFLS.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLS")}); + this.lblBewFLS.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.lblBewFLS.LocationFloat = new DevExpress.Utils.PointFloat(194.0833F, 249.25F); + this.lblBewFLS.Name = "lblBewFLS"; + this.lblBewFLS.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblBewFLS.SizeF = new System.Drawing.SizeF(97.91666F, 17F); + this.lblBewFLS.StylePriority.UseFont = false; + // + // xrLabel15 + // + this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 283.25F); + this.xrLabel15.Name = "xrLabel15"; + this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel15.SizeF = new System.Drawing.SizeF(194.0834F, 17F); + this.xrLabel15.StylePriority.UseFont = false; + this.xrLabel15.Text = "Vergütete Fachleistungsstd.:"; + // + // xrLabel14 + // + this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 266.25F); + this.xrLabel14.Name = "xrLabel14"; + this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel14.SizeF = new System.Drawing.SizeF(194.0834F, 17F); + this.xrLabel14.StylePriority.UseFont = false; + this.xrLabel14.Text = "Geleistete Fachleistungsstd.:"; + // + // xrLabel13 + // + this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(4.768372E-05F, 249.25F); + this.xrLabel13.Name = "xrLabel13"; + this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel13.SizeF = new System.Drawing.SizeF(194.0834F, 17F); + this.xrLabel13.StylePriority.UseFont = false; + this.xrLabel13.Text = "Bewilligte Fachleistungsstd.:"; + // + // xrLabel9 + // + this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel9.ForeColor = System.Drawing.Color.Black; + this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(1.589457E-05F, 202.75F); + this.xrLabel9.Name = "xrLabel9"; + this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel9.SizeF = new System.Drawing.SizeF(409.7084F, 17F); + this.xrLabel9.StylePriority.UseFont = false; + this.xrLabel9.StylePriority.UseForeColor = false; + this.xrLabel9.Text = "Endabrechnung für den Betreuungszeitraum:"; + // + // xrLabel4 + // + this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel4.ForeColor = System.Drawing.Color.Green; + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(4.768372E-05F, 185.75F); + this.xrLabel4.Name = "xrLabel4"; + this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(409.7084F, 17F); + this.xrLabel4.StylePriority.UseFont = false; + this.xrLabel4.StylePriority.UseForeColor = false; + this.xrLabel4.Text = "AZ LVR: [CustomerReferenceNumber]"; + // + // xrLabel3 + // + this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(1.589457E-05F, 168.75F); + this.xrLabel3.Name = "xrLabel3"; + this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(409.7084F, 17F); + this.xrLabel3.StylePriority.UseFont = false; + this.xrLabel3.Text = "Klient: [CustomerLastName], [CustomerFirstName], geb. [CustomerBirthday!dd.MM.yyy" + + "y]"; + // + // xrLabel2 + // + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(4.768372E-05F, 219.75F); + this.xrLabel2.Name = "xrLabel2"; + this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(317F, 17F); + this.xrLabel2.StylePriority.UseFont = false; + this.xrLabel2.Text = "Zeitraum: [AccountingPeriod]"; + // + // xrLabel8 + // + this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(453.1668F, 51.00002F); + this.xrLabel8.Multiline = true; + this.xrLabel8.Name = "xrLabel8"; + this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel8.SizeF = new System.Drawing.SizeF(214.8332F, 134.75F); + this.xrLabel8.StylePriority.UseFont = false; + this.xrLabel8.Text = "Bürgerhaus, Behinderten- und Generationentreff\r\n\r\nSchloßstraße 84\r\n51429 Bergisch" + + " Gladbach\r\nTelefon (02204) 9548-13\r\ninfo@progymnasium.de\r\nwww.progymnasium.de\r\n"; + // + // xrLabel7 + // + this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 14F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(453.1667F, 0F); + this.xrLabel7.Multiline = true; + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(196.8333F, 51.00002F); + this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.Text = "PROgymnasium\r\nBensberg e. V.\r\n\r\n"; + // // fieldApprovedFLSWithFactor // this.fieldApprovedFLSWithFactor.Expression = "[ApprovedFLSTotal] * [RateFactor]"; @@ -521,248 +711,6 @@ namespace PROgymnasiumBensberg new DevExpress.XtraReports.UI.GroupField("PeriodStartDate", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)}); this.Detail1.StylePriority.UseFont = false; // - // GroupHeader2 - // - this.GroupHeader2.BorderColor = System.Drawing.Color.Transparent; - this.GroupHeader2.Expanded = false; - this.GroupHeader2.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] { - new DevExpress.XtraReports.UI.GroupField("RateFactor", DevExpress.XtraReports.UI.XRColumnSortOrder.Descending)}); - this.GroupHeader2.HeightF = 0F; - this.GroupHeader2.Name = "GroupHeader2"; - this.GroupHeader2.StylePriority.UseBorderColor = false; - // - // GroupFooter1 - // - this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrTable4}); - this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { - new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.GroupFooter1.HeightF = 80F; - this.GroupFooter1.Name = "GroupFooter1"; - this.GroupFooter1.StylePriority.UseFont = false; - // - // xrPictureBox2 - // - this.xrPictureBox2.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox2.ImageSource")); - this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(451.7499F, 20.41664F); - this.xrPictureBox2.Name = "xrPictureBox2"; - this.xrPictureBox2.SizeF = new System.Drawing.SizeF(91.66672F, 89.58334F); - this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - // - // xrRichText1 - // - this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 96.5F); - this.xrRichText1.Name = "xrRichText1"; - this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); - this.xrRichText1.SizeF = new System.Drawing.SizeF(353.4583F, 23F); - // - // xrLabel7 - // - this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 14F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(453.1667F, 0F); - this.xrLabel7.Multiline = true; - this.xrLabel7.Name = "xrLabel7"; - this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(196.8333F, 51.00002F); - this.xrLabel7.StylePriority.UseFont = false; - this.xrLabel7.Text = "PROgymnasium\r\nBensberg e. V.\r\n\r\n"; - // - // xrLabel8 - // - this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(453.1668F, 51.00002F); - this.xrLabel8.Multiline = true; - this.xrLabel8.Name = "xrLabel8"; - this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel8.SizeF = new System.Drawing.SizeF(214.8332F, 134.75F); - this.xrLabel8.StylePriority.UseFont = false; - this.xrLabel8.Text = "Bürgerhaus, Behinderten- und Generationentreff\r\n\r\nSchloßstraße 84\r\n51429 Bergisch" + - " Gladbach\r\nTelefon (02204) 9548-13\r\ninfo@progymnasium.de\r\nwww.progymnasium.de\r\n"; - // - // xrLabel2 - // - this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(4.768372E-05F, 219.75F); - this.xrLabel2.Name = "xrLabel2"; - this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel2.SizeF = new System.Drawing.SizeF(317F, 17F); - this.xrLabel2.StylePriority.UseFont = false; - this.xrLabel2.Text = "Zeitraum: [AccountingPeriod]"; - // - // xrLabel3 - // - this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(1.589457E-05F, 168.75F); - this.xrLabel3.Name = "xrLabel3"; - this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(409.7084F, 17F); - this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.Text = "Klient: [CustomerLastName], [CustomerFirstName], geb. [CustomerBirthday!dd.MM.yyy" + - "y]"; - // - // xrLabel4 - // - this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel4.ForeColor = System.Drawing.Color.Green; - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(4.768372E-05F, 185.75F); - this.xrLabel4.Name = "xrLabel4"; - this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel4.SizeF = new System.Drawing.SizeF(409.7084F, 17F); - this.xrLabel4.StylePriority.UseFont = false; - this.xrLabel4.StylePriority.UseForeColor = false; - this.xrLabel4.Text = "AZ LVR: [CustomerReferenceNumber]"; - // - // xrLabel9 - // - this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel9.ForeColor = System.Drawing.Color.Black; - this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(1.589457E-05F, 202.75F); - this.xrLabel9.Name = "xrLabel9"; - this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel9.SizeF = new System.Drawing.SizeF(409.7084F, 17F); - this.xrLabel9.StylePriority.UseFont = false; - this.xrLabel9.StylePriority.UseForeColor = false; - this.xrLabel9.Text = "Endabrechnung für den Betreuungszeitraum:"; - // - // xrLabel13 - // - this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(4.768372E-05F, 249.25F); - this.xrLabel13.Name = "xrLabel13"; - this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel13.SizeF = new System.Drawing.SizeF(194.0834F, 17F); - this.xrLabel13.StylePriority.UseFont = false; - this.xrLabel13.Text = "Bewilligte Fachleistungsstd.:"; - // - // xrLabel14 - // - this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 266.25F); - this.xrLabel14.Name = "xrLabel14"; - this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel14.SizeF = new System.Drawing.SizeF(194.0834F, 17F); - this.xrLabel14.StylePriority.UseFont = false; - this.xrLabel14.Text = "Geleistete Fachleistungsstd.:"; - // - // xrLabel15 - // - this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 283.25F); - this.xrLabel15.Name = "xrLabel15"; - this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel15.SizeF = new System.Drawing.SizeF(194.0834F, 17F); - this.xrLabel15.StylePriority.UseFont = false; - this.xrLabel15.Text = "Vergütete Fachleistungsstd.:"; - // - // lblBewFLS - // - this.lblBewFLS.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLS")}); - this.lblBewFLS.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.lblBewFLS.LocationFloat = new DevExpress.Utils.PointFloat(194.0833F, 249.25F); - this.lblBewFLS.Name = "lblBewFLS"; - this.lblBewFLS.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblBewFLS.SizeF = new System.Drawing.SizeF(97.91666F, 17F); - this.lblBewFLS.StylePriority.UseFont = false; - // - // lblGelFLS - // - this.lblGelFLS.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.lblGelFLS.LocationFloat = new DevExpress.Utils.PointFloat(194.0833F, 266.25F); - this.lblGelFLS.Name = "lblGelFLS"; - this.lblGelFLS.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblGelFLS.SizeF = new System.Drawing.SizeF(97.91666F, 17F); - this.lblGelFLS.StylePriority.UseFont = false; - // - // lblVergFLS - // - this.lblVergFLS.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.lblVergFLS.LocationFloat = new DevExpress.Utils.PointFloat(194.0833F, 283.25F); - this.lblVergFLS.Name = "lblVergFLS"; - this.lblVergFLS.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblVergFLS.SizeF = new System.Drawing.SizeF(97.91666F, 17F); - this.lblVergFLS.StylePriority.UseFont = false; - // - // xrLabel19 - // - this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(349.3333F, 266.25F); - this.xrLabel19.Name = "xrLabel19"; - this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel19.SizeF = new System.Drawing.SizeF(85.74997F, 17.00003F); - this.xrLabel19.StylePriority.UseFont = false; - this.xrLabel19.Text = "Plus/Minus"; - // - // lblPlusMinusFLS - // - this.lblPlusMinusFLS.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.lblPlusMinusFLS.LocationFloat = new DevExpress.Utils.PointFloat(435.0833F, 266.25F); - this.lblPlusMinusFLS.Name = "lblPlusMinusFLS"; - this.lblPlusMinusFLS.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblPlusMinusFLS.SizeF = new System.Drawing.SizeF(85.74997F, 17.00003F); - this.lblPlusMinusFLS.StylePriority.UseFont = false; - // - // xrTableCell1 - // - this.xrTableCell1.BorderColor = System.Drawing.Color.Black; - this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrTableCell1.Multiline = true; - this.xrTableCell1.Name = "xrTableCell1"; - this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell1.StylePriority.UseBorderColor = false; - this.xrTableCell1.StylePriority.UseBorders = false; - this.xrTableCell1.StylePriority.UseFont = false; - this.xrTableCell1.Text = "FLS-Anzahl"; - this.xrTableCell1.Weight = 0.92735989325869406D; - // - // xrTableCell2 - // - this.xrTableCell2.BorderColor = System.Drawing.Color.Black; - this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrTableCell2.Multiline = true; - this.xrTableCell2.Name = "xrTableCell2"; - this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell2.StylePriority.UseBorderColor = false; - this.xrTableCell2.StylePriority.UseBorders = false; - this.xrTableCell2.StylePriority.UseFont = false; - this.xrTableCell2.Text = "Anspruch €"; - this.xrTableCell2.Weight = 0.927359893258694D; - // - // xrTableCell4 - // - this.xrTableCell4.BorderColor = System.Drawing.Color.Black; - this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrTableCell4.Multiline = true; - this.xrTableCell4.Name = "xrTableCell4"; - this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell4.StylePriority.UseBorderColor = false; - this.xrTableCell4.StylePriority.UseBorders = false; - this.xrTableCell4.StylePriority.UseFont = false; - this.xrTableCell4.Text = "Faktor"; - this.xrTableCell4.Weight = 0.927359893258694D; - // - // xrTableCell5 - // - this.xrTableCell5.BorderColor = System.Drawing.Color.Black; - this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell5.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrTableCell5.Multiline = true; - this.xrTableCell5.Name = "xrTableCell5"; - this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell5.StylePriority.UseBorderColor = false; - this.xrTableCell5.StylePriority.UseBorders = false; - this.xrTableCell5.StylePriority.UseFont = false; - this.xrTableCell5.Text = "Einzelpreis €"; - this.xrTableCell5.Weight = 0.927359893258694D; - // // xrTable2 // this.xrTable2.BorderColor = System.Drawing.SystemColors.ControlLight; @@ -866,6 +814,26 @@ namespace PROgymnasiumBensberg this.xrTableCell11.TextFormatString = "{0:C}"; this.xrTableCell11.Weight = 0.927359893258694D; // + // GroupHeader2 + // + this.GroupHeader2.BorderColor = System.Drawing.Color.Transparent; + this.GroupHeader2.Expanded = false; + this.GroupHeader2.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] { + new DevExpress.XtraReports.UI.GroupField("RateFactor", DevExpress.XtraReports.UI.XRColumnSortOrder.Descending)}); + this.GroupHeader2.HeightF = 0F; + this.GroupHeader2.Name = "GroupHeader2"; + this.GroupHeader2.StylePriority.UseBorderColor = false; + // + // GroupFooter1 + // + this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable4}); + this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.GroupFooter1.HeightF = 80F; + this.GroupFooter1.Name = "GroupFooter1"; + this.GroupFooter1.StylePriority.UseFont = false; + // // xrTable4 // this.xrTable4.BorderColor = System.Drawing.SystemColors.ControlLight; @@ -1223,33 +1191,123 @@ namespace PROgymnasiumBensberg this.xrTableCell37.TextFormatString = "{0:C}"; this.xrTableCell37.Weight = 0.927359893258694D; // - // xrLabel11 + // xrLabel17 // - this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 226.5416F); - this.xrLabel11.Multiline = true; - this.xrLabel11.Name = "xrLabel11"; - this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel11.SizeF = new System.Drawing.SizeF(225F, 41.54155F); - this.xrLabel11.StylePriority.UseFont = false; - this.xrLabel11.Text = "Karin Weyer\r\n-Verwaltung-"; - // - // xrLabel16 - // - this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Arial", 7F); - this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(453F, 208.8333F); - this.xrLabel16.Multiline = true; - this.xrLabel16.Name = "xrLabel16"; - this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel16.SizeF = new System.Drawing.SizeF(225F, 59.24988F); - this.xrLabel16.StylePriority.UseFont = false; - this.xrLabel16.Text = "Bensberger Bank e.G.\r\nIBAN: DE52 3706 2124 0007 1000 27\r\nBIC: GENODED 1BGL\r\n\r\nMit" + - "glied im Paritätischen\r\n"; + this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 123.9167F); + this.xrLabel17.Name = "xrLabel17"; + this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel17.SizeF = new System.Drawing.SizeF(317F, 17F); + this.xrLabel17.StylePriority.UseFont = false; + this.xrLabel17.Text = "Datum: [InvoiceDate!dd.MM.yyyy]"; // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); // + // xrTable5 + // + this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable5.Name = "xrTable5"; + this.xrTable5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F); + this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow6, + this.xrTableRow8, + this.xrTableRow10, + this.xrTableRow11, + this.xrTableRow12}); + this.xrTable5.SizeF = new System.Drawing.SizeF(353.4583F, 85F); + // + // xrTableRow6 + // + this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell33}); + this.xrTableRow6.Name = "xrTableRow6"; + this.xrTableRow6.Weight = 1D; + // + // xrTableCell33 + // + this.xrTableCell33.CanShrink = true; + this.xrTableCell33.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecipientOrganisation")}); + this.xrTableCell33.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrTableCell33.Multiline = true; + this.xrTableCell33.Name = "xrTableCell33"; + this.xrTableCell33.StylePriority.UseFont = false; + this.xrTableCell33.Weight = 1D; + // + // xrTableRow8 + // + this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell38}); + this.xrTableRow8.Name = "xrTableRow8"; + this.xrTableRow8.Weight = 1D; + // + // xrTableCell38 + // + this.xrTableCell38.CanShrink = true; + this.xrTableCell38.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecipientDivision")}); + this.xrTableCell38.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrTableCell38.Multiline = true; + this.xrTableCell38.Name = "xrTableCell38"; + this.xrTableCell38.StylePriority.UseFont = false; + this.xrTableCell38.Weight = 1D; + // + // xrTableRow10 + // + this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell39}); + this.xrTableRow10.Name = "xrTableRow10"; + this.xrTableRow10.Weight = 1D; + // + // xrTableCell39 + // + this.xrTableCell39.CanShrink = true; + this.xrTableCell39.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecipientPostBox")}); + this.xrTableCell39.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrTableCell39.Multiline = true; + this.xrTableCell39.Name = "xrTableCell39"; + this.xrTableCell39.StylePriority.UseFont = false; + this.xrTableCell39.Weight = 1D; + // + // xrTableRow11 + // + this.xrTableRow11.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell40}); + this.xrTableRow11.Name = "xrTableRow11"; + this.xrTableRow11.Weight = 1D; + // + // xrTableCell40 + // + this.xrTableCell40.CanShrink = true; + this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecipientStreet")}); + this.xrTableCell40.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrTableCell40.Multiline = true; + this.xrTableCell40.Name = "xrTableCell40"; + this.xrTableCell40.StylePriority.UseFont = false; + this.xrTableCell40.Weight = 1D; + // + // xrTableRow12 + // + this.xrTableRow12.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell41}); + this.xrTableRow12.Name = "xrTableRow12"; + this.xrTableRow12.Weight = 1D; + // + // xrTableCell41 + // + this.xrTableCell41.CanShrink = true; + this.xrTableCell41.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecipientPostCodeAndTown")}); + this.xrTableCell41.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrTableCell41.Multiline = true; + this.xrTableCell41.Name = "xrTableCell41"; + this.xrTableCell41.StylePriority.UseFont = false; + this.xrTableCell41.Weight = 1D; + // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1267,19 +1325,20 @@ namespace PROgymnasiumBensberg this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new DevExpress.Drawing.DXMargins(75F, 74F, 100F, 43F); + this.Margins = new DevExpress.Drawing.DXMargins(74F, 74F, 100F, 43F); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; this.Version = "23.2"; xrWatermark1.Id = "Watermark1"; this.Watermarks.Add(xrWatermark1); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1291,11 +1350,6 @@ namespace PROgymnasiumBensberg private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; private DevExpress.XtraReports.UI.XRLabel xrLabel6; private DevExpress.XtraReports.UI.XRLabel xrLabel5; - private DevExpress.XtraReports.UI.XRLabel RecipientPostCodeAndTown; - private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientStreet; - private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientDivision; - private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientContactPerson; - private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; private DevExpress.XtraReports.UI.XRLabel lblNotice; private DevExpress.XtraReports.UI.XRLabel xrLabel12; @@ -1381,5 +1435,17 @@ namespace PROgymnasiumBensberg private DevExpress.XtraReports.UI.XRTableCell xrTableCell37; private DevExpress.XtraReports.UI.XRLabel xrLabel11; private DevExpress.XtraReports.UI.XRLabel xrLabel16; + private DevExpress.XtraReports.UI.XRLabel xrLabel17; + private DevExpress.XtraReports.UI.XRTable xrTable5; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow6; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell33; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow8; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell38; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell39; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow11; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell40; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow12; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell41; } } \ No newline at end of file