diff --git a/ReportImp/LebenshilfeFrankfurtOder/AnwesenheitslisteFruehUndSpaetbetreuung.Designer.cs b/ReportImp/LebenshilfeFrankfurtOder/AnwesenheitslisteFruehUndSpaetbetreuung.Designer.cs index c31932793..9cbf450ca 100644 --- a/ReportImp/LebenshilfeFrankfurtOder/AnwesenheitslisteFruehUndSpaetbetreuung.Designer.cs +++ b/ReportImp/LebenshilfeFrankfurtOder/AnwesenheitslisteFruehUndSpaetbetreuung.Designer.cs @@ -1188,6 +1188,10 @@ this.xrTableCell64.Text = "xrTableCell64"; this.xrTableCell64.Weight = 0.016054418850405955D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(LebenshilfeFrankfurtOder.AusserschulischesBetreuungsangebot.AnwesenheitAusserschulischesBetreuungsangebot); + // // xrLabel8 // this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(741.0002F, 53.33333F); @@ -3101,7 +3105,7 @@ // fieldIstFFO // this.fieldIstFFO.DataMember = "CustomerAnwesenheiten"; - this.fieldIstFFO.Expression = "Iif([IstFFO], \'x\', \'\')"; + this.fieldIstFFO.Expression = "Iif([IstFFO_EGH] Or [IstFFO_JA], \'x\', \'\')"; this.fieldIstFFO.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldIstFFO.Name = "fieldIstFFO"; // diff --git a/ReportImp/LebenshilfeFrankfurtOder/AusserschulischesBetreuungsangebot/AnwesenheitAusserschulischesBetreuungsangebot.cs b/ReportImp/LebenshilfeFrankfurtOder/AusserschulischesBetreuungsangebot/AnwesenheitAusserschulischesBetreuungsangebot.cs index 1bda98095..4881317b8 100644 --- a/ReportImp/LebenshilfeFrankfurtOder/AusserschulischesBetreuungsangebot/AnwesenheitAusserschulischesBetreuungsangebot.cs +++ b/ReportImp/LebenshilfeFrankfurtOder/AusserschulischesBetreuungsangebot/AnwesenheitAusserschulischesBetreuungsangebot.cs @@ -242,6 +242,63 @@ namespace LebenshilfeFrankfurtOder.AusserschulischesBetreuungsangebot SetzeStaffelpreise(); } + + private CustomerAnwesenheit CreateCustomerAnwesenheit(AdditionalServiceBookingRow row, DateTime monat) + { + var ca = new CustomerAnwesenheit(); + ca.Monat = monat; + ca.CustomerDC = row.CustomerDC; + + ca.IstSgb9 = FrankfurtOderHelper.IstSgbIX(ca.CustomerDC.DateOfBirth, monat.AddMonths(1).AddDays(-1)); + ca.IstSgb8 = !ca.IstSgb9; + + SetCostbearer2SupportConcept(ca); + + + if (ca.CostBearer2SupportConcept?.CostBearer.Organisation != null) + { + if (ca.CostBearer2SupportConcept.CostBearer.Organisation.Name.Contains("Stadt Frankfurt (Oder)") && !ca.CostBearer2SupportConcept.CostBearer.Organisation.Name.Contains("JA")) + { + if (ca.CostBearer2SupportConcept.CostBearer.Organisation.Name.Contains("Stadt Frankfurt (Oder)") && !ca.CostBearer2SupportConcept.CostBearer.Organisation.Name.Contains("JA")) + { + ca.IstFFO_JA = true; + } + else + { + ca.IstFFO_EGH = true; + } + + } + else + { + ca.IstAndererKT = true; + } + } + + SetzeAnwesenheiten(ca, row); + + return ca; + } + + private void SetCostbearer2SupportConcept(CustomerAnwesenheit ca) + { + var c = DAOFactory.GenericDAO.LoadByID(ca.CustomerDC.CustomerOid); + + foreach (var sc in c.SupportConcepts) + { + foreach (var c2s in sc.CostBearer2SupportConceptList) + { + foreach (var ap in c2s.ApprovalPeriodList) + { + if (ap.ServiceCategory != null && ap.ServiceCategory.Name.ToLower().Contains("außerschulisches betreuungsangebot")) + { + ca.CostBearer2SupportConcept = c2s; + ca.SupportConceptApprovalPeriod = ap; + } + } + } + } + } private void SetzeStaffelpreise() { DateTime dt = new DateTime(Monat.Year, Monat.Month, 1); @@ -455,7 +512,7 @@ namespace LebenshilfeFrankfurtOder.AusserschulischesBetreuungsangebot preis.AnzahlTag4 += anzahl; } else if (dt.Day == 5) - { + { preis.AnzahlTag5 += anzahl; } else if (dt.Day == 6) @@ -564,37 +621,6 @@ namespace LebenshilfeFrankfurtOder.AusserschulischesBetreuungsangebot } } - private CustomerAnwesenheit CreateCustomerAnwesenheit(AdditionalServiceBookingRow row, DateTime monat) - { - var ca = new CustomerAnwesenheit(); - ca.Monat = monat; - ca.CustomerDC = row.CustomerDC; - - ca.IstSgb9 = FrankfurtOderHelper.IstSgbIX(ca.CustomerDC.DateOfBirth, monat.AddMonths(1).AddDays(-1)); - ca.IstSgb8 = !ca.IstSgb9; - - SetCostbearer2SupportConcept(ca); - - - if (ca.CostBearer2SupportConcept?.CostBearer.Organisation != null) - { - if (ca.CostBearer2SupportConcept.CostBearer.Organisation.Name.Contains("Stadt Frankfurt (Oder)") && !ca.CostBearer2SupportConcept.CostBearer.Organisation.Name.Contains("JA")) - { - ca.IstFFO = true; - } - else - { - ca.IstAndererKT = true; - } - } - - SetzeAnwesenheiten(ca, row); - - return ca; - } - - - private void SetzeAnwesenheiten(CustomerAnwesenheit ca, AdditionalServiceBookingRow row) { ca.AttendanceOnDay1 = row.AttendanceOnDay1; @@ -631,25 +657,7 @@ namespace LebenshilfeFrankfurtOder.AusserschulischesBetreuungsangebot } - private void SetCostbearer2SupportConcept(CustomerAnwesenheit ca) - { - var c = DAOFactory.GenericDAO.LoadByID(ca.CustomerDC.CustomerOid); - - foreach (var sc in c.SupportConcepts) - { - foreach (var c2s in sc.CostBearer2SupportConceptList) - { - foreach (var ap in c2s.ApprovalPeriodList) - { - if (ap.ServiceCategory != null && ap.ServiceCategory.Name.ToLower().Contains("außerschulisches betreuungsangebot")) - { - ca.CostBearer2SupportConcept = c2s; - ca.SupportConceptApprovalPeriod = ap; - } - } - } - } - } + } } diff --git a/ReportImp/LebenshilfeFrankfurtOder/AusserschulischesBetreuungsangebot/CustomerAnwesenheit.cs b/ReportImp/LebenshilfeFrankfurtOder/AusserschulischesBetreuungsangebot/CustomerAnwesenheit.cs index ea1ac86a6..b5ae81160 100644 --- a/ReportImp/LebenshilfeFrankfurtOder/AusserschulischesBetreuungsangebot/CustomerAnwesenheit.cs +++ b/ReportImp/LebenshilfeFrankfurtOder/AusserschulischesBetreuungsangebot/CustomerAnwesenheit.cs @@ -21,7 +21,8 @@ namespace LebenshilfeFrankfurtOder.AusserschulischesBetreuungsangebot { public DateTime Monat { get; set; } public CompactCustomerDC CustomerDC { get; set; } - public bool IstFFO { get; set; } + public bool IstFFO_EGH { get; set; } + public bool IstFFO_JA { get; set; } public bool IstAndererKT { get; set; } public bool IstSgb8 { get; set; } public bool IstSgb9 { get; set; } diff --git a/ReportImp/LebenshilfeFrankfurtOder/CustomReportCreator.cs b/ReportImp/LebenshilfeFrankfurtOder/CustomReportCreator.cs index 48b46e6ed..acff9f5a8 100644 --- a/ReportImp/LebenshilfeFrankfurtOder/CustomReportCreator.cs +++ b/ReportImp/LebenshilfeFrankfurtOder/CustomReportCreator.cs @@ -427,7 +427,7 @@ namespace LebenshilfeFrankfurtOder roFerien = ro; } - return CreateAnwesenheitslisteFruehUndSpaetbetreuung(roFrueh, roSpaet, roFerien, true); + return CreateAnwesenheitslisteFruehUndSpaetbetreuung(roFrueh, roSpaet, roFerien, true, null); } if (report == null) @@ -440,7 +440,7 @@ namespace LebenshilfeFrankfurtOder return report as XtraReport; } - private XtraReport CreateAnwesenheitslisteFruehUndSpaetbetreuung(AdditionalServiceBookingRO roFrue, AdditionalServiceBookingRO roSpaet, AdditionalServiceBookingRO roFerien, bool addEinzelnachweise) + private XtraReport CreateAnwesenheitslisteFruehUndSpaetbetreuung(AdditionalServiceBookingRO roFrue, AdditionalServiceBookingRO roSpaet, AdditionalServiceBookingRO roFerien, bool addEinzelnachweise, List einzelnachweiseCustomerFilter) { var aab = new AnwesenheitAusserschulischesBetreuungsangebot(); aab.BerechneGesamtAnwesenheit(roFrue, roSpaet, roFerien); @@ -455,7 +455,7 @@ namespace LebenshilfeFrankfurtOder foreach (var row in aab.CustomerAnwesenheiten) { - if (row.IstSgb9) + if (einzelnachweiseCustomerFilter == null || einzelnachweiseCustomerFilter.Contains(String.Format("{0}, {1}", row.CustomerDC.LastName, row.CustomerDC.FirstName))) { var lnRO = LeistungsnachweisSGBIXRO.Create(aab, row); @@ -1181,12 +1181,27 @@ namespace LebenshilfeFrankfurtOder roFerien = AdditionalServiceBookingRO.Create(ferienRegion, monat); } bool addEinzelnachweise = true; - if (ro.RecipientOrganisation.Contains("Stadt Frankfurt (Oder)") && !ro.RecipientOrganisation.Contains("JA")) - { - addEinzelnachweise = false; + //if (ro.RecipientOrganisation.Contains("Stadt Frankfurt (Oder)") && !ro.RecipientOrganisation.Contains("JA")) + //{ + // addEinzelnachweise = false; + //} + var customerNames = new List(); + if (iDC.ServiceInvoicePeriods != null) + { + foreach (var sip in iDC.ServiceInvoicePeriods) + { + if (sip.InvoiceItems != null) + { + foreach (var item in sip.InvoiceItems) + { + customerNames.Add(item.ItemDescription); + } + } + } } + - var anhang = CreateAnwesenheitslisteFruehUndSpaetbetreuung(roFrueh, roSpaet, roFerien, addEinzelnachweise); + var anhang = CreateAnwesenheitslisteFruehUndSpaetbetreuung(roFrueh, roSpaet, roFerien, addEinzelnachweise, customerNames); if (anhang.Pages.Count == 0) { anhang.CreateDocument(); @@ -1305,7 +1320,7 @@ namespace LebenshilfeFrankfurtOder var fruehRegion = DAOFactory.GenericDAO.LoadByID(30); var spaetRegion = DAOFactory.GenericDAO.LoadByID(31); - var ferienRegion = DAOFactory.GenericDAO.LoadByID(31); + var ferienRegion = DAOFactory.GenericDAO.LoadByID(32); var roFrueh = AdditionalServiceBookingRO.Create(fruehRegion, monat); diff --git a/ReportImp/LebenshilfeFrankfurtOder/Invoicing/AusserschulischesBetreuungsangebotInvoiceCreation.cs b/ReportImp/LebenshilfeFrankfurtOder/Invoicing/AusserschulischesBetreuungsangebotInvoiceCreation.cs index e66cddf30..e1fb823f6 100644 --- a/ReportImp/LebenshilfeFrankfurtOder/Invoicing/AusserschulischesBetreuungsangebotInvoiceCreation.cs +++ b/ReportImp/LebenshilfeFrankfurtOder/Invoicing/AusserschulischesBetreuungsangebotInvoiceCreation.cs @@ -43,10 +43,10 @@ namespace LebenshilfeFrankfurtOder.Invoicing var invoiceList = new List(); var invoiceCounter = 0; - //LH Frankfurt Oder bekommt eine eigene Sammel Rechnung - //Alle anderen Rechnungen gehen ans entsprechende Jugendamt + //Stadt Frankfurt Oder Jugendamt bekommt eine eigene Sammel Rechnung + //Alle anderen Rechnungen gehen einzeln ans entsprechende Amt - var ffoAnwesenheiten = afs.CustomerAnwesenheiten.Where(a => a.IstFFO).ToList(); + var ffoAnwesenheiten = afs.CustomerAnwesenheiten.Where(a => a.IstFFO_JA).ToList(); if (ffoAnwesenheiten.Count > 0) { invoiceList.Add(CreateInvoice(invoiceCounter, invoicePeriod, afs, ffoAnwesenheiten)); @@ -57,7 +57,7 @@ namespace LebenshilfeFrankfurtOder.Invoicing foreach (var ca in afs.CustomerAnwesenheiten) { - if (!ca.IstFFO && ca.CostBearer2SupportConcept != null) + if (!ca.IstFFO_JA && ca.CostBearer2SupportConcept != null) { List abwList = null; if (!abwesenheitenNachKT.ContainsKey(ca.CostBearer2SupportConcept.CostBearer.Organisation.Name)) diff --git a/ReportImp/LebenshilfeFrankfurtOder/RechnungAusserschulischesBetreuungsangebot.Designer.cs b/ReportImp/LebenshilfeFrankfurtOder/RechnungAusserschulischesBetreuungsangebot.Designer.cs index b79f178cc..a1fef4e35 100644 --- a/ReportImp/LebenshilfeFrankfurtOder/RechnungAusserschulischesBetreuungsangebot.Designer.cs +++ b/ReportImp/LebenshilfeFrankfurtOder/RechnungAusserschulischesBetreuungsangebot.Designer.cs @@ -47,37 +47,6 @@ namespace LebenshilfeFrankfurtOder this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel25 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellAnzahl1 = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellEinheit1 = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellBetrag1 = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellGesamt1 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellAnzahl2 = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellEinheit2 = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellBetrag2 = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellGesamt2 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellAnzahl3 = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellEinheit3 = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellBetrag3 = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellGesamt3 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellAnzahl4 = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellEinheit4 = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellBetrag4 = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellGesamt4 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRowFerien = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellAnzahl5 = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellEinheit5 = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellBetrag5 = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellGesamt5 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel38 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel33 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel34 = new DevExpress.XtraReports.UI.XRLabel(); @@ -85,13 +54,8 @@ namespace LebenshilfeFrankfurtOder this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow17 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); this.lblRechnung = new DevExpress.XtraReports.UI.XRLabel(); this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); @@ -126,13 +90,22 @@ namespace LebenshilfeFrankfurtOder this.xrLabel39 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand(); + this.Detail2 = new DevExpress.XtraReports.UI.DetailBand(); + this.DetailReport2 = new DevExpress.XtraReports.UI.DetailReportBand(); + this.Detail3 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.rtFooterAlt)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.rtFooterNeu)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -159,7 +132,6 @@ namespace LebenshilfeFrankfurtOder this.xrLabel27, this.xrLabel26, this.xrLabel25, - this.xrTable3, this.xrLabel38, this.xrLabel33, this.xrLabel34, @@ -167,7 +139,7 @@ namespace LebenshilfeFrankfurtOder this.xrTable2, this.lblRechnung, this.lblAdresse}); - this.ReportHeader.HeightF = 531.25F; + this.ReportHeader.HeightF = 441.25F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; // @@ -373,322 +345,6 @@ namespace LebenshilfeFrankfurtOder this.xrLabel25.Text = "501205613"; this.xrLabel25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; // - // xrTable3 - // - this.xrTable3.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { - new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0.000406901F, 431.25F); - this.xrTable3.Name = "xrTable3"; - this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow2, - this.xrTableRow7, - this.xrTableRow8, - this.xrTableRow9, - this.xrTableRowFerien}); - this.xrTable3.SizeF = new System.Drawing.SizeF(696.5F, 100F); - this.xrTable3.StylePriority.UseBackColor = false; - this.xrTable3.StylePriority.UseBorderColor = false; - this.xrTable3.StylePriority.UseFont = false; - this.xrTable3.StylePriority.UsePadding = false; - // - // xrTableRow2 - // - this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell2, - this.cellAnzahl1, - this.cellEinheit1, - this.cellBetrag1, - this.cellGesamt1}); - this.xrTableRow2.Name = "xrTableRow2"; - this.xrTableRow2.Weight = 0.10000000000000003D; - // - // xrTableCell2 - // - this.xrTableCell2.Borders = DevExpress.XtraPrinting.BorderSide.Left; - this.xrTableCell2.Multiline = true; - this.xrTableCell2.Name = "xrTableCell2"; - this.xrTableCell2.StylePriority.UseBorders = false; - this.xrTableCell2.StylePriority.UseFont = false; - this.xrTableCell2.StylePriority.UsePadding = false; - this.xrTableCell2.StylePriority.UseTextAlignment = false; - this.xrTableCell2.Text = "Staffelpreis 1"; - this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell2.Weight = 0.46153846153846145D; - // - // cellAnzahl1 - // - this.cellAnzahl1.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.cellAnzahl1.Name = "cellAnzahl1"; - this.cellAnzahl1.StylePriority.UseBorders = false; - this.cellAnzahl1.StylePriority.UseTextAlignment = false; - this.cellAnzahl1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.cellAnzahl1.Weight = 0.099999999999999978D; - // - // cellEinheit1 - // - this.cellEinheit1.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.cellEinheit1.CanShrink = true; - this.cellEinheit1.Name = "cellEinheit1"; - this.cellEinheit1.StylePriority.UseBorders = false; - this.cellEinheit1.StylePriority.UseFont = false; - this.cellEinheit1.StylePriority.UsePadding = false; - this.cellEinheit1.StylePriority.UseTextAlignment = false; - this.cellEinheit1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.cellEinheit1.Weight = 0.1538461538461538D; - // - // cellBetrag1 - // - this.cellBetrag1.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.cellBetrag1.Name = "cellBetrag1"; - this.cellBetrag1.StylePriority.UseBorderColor = false; - this.cellBetrag1.StylePriority.UseBorders = false; - this.cellBetrag1.StylePriority.UseFont = false; - this.cellBetrag1.StylePriority.UsePadding = false; - this.cellBetrag1.StylePriority.UseTextAlignment = false; - this.cellBetrag1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.cellBetrag1.Weight = 0.14615384615384613D; - // - // cellGesamt1 - // - this.cellGesamt1.Borders = DevExpress.XtraPrinting.BorderSide.Right; - this.cellGesamt1.Name = "cellGesamt1"; - this.cellGesamt1.StylePriority.UseBorderColor = false; - this.cellGesamt1.StylePriority.UseBorders = false; - this.cellGesamt1.StylePriority.UseFont = false; - this.cellGesamt1.StylePriority.UsePadding = false; - this.cellGesamt1.StylePriority.UseTextAlignment = false; - this.cellGesamt1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellGesamt1.Weight = 0.20999999999999996D; - // - // xrTableRow7 - // - this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell9, - this.cellAnzahl2, - this.cellEinheit2, - this.cellBetrag2, - this.cellGesamt2}); - this.xrTableRow7.Name = "xrTableRow7"; - this.xrTableRow7.Weight = 0.10000000000000003D; - // - // xrTableCell9 - // - this.xrTableCell9.Borders = DevExpress.XtraPrinting.BorderSide.Left; - this.xrTableCell9.Name = "xrTableCell9"; - this.xrTableCell9.StylePriority.UseBorders = false; - this.xrTableCell9.StylePriority.UseTextAlignment = false; - this.xrTableCell9.Text = "Staffelpreis 2"; - this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell9.Weight = 0.46153846153846145D; - // - // cellAnzahl2 - // - this.cellAnzahl2.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.cellAnzahl2.Name = "cellAnzahl2"; - this.cellAnzahl2.StylePriority.UseBorders = false; - this.cellAnzahl2.StylePriority.UseTextAlignment = false; - this.cellAnzahl2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.cellAnzahl2.Weight = 0.099999999999999978D; - // - // cellEinheit2 - // - this.cellEinheit2.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.cellEinheit2.Name = "cellEinheit2"; - this.cellEinheit2.StylePriority.UseBorders = false; - this.cellEinheit2.StylePriority.UseTextAlignment = false; - this.cellEinheit2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.cellEinheit2.Weight = 0.1538461538461538D; - // - // cellBetrag2 - // - this.cellBetrag2.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.cellBetrag2.Name = "cellBetrag2"; - this.cellBetrag2.StylePriority.UseBorders = false; - this.cellBetrag2.StylePriority.UseTextAlignment = false; - this.cellBetrag2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.cellBetrag2.Weight = 0.14615384615384613D; - // - // cellGesamt2 - // - this.cellGesamt2.Borders = DevExpress.XtraPrinting.BorderSide.Right; - this.cellGesamt2.Name = "cellGesamt2"; - this.cellGesamt2.StylePriority.UseBorders = false; - this.cellGesamt2.StylePriority.UseTextAlignment = false; - this.cellGesamt2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellGesamt2.Weight = 0.20999999999999996D; - // - // xrTableRow8 - // - this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell29, - this.cellAnzahl3, - this.cellEinheit3, - this.cellBetrag3, - this.cellGesamt3}); - this.xrTableRow8.Name = "xrTableRow8"; - this.xrTableRow8.Weight = 0.10000000000000003D; - // - // xrTableCell29 - // - this.xrTableCell29.Borders = DevExpress.XtraPrinting.BorderSide.Left; - this.xrTableCell29.Name = "xrTableCell29"; - this.xrTableCell29.StylePriority.UseBorders = false; - this.xrTableCell29.StylePriority.UseTextAlignment = false; - this.xrTableCell29.Text = "Staffelpreis 3"; - this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell29.Weight = 0.46153846153846145D; - // - // cellAnzahl3 - // - this.cellAnzahl3.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.cellAnzahl3.Name = "cellAnzahl3"; - this.cellAnzahl3.StylePriority.UseBorders = false; - this.cellAnzahl3.StylePriority.UseTextAlignment = false; - this.cellAnzahl3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.cellAnzahl3.Weight = 0.099999999999999978D; - // - // cellEinheit3 - // - this.cellEinheit3.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.cellEinheit3.Name = "cellEinheit3"; - this.cellEinheit3.StylePriority.UseBorders = false; - this.cellEinheit3.StylePriority.UseTextAlignment = false; - this.cellEinheit3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.cellEinheit3.Weight = 0.1538461538461538D; - // - // cellBetrag3 - // - this.cellBetrag3.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.cellBetrag3.Name = "cellBetrag3"; - this.cellBetrag3.StylePriority.UseBorders = false; - this.cellBetrag3.StylePriority.UseTextAlignment = false; - this.cellBetrag3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.cellBetrag3.Weight = 0.14615384615384613D; - // - // cellGesamt3 - // - this.cellGesamt3.Borders = DevExpress.XtraPrinting.BorderSide.Right; - this.cellGesamt3.Name = "cellGesamt3"; - this.cellGesamt3.StylePriority.UseBorders = false; - this.cellGesamt3.StylePriority.UseTextAlignment = false; - this.cellGesamt3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellGesamt3.Weight = 0.20999999999999996D; - // - // xrTableRow9 - // - this.xrTableRow9.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell33, - this.cellAnzahl4, - this.cellEinheit4, - this.cellBetrag4, - this.cellGesamt4}); - this.xrTableRow9.Name = "xrTableRow9"; - this.xrTableRow9.Weight = 0.10000000000000003D; - // - // xrTableCell33 - // - this.xrTableCell33.Borders = DevExpress.XtraPrinting.BorderSide.Left; - this.xrTableCell33.Name = "xrTableCell33"; - this.xrTableCell33.StylePriority.UseBorders = false; - this.xrTableCell33.StylePriority.UseTextAlignment = false; - this.xrTableCell33.Text = "Staffelpreis 4"; - this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell33.Weight = 0.46153846153846145D; - // - // cellAnzahl4 - // - this.cellAnzahl4.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.cellAnzahl4.Name = "cellAnzahl4"; - this.cellAnzahl4.StylePriority.UseBorders = false; - this.cellAnzahl4.StylePriority.UseTextAlignment = false; - this.cellAnzahl4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.cellAnzahl4.Weight = 0.099999999999999978D; - // - // cellEinheit4 - // - this.cellEinheit4.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.cellEinheit4.Name = "cellEinheit4"; - this.cellEinheit4.StylePriority.UseBorders = false; - this.cellEinheit4.StylePriority.UseTextAlignment = false; - this.cellEinheit4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.cellEinheit4.Weight = 0.1538461538461538D; - // - // cellBetrag4 - // - this.cellBetrag4.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.cellBetrag4.Name = "cellBetrag4"; - this.cellBetrag4.StylePriority.UseBorders = false; - this.cellBetrag4.StylePriority.UseTextAlignment = false; - this.cellBetrag4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.cellBetrag4.Weight = 0.14615384615384613D; - // - // cellGesamt4 - // - this.cellGesamt4.Borders = DevExpress.XtraPrinting.BorderSide.Right; - this.cellGesamt4.Name = "cellGesamt4"; - this.cellGesamt4.StylePriority.UseBorders = false; - this.cellGesamt4.StylePriority.UseTextAlignment = false; - this.cellGesamt4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellGesamt4.Weight = 0.20999999999999996D; - // - // xrTableRowFerien - // - this.xrTableRowFerien.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell37, - this.cellAnzahl5, - this.cellEinheit5, - this.cellBetrag5, - this.cellGesamt5}); - this.xrTableRowFerien.Name = "xrTableRowFerien"; - this.xrTableRowFerien.Weight = 0.10000000000000003D; - // - // xrTableCell37 - // - this.xrTableCell37.Borders = DevExpress.XtraPrinting.BorderSide.Left; - this.xrTableCell37.Name = "xrTableCell37"; - this.xrTableCell37.StylePriority.UseBorders = false; - this.xrTableCell37.StylePriority.UseTextAlignment = false; - this.xrTableCell37.Text = "Staffelpreis 5"; - this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell37.Weight = 0.46153846153846145D; - // - // cellAnzahl5 - // - this.cellAnzahl5.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.cellAnzahl5.Name = "cellAnzahl5"; - this.cellAnzahl5.StylePriority.UseBorders = false; - this.cellAnzahl5.StylePriority.UseTextAlignment = false; - this.cellAnzahl5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.cellAnzahl5.Weight = 0.099999999999999978D; - // - // cellEinheit5 - // - this.cellEinheit5.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.cellEinheit5.Name = "cellEinheit5"; - this.cellEinheit5.StylePriority.UseBorders = false; - this.cellEinheit5.StylePriority.UseTextAlignment = false; - this.cellEinheit5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.cellEinheit5.Weight = 0.1538461538461538D; - // - // cellBetrag5 - // - this.cellBetrag5.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.cellBetrag5.Name = "cellBetrag5"; - this.cellBetrag5.StylePriority.UseBorders = false; - this.cellBetrag5.StylePriority.UseTextAlignment = false; - this.cellBetrag5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.cellBetrag5.Weight = 0.14615384615384613D; - // - // cellGesamt5 - // - this.cellGesamt5.Borders = DevExpress.XtraPrinting.BorderSide.Right; - this.cellGesamt5.Name = "cellGesamt5"; - this.cellGesamt5.StylePriority.UseBorders = false; - this.cellGesamt5.StylePriority.UseTextAlignment = false; - this.cellGesamt5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellGesamt5.Weight = 0.20999999999999996D; - // // xrLabel38 // this.xrLabel38.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { @@ -745,9 +401,8 @@ namespace LebenshilfeFrankfurtOder this.xrTable2.Name = "xrTable2"; this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow1, - this.xrTableRow17}); - this.xrTable2.SizeF = new System.Drawing.SizeF(696.5F, 40F); + this.xrTableRow1}); + this.xrTable2.SizeF = new System.Drawing.SizeF(696.5F, 50F); this.xrTable2.StylePriority.UseBackColor = false; this.xrTable2.StylePriority.UseBorderColor = false; this.xrTable2.StylePriority.UseFont = false; @@ -757,13 +412,10 @@ namespace LebenshilfeFrankfurtOder // this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { this.xrTableCell1, - this.xrTableCell3, this.xrTableCell7, - this.xrTableCell4, - this.xrTableCell6, this.xrTableCell5}); this.xrTableRow1.Name = "xrTableRow1"; - this.xrTableRow1.Weight = 0.10000000000000003D; + this.xrTableRow1.Weight = 0.25000000000000011D; // // xrTableCell1 // @@ -775,54 +427,20 @@ namespace LebenshilfeFrankfurtOder this.xrTableCell1.StylePriority.UseFont = false; this.xrTableCell1.StylePriority.UsePadding = false; this.xrTableCell1.StylePriority.UseTextAlignment = false; - this.xrTableCell1.Text = "Bezeichnung"; - this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell1.Weight = 0.26923076923076911D; - // - // xrTableCell3 - // - this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell3.Name = "xrTableCell3"; - this.xrTableCell3.StylePriority.UseBorders = false; - this.xrTableCell3.StylePriority.UseTextAlignment = false; - this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell3.Weight = 0.1923076688326322D; + this.xrTableCell1.Text = "Name des Kindes"; + this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell1.Weight = 0.4615384615384614D; // // xrTableCell7 // this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell7.Multiline = true; this.xrTableCell7.Name = "xrTableCell7"; this.xrTableCell7.StylePriority.UseBorders = false; this.xrTableCell7.StylePriority.UseTextAlignment = false; - this.xrTableCell7.Text = "Anzahl"; - this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell7.Weight = 0.099999999999999978D; - // - // xrTableCell4 - // - this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell4.CanShrink = true; - this.xrTableCell4.Name = "xrTableCell4"; - this.xrTableCell4.StylePriority.UseBorders = false; - this.xrTableCell4.StylePriority.UseFont = false; - this.xrTableCell4.StylePriority.UsePadding = false; - this.xrTableCell4.StylePriority.UseTextAlignment = false; - this.xrTableCell4.Text = "Einheit"; - this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell4.Weight = 0.15384615384615383D; - // - // xrTableCell6 - // - this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell6.Name = "xrTableCell6"; - this.xrTableCell6.StylePriority.UseBorderColor = false; - this.xrTableCell6.StylePriority.UseBorders = false; - this.xrTableCell6.StylePriority.UseFont = false; - this.xrTableCell6.StylePriority.UsePadding = false; - this.xrTableCell6.StylePriority.UseTextAlignment = false; - this.xrTableCell6.Text = "Betrag"; - this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell6.Weight = 0.14615386962890622D; + this.xrTableCell7.Text = "Anzahl der\r\nanwesenden Tage"; + this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell7.Weight = 0.30769230769230765D; // // xrTableCell5 // @@ -834,28 +452,9 @@ namespace LebenshilfeFrankfurtOder this.xrTableCell5.StylePriority.UseFont = false; this.xrTableCell5.StylePriority.UsePadding = false; this.xrTableCell5.StylePriority.UseTextAlignment = false; - this.xrTableCell5.Text = "Gesamt"; + this.xrTableCell5.Text = "Betrag nach Staffelpreis anteilmäßig in €"; this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell5.Weight = 0.20999999999999996D; - // - // xrTableRow17 - // - this.xrTableRow17.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell8}); - this.xrTableRow17.Name = "xrTableRow17"; - this.xrTableRow17.Weight = 0.10000000000000003D; - // - // xrTableCell8 - // - this.xrTableCell8.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell8.Name = "xrTableCell8"; - this.xrTableCell8.StylePriority.UseBorders = false; - this.xrTableCell8.StylePriority.UseTextAlignment = false; - this.xrTableCell8.Text = "Betreuungsleistung"; - this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell8.Weight = 1.0715384615384613D; + this.xrTableCell5.Weight = 0.30230769230769222D; // // lblRechnung // @@ -937,7 +536,6 @@ namespace LebenshilfeFrankfurtOder this.xrTable1}); this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Arial", 11F, 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; // @@ -951,7 +549,7 @@ namespace LebenshilfeFrankfurtOder this.xrTableRow4, this.xrTableRow11, this.xrTableRow6}); - this.xrTable1.SizeF = new System.Drawing.SizeF(696.5F, 80F); + this.xrTable1.SizeF = new System.Drawing.SizeF(696.5F, 100F); this.xrTable1.StylePriority.UseBackColor = false; this.xrTable1.StylePriority.UseBorderColor = false; this.xrTable1.StylePriority.UseBorders = false; @@ -965,7 +563,7 @@ namespace LebenshilfeFrankfurtOder this.xrTableCell16, this.lblGesamt}); this.xrTableRow3.Name = "xrTableRow3"; - this.xrTableRow3.Weight = 0.10000000000000003D; + this.xrTableRow3.Weight = 0.12500000000000006D; // // xrTableCell11 // @@ -1002,7 +600,7 @@ namespace LebenshilfeFrankfurtOder this.xrTableCell16.StylePriority.UseTextAlignment = false; this.xrTableCell16.Text = "Rechnungsbetrag netto"; this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell16.Weight = 0.39999999999999991D; + this.xrTableCell16.Weight = 0.3076923076923076D; // // lblGesamt // @@ -1014,7 +612,7 @@ namespace LebenshilfeFrankfurtOder this.lblGesamt.StylePriority.UsePadding = false; this.lblGesamt.StylePriority.UseTextAlignment = false; this.lblGesamt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.lblGesamt.Weight = 0.20999999999999996D; + this.lblGesamt.Weight = 0.30230769230769228D; // // xrTableRow4 // @@ -1024,7 +622,7 @@ namespace LebenshilfeFrankfurtOder this.xrTableCell18, this.xrTableCell19}); this.xrTableRow4.Name = "xrTableRow4"; - this.xrTableRow4.Weight = 0.10000000000000003D; + this.xrTableRow4.Weight = 0.12500000000000006D; // // xrTableCell13 // @@ -1045,12 +643,13 @@ namespace LebenshilfeFrankfurtOder // // xrTableCell18 // + this.xrTableCell18.Multiline = true; this.xrTableCell18.Name = "xrTableCell18"; this.xrTableCell18.StylePriority.UseBorders = false; this.xrTableCell18.StylePriority.UseTextAlignment = false; this.xrTableCell18.Text = "befreit von der Mehrwertsteuer"; this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell18.Weight = 0.39999999999999991D; + this.xrTableCell18.Weight = 0.35259887695312492D; // // xrTableCell19 // @@ -1060,7 +659,7 @@ namespace LebenshilfeFrankfurtOder this.xrTableCell19.StylePriority.UseTextAlignment = false; this.xrTableCell19.Text = "0,00 €"; this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell19.Weight = 0.20999999999999996D; + this.xrTableCell19.Weight = 0.25740112304687496D; // // xrTableRow11 // @@ -1070,7 +669,7 @@ namespace LebenshilfeFrankfurtOder this.xrTableCell35, this.xrTableCell36}); this.xrTableRow11.Name = "xrTableRow11"; - this.xrTableRow11.Weight = 0.10000000000000003D; + this.xrTableRow11.Weight = 0.12500000000000006D; // // xrTableCell32 // @@ -1092,8 +691,9 @@ namespace LebenshilfeFrankfurtOder // this.xrTableCell35.Name = "xrTableCell35"; this.xrTableCell35.StylePriority.UseTextAlignment = false; + this.xrTableCell35.Text = "Elternbeiträge"; this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell35.Weight = 0.39999999999999991D; + this.xrTableCell35.Weight = 0.3076923076923076D; // // xrTableCell36 // @@ -1101,8 +701,9 @@ namespace LebenshilfeFrankfurtOder this.xrTableCell36.Name = "xrTableCell36"; this.xrTableCell36.StylePriority.UseBorders = false; this.xrTableCell36.StylePriority.UseTextAlignment = false; + this.xrTableCell36.Text = "0,00 €"; this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell36.Weight = 0.20999999999999996D; + this.xrTableCell36.Weight = 0.30230769230769228D; // // xrTableRow6 // @@ -1112,7 +713,7 @@ namespace LebenshilfeFrankfurtOder this.xrTableCell26, this.xrTableCell27}); this.xrTableRow6.Name = "xrTableRow6"; - this.xrTableRow6.Weight = 0.10000000000000003D; + this.xrTableRow6.Weight = 0.12500000000000003D; // // xrTableCell24 // @@ -1142,7 +743,7 @@ namespace LebenshilfeFrankfurtOder this.xrTableCell26.StylePriority.UseTextAlignment = false; this.xrTableCell26.Text = "Rechnungsbetrag brutto"; this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell26.Weight = 0.39999999999999991D; + this.xrTableCell26.Weight = 0.3076923076923076D; // // xrTableCell27 // @@ -1157,7 +758,7 @@ namespace LebenshilfeFrankfurtOder this.xrTableCell27.StylePriority.UseFont = false; this.xrTableCell27.StylePriority.UseTextAlignment = false; this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell27.Weight = 0.20999999999999996D; + this.xrTableCell27.Weight = 0.30230769230769228D; // // ReportFooter // @@ -1192,6 +793,105 @@ namespace LebenshilfeFrankfurtOder this.xrLabel2.StylePriority.UseFont = false; this.xrLabel2.Text = "Bitte überweisen Sie den Rechnungsbetrag unter Angabe der Kunden-Nr. und der Rech" + "nungs-Nr. auf das unten angegebene Konto."; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); + // + // DetailReport1 + // + this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail2, + this.DetailReport2}); + this.DetailReport1.DataMember = "ServiceInvoicePeriods"; + this.DetailReport1.DataSource = this.bindingSource1; + this.DetailReport1.Level = 0; + this.DetailReport1.Name = "DetailReport1"; + // + // Detail2 + // + this.Detail2.HeightF = 0F; + this.Detail2.Name = "Detail2"; + // + // DetailReport2 + // + this.DetailReport2.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail3}); + this.DetailReport2.DataMember = "ServiceInvoicePeriods.ServiceInvoiceItems"; + this.DetailReport2.DataSource = this.bindingSource1; + this.DetailReport2.Level = 0; + this.DetailReport2.Name = "DetailReport2"; + // + // Detail3 + // + this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable4}); + this.Detail3.HeightF = 25F; + this.Detail3.Name = "Detail3"; + // + // xrTable4 + // + this.xrTable4.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0.000406901F, 0F); + this.xrTable4.Name = "xrTable4"; + this.xrTable4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow5}); + this.xrTable4.SizeF = new System.Drawing.SizeF(696.5F, 25F); + this.xrTable4.StylePriority.UseBackColor = false; + this.xrTable4.StylePriority.UseBorderColor = false; + this.xrTable4.StylePriority.UseFont = false; + this.xrTable4.StylePriority.UsePadding = false; + // + // xrTableRow5 + // + this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell10, + this.xrTableCell12, + this.xrTableCell21}); + this.xrTableRow5.Name = "xrTableRow5"; + this.xrTableRow5.Weight = 0.12500000000000006D; + // + // xrTableCell10 + // + this.xrTableCell10.Borders = DevExpress.XtraPrinting.BorderSide.Left; + this.xrTableCell10.Multiline = true; + this.xrTableCell10.Name = "xrTableCell10"; + this.xrTableCell10.StylePriority.UseBorders = false; + this.xrTableCell10.StylePriority.UseFont = false; + this.xrTableCell10.StylePriority.UsePadding = false; + this.xrTableCell10.StylePriority.UseTextAlignment = false; + this.xrTableCell10.Text = "[CustomerLastname], [CustomerFirstname]"; + this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell10.Weight = 0.46153846153846145D; + // + // xrTableCell12 + // + this.xrTableCell12.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.UnitCount")}); + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.StylePriority.UseBorders = false; + this.xrTableCell12.StylePriority.UseTextAlignment = false; + this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell12.TextFormatString = "{0:0}"; + this.xrTableCell12.Weight = 0.3076923076923076D; + // + // xrTableCell21 + // + this.xrTableCell21.Borders = DevExpress.XtraPrinting.BorderSide.Right; + this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.NetAmount")}); + this.xrTableCell21.Name = "xrTableCell21"; + this.xrTableCell21.StylePriority.UseBorderColor = false; + this.xrTableCell21.StylePriority.UseBorders = false; + this.xrTableCell21.StylePriority.UseFont = false; + this.xrTableCell21.StylePriority.UsePadding = false; + this.xrTableCell21.StylePriority.UseTextAlignment = false; + this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell21.TextFormatString = "{0:c}"; + this.xrTableCell21.Weight = 0.30230769230769228D; // // RechnungAusserschulischesBetreuungsangebot // @@ -1201,7 +901,8 @@ namespace LebenshilfeFrankfurtOder this.topMarginBand1, this.bottomMarginBand1, this.GroupFooter1, - this.ReportFooter}); + this.ReportFooter, + this.DetailReport1}); this.ComponentStorage.AddRange(new System.ComponentModel.IComponent[] { this.bindingSource1}); this.DataSource = this.bindingSource1; @@ -1221,12 +922,12 @@ namespace LebenshilfeFrankfurtOder xrWatermark1.PageRange = "1"; this.Watermarks.Add(xrWatermark1); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.rtFooterAlt)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.rtFooterNeu)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1244,9 +945,7 @@ namespace LebenshilfeFrankfurtOder private DevExpress.XtraReports.UI.XRTable xrTable2; private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; private DevExpress.XtraReports.UI.XRLabel xrLabel33; private DevExpress.XtraReports.UI.XRLabel xrLabel34; private DevExpress.XtraReports.UI.XRLabel lblTitel; @@ -1270,41 +969,7 @@ namespace LebenshilfeFrankfurtOder private DevExpress.XtraReports.UI.XRLabel xrLabel2; private DevExpress.XtraReports.UI.XRLine xrLine1; private DevExpress.XtraReports.UI.XRLabel xrLabel38; - private DevExpress.XtraReports.UI.XRTable xrTable3; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; - private DevExpress.XtraReports.UI.XRTableCell cellEinheit1; - private DevExpress.XtraReports.UI.XRTableCell cellBetrag1; - private DevExpress.XtraReports.UI.XRTableCell cellGesamt1; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow7; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; - private DevExpress.XtraReports.UI.XRTableCell cellEinheit2; - private DevExpress.XtraReports.UI.XRTableCell cellBetrag2; - private DevExpress.XtraReports.UI.XRTableCell cellGesamt2; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow8; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell29; - private DevExpress.XtraReports.UI.XRTableCell cellEinheit3; - private DevExpress.XtraReports.UI.XRTableCell cellBetrag3; - private DevExpress.XtraReports.UI.XRTableCell cellGesamt3; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow9; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell33; - private DevExpress.XtraReports.UI.XRTableCell cellEinheit4; - private DevExpress.XtraReports.UI.XRTableCell cellBetrag4; - private DevExpress.XtraReports.UI.XRTableCell cellGesamt4; - private DevExpress.XtraReports.UI.XRTableRow xrTableRowFerien; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell37; - private DevExpress.XtraReports.UI.XRTableCell cellEinheit5; - private DevExpress.XtraReports.UI.XRTableCell cellBetrag5; - private DevExpress.XtraReports.UI.XRTableCell cellGesamt5; - private DevExpress.XtraReports.UI.XRTableCell cellAnzahl1; - private DevExpress.XtraReports.UI.XRTableCell cellAnzahl2; - private DevExpress.XtraReports.UI.XRTableCell cellAnzahl3; - private DevExpress.XtraReports.UI.XRTableCell cellAnzahl4; - private DevExpress.XtraReports.UI.XRTableCell cellAnzahl5; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow17; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; private DevExpress.XtraReports.UI.XRTableRow xrTableRow11; private DevExpress.XtraReports.UI.XRTableCell xrTableCell32; private DevExpress.XtraReports.UI.XRTableCell xrTableCell34; @@ -1327,5 +992,14 @@ namespace LebenshilfeFrankfurtOder private DevExpress.XtraReports.UI.XRLabel xrLabel3; private DevExpress.XtraReports.UI.XRRichText rtFooterAlt; private DevExpress.XtraReports.UI.XRRichText rtFooterNeu; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport1; + private DevExpress.XtraReports.UI.DetailBand Detail2; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport2; + private DevExpress.XtraReports.UI.DetailBand Detail3; + private DevExpress.XtraReports.UI.XRTable xrTable4; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow5; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell21; } } diff --git a/ReportImp/LebenshilfeFrankfurtOder/RechnungAusserschulischesBetreuungsangebot.cs b/ReportImp/LebenshilfeFrankfurtOder/RechnungAusserschulischesBetreuungsangebot.cs index 9a05b7312..ef7c3cd62 100644 --- a/ReportImp/LebenshilfeFrankfurtOder/RechnungAusserschulischesBetreuungsangebot.cs +++ b/ReportImp/LebenshilfeFrankfurtOder/RechnungAusserschulischesBetreuungsangebot.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Linq; using System.Text; using BeWo.Data.Access; using BeWo.Data.Entities; @@ -76,11 +77,11 @@ namespace LebenshilfeFrankfurtOder String defaultEinheit = "Tage"; - decimal anzahl1 = 0; - decimal anzahl2 = 0; - decimal anzahl3 = 0; - decimal anzahl4 = 0; - decimal anzahl5 = 0; + //decimal anzahl1 = 0; + //decimal anzahl2 = 0; + //decimal anzahl3 = 0; + //decimal anzahl4 = 0; + //decimal anzahl5 = 0; bool istFerienbetreuung = pRO.InvoiceBase.InvoiceId == "RechnungABAFerien"; @@ -92,137 +93,154 @@ namespace LebenshilfeFrankfurtOder { lblTitel.Text = "Außerschulisches Betreuungsangebot Früh-/Spätbetreuung"; } - decimal betrag1 = FrankfurtOderHelper.GetStaffelPreis(1, pRO.AccountingPeriodStart, istFerienbetreuung) ?? 0; - decimal betrag2 = FrankfurtOderHelper.GetStaffelPreis(2, pRO.AccountingPeriodStart, istFerienbetreuung) ?? 0; - decimal betrag3 = FrankfurtOderHelper.GetStaffelPreis(3, pRO.AccountingPeriodStart, istFerienbetreuung) ?? 0; - decimal betrag4 = FrankfurtOderHelper.GetStaffelPreis(4, pRO.AccountingPeriodStart, istFerienbetreuung) ?? 0; - decimal betrag5 = FrankfurtOderHelper.GetStaffelPreis(5, pRO.AccountingPeriodStart, istFerienbetreuung) ?? 0; + //decimal betrag1 = FrankfurtOderHelper.GetStaffelPreis(1, pRO.AccountingPeriodStart, istFerienbetreuung) ?? 0; + //decimal betrag2 = FrankfurtOderHelper.GetStaffelPreis(2, pRO.AccountingPeriodStart, istFerienbetreuung) ?? 0; + //decimal betrag3 = FrankfurtOderHelper.GetStaffelPreis(3, pRO.AccountingPeriodStart, istFerienbetreuung) ?? 0; + //decimal betrag4 = FrankfurtOderHelper.GetStaffelPreis(4, pRO.AccountingPeriodStart, istFerienbetreuung) ?? 0; + //decimal betrag5 = FrankfurtOderHelper.GetStaffelPreis(5, pRO.AccountingPeriodStart, istFerienbetreuung) ?? 0; - decimal gesamt1 = 0; - decimal gesamt2 = 0; - decimal gesamt3 = 0; - decimal gesamt4 = 0; - decimal gesamt5 = 0; + //decimal gesamt1 = 0; + //decimal gesamt2 = 0; + //decimal gesamt3 = 0; + //decimal gesamt4 = 0; + //decimal gesamt5 = 0; - - var dict = new Dictionary(); + + //var dict = new Dictionary(); + decimal gesamtSumme = 0; + if (pRO.ServiceInvoicePeriods != null) { foreach (var sip in pRO.ServiceInvoicePeriods) { - if (!String.IsNullOrEmpty(sip.Notice)) + Dictionary klient2Item = new Dictionary(); + + if (!String.IsNullOrEmpty(sip.Notice)) { klientenNamen = sip.Notice; } foreach (var ii in sip.ServiceInvoiceItems) { - String key = String.Format("{0:dd.MM.yyyy}_{1}", ii.AccountingPeriodStart.Value.Date, ii.UnitDescription); + String key = String.Format("{0}, {1}", ii.CustomerLastname, ii.CustomerFirstname); - if (ii.UnitDescription.StartsWith("Staffelpreis 1")) - { - if (!dict.ContainsKey(key)) - { - anzahl1++; - } - //anzahl1 += ii.UnitCount ?? 0; - //betrag1 += ii.AmountPerUnit ?? betrag1; - gesamt1 += ii.NetAmount ?? 0; - - } - else if (ii.UnitDescription.StartsWith("Staffelpreis 2")) + if (!klient2Item.ContainsKey(key)) { - if (!dict.ContainsKey(key)) - { - anzahl2++; - } - //anzahl2 += ii.UnitCount ?? 0; - //betrag2 += ii.AmountPerUnit ?? betrag2; - gesamt2 += ii.NetAmount ?? 0; - - } - else if (ii.UnitDescription.StartsWith("Staffelpreis 3")) - { - if (!dict.ContainsKey(key)) - { - anzahl3++; - } - //anzahl3 += ii.UnitCount ?? 0; - //betrag3 += ii.AmountPerUnit ?? betrag3; - gesamt3 += ii.NetAmount ?? 0; - - } - else if (ii.UnitDescription.StartsWith("Staffelpreis 4")) - { - if (!dict.ContainsKey(key)) - { - anzahl4++; - } - //anzahl4 += ii.UnitCount ?? 0; - //betrag4 += ii.AmountPerUnit ?? betrag4; - gesamt4 += ii.NetAmount ?? 0; - + var newii = new ServiceInvoiceItemRO(); + newii.CustomerFirstname = ii.CustomerFirstname; + newii.CustomerLastname = ii.CustomerLastname; + newii.UnitCount = 0; + newii.NetAmount = 0; + klient2Item.Add(key, newii); } - else if (ii.UnitDescription.StartsWith("Staffelpreis 5")) - { - if (!dict.ContainsKey(key)) - { - anzahl5++; - } - //anzahl5 += ii.UnitCount ?? 0; - //betrag5 += ii.AmountPerUnit ?? betrag5; - gesamt5 += ii.NetAmount ?? 0; - } - if (!dict.ContainsKey(key)) - { - dict.Add(key, true); - } - + + + klient2Item[key].UnitCount += ii.UnitCount ?? 0; + klient2Item[key].NetAmount += ii.NetAmount ?? 0; + gesamtSumme += ii.NetAmount ?? 0; + // if (ii.UnitDescription.StartsWith("Staffelpreis 1")) + //{ + // if (!dict.ContainsKey(key)) + // { + // anzahl1++; + // } + // //anzahl1 += ii.UnitCount ?? 0; + // //betrag1 += ii.AmountPerUnit ?? betrag1; + // gesamt1 += ii.NetAmount ?? 0; + + //} + // else if (ii.UnitDescription.StartsWith("Staffelpreis 2")) + // { + // if (!dict.ContainsKey(key)) + // { + // anzahl2++; + // } + // //anzahl2 += ii.UnitCount ?? 0; + // //betrag2 += ii.AmountPerUnit ?? betrag2; + // gesamt2 += ii.NetAmount ?? 0; + + //} + //else if (ii.UnitDescription.StartsWith("Staffelpreis 3")) + // { + // if (!dict.ContainsKey(key)) + // { + // anzahl3++; + // } + // //anzahl3 += ii.UnitCount ?? 0; + // //betrag3 += ii.AmountPerUnit ?? betrag3; + // gesamt3 += ii.NetAmount ?? 0; + + //} + //else if (ii.UnitDescription.StartsWith("Staffelpreis 4")) + // { + // if (!dict.ContainsKey(key)) + // { + // anzahl4++; + // } + // //anzahl4 += ii.UnitCount ?? 0; + // //betrag4 += ii.AmountPerUnit ?? betrag4; + // gesamt4 += ii.NetAmount ?? 0; + + // } + // else if (ii.UnitDescription.StartsWith("Staffelpreis 5")) + // { + // if (!dict.ContainsKey(key)) + // { + // anzahl5++; + // } + // //anzahl5 += ii.UnitCount ?? 0; + // //betrag5 += ii.AmountPerUnit ?? betrag5; + // gesamt5 += ii.NetAmount ?? 0; + // } + + } - + sip.ServiceInvoiceItems.Clear(); + sip.ServiceInvoiceItems.AddRange(klient2Item.Values.OrderBy(i => i.CustomerLastname)); } + } //lblKlienten.Text = String.Format("Hort: {0}", klientenNamen); pRO.OrganisationDebitorNumber = GetKundennummer(pRO); - cellAnzahl1.Text = String.Format("{0:0}", anzahl1); - cellAnzahl2.Text = String.Format("{0:0}", anzahl2); - cellAnzahl3.Text = String.Format("{0:0}", anzahl3); - cellAnzahl4.Text = String.Format("{0:0}", anzahl4); - cellAnzahl5.Text = String.Format("{0:0}", anzahl5); + //cellAnzahl1.Text = String.Format("{0:0}", anzahl1); + //cellAnzahl2.Text = String.Format("{0:0}", anzahl2); + //cellAnzahl3.Text = String.Format("{0:0}", anzahl3); + //cellAnzahl4.Text = String.Format("{0:0}", anzahl4); + //cellAnzahl5.Text = String.Format("{0:0}", anzahl5); - cellEinheit1.Text = String.Format("{0}", defaultEinheit); - cellEinheit2.Text = String.Format("{0}", defaultEinheit); - cellEinheit3.Text = String.Format("{0}", defaultEinheit); - cellEinheit4.Text = String.Format("{0}", defaultEinheit); - cellEinheit5.Text = String.Format("{0}", defaultEinheit); + //cellEinheit1.Text = String.Format("{0}", defaultEinheit); + //cellEinheit2.Text = String.Format("{0}", defaultEinheit); + //cellEinheit3.Text = String.Format("{0}", defaultEinheit); + //cellEinheit4.Text = String.Format("{0}", defaultEinheit); + //cellEinheit5.Text = String.Format("{0}", defaultEinheit); - cellBetrag1.Text = String.Format("{0:#,##0.00}", betrag1); - cellBetrag2.Text = String.Format("{0:#,##0.00}", betrag2); - cellBetrag3.Text = String.Format("{0:#,##0.00}", betrag3); - cellBetrag4.Text = String.Format("{0:#,##0.00}", betrag4); - cellBetrag5.Text = String.Format("{0:#,##0.00}", betrag5); + //cellBetrag1.Text = String.Format("{0:#,##0.00}", betrag1); + //cellBetrag2.Text = String.Format("{0:#,##0.00}", betrag2); + //cellBetrag3.Text = String.Format("{0:#,##0.00}", betrag3); + //cellBetrag4.Text = String.Format("{0:#,##0.00}", betrag4); + //cellBetrag5.Text = String.Format("{0:#,##0.00}", betrag5); - cellGesamt1.Text = String.Format("{0:c}", gesamt1); - cellGesamt2.Text = String.Format("{0:c}", gesamt2); - cellGesamt3.Text = String.Format("{0:c}", gesamt3); - cellGesamt4.Text = String.Format("{0:c}", gesamt4); - cellGesamt5.Text = String.Format("{0:c}", gesamt5); + //cellGesamt1.Text = String.Format("{0:c}", gesamt1); + //cellGesamt2.Text = String.Format("{0:c}", gesamt2); + //cellGesamt3.Text = String.Format("{0:c}", gesamt3); + //cellGesamt4.Text = String.Format("{0:c}", gesamt4); + //cellGesamt5.Text = String.Format("{0:c}", gesamt5); //cellEigenanteil.Text = String.Format("{0:c}", eigenanteil); - lblGesamt.Text = String.Format("{0:c}", gesamt1 + gesamt2 + gesamt3 + gesamt4 + gesamt5); + lblGesamt.Text = String.Format("{0:c}", gesamtSumme); // gesamt1 + gesamt2 + gesamt3 + gesamt4 + gesamt5); - if (istFerienbetreuung) - { - xrTableRowFerien.Visible = false; - } + //if (istFerienbetreuung) + //{ + // xrTableRowFerien.Visible = false; + //} SetRechnungsText(pRO); SetFooter(pRO); diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index fe0b42704..a0a271d26 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -85,7 +85,7 @@ namespace BeWo.Service.Plugins //t = "4867997795"; // ADiK Kleve //t = "3184859776"; // Sergej Becker //t = "7752610643"; // BWK Gbr - //t = "3785623125"; // Betreuwo + t = "3785623125"; // Betreuwo //t = "7130228334"; // LH Borken //t = "4209820830"; // VKM Hamm //t = "5700328131"; // Betreutes Wohnen St. Ludgerus Essen-Werden @@ -170,7 +170,7 @@ namespace BeWo.Service.Plugins //t = "7803602698"; // Taubblindendienst //t = "5518600303"; // Wetterleuchten e.V. //t = "4096649015"; // AWO Dortmund - //t = "3614251071"; // Pusteblume + t = "3614251071"; // Pusteblume //t = "7755740484"; // Sawo //t = "8275654834"; // Twg Jonathan //t = "6586058528"; // Freundeskreis Suchtkrankenhilfe e.V. (FFS) @@ -226,7 +226,7 @@ namespace BeWo.Service.Plugins //t = "7817461089"; // FAB e.V. (Familienarbeit und Beratung e.V.) //t = "5207911843"; // Pro Balance //t = "8619663355"; // HSH Cologne - //t = "1652658918"; // LH Frankfurt Oder + t = "1652658918"; // LH Frankfurt Oder //t = "7696927868"; // Kuhring Betreuung //t = "6251348980"; // BeWo Gün //t = "6782533512"; // LH Dorsten