diff --git a/ReportImp/DiakonieKKKleve/Finanzauswertung.cs b/ReportImp/DiakonieKKKleve/Finanzauswertung.cs index 02a63c2fc..efaae274a 100644 --- a/ReportImp/DiakonieKKKleve/Finanzauswertung.cs +++ b/ReportImp/DiakonieKKKleve/Finanzauswertung.cs @@ -270,7 +270,7 @@ namespace BeWo.DiakonieKKKleve } else { - if (!sr.ServiceDescription.Name.ToLower().Contains("telefon")) + if (sr.ServiceDescription.Name.ToLower().Contains("aufsuchend")) { if (!hatHBimZeitraum && sr.Start >= start && sr.Start < end.Date.AddDays(1)) { diff --git a/ReportImp/DiakonieKKKleve/Invoicing/DiakonieKKKleveSoziotherapieInvoiceCreation.cs b/ReportImp/DiakonieKKKleve/Invoicing/DiakonieKKKleveSoziotherapieInvoiceCreation.cs index 99f955a09..e56e9a73c 100644 --- a/ReportImp/DiakonieKKKleve/Invoicing/DiakonieKKKleveSoziotherapieInvoiceCreation.cs +++ b/ReportImp/DiakonieKKKleve/Invoicing/DiakonieKKKleveSoziotherapieInvoiceCreation.cs @@ -1,7 +1,9 @@ -using BeWo.Data.Entities; +using BeWo.Data.Access; +using BeWo.Data.Entities; using BeWo.Service.Invoicing; using BS.Shared.Core; using BS.Shared.DataContracts; +using BS.Shared.Services; using System; using System.Collections.Generic; using System.Linq; @@ -14,8 +16,26 @@ namespace DiakonieKKKleve.Invoicing { public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, BS.Shared.Services.Calculations calc) { - var ii = base.CreateInvoiceItem(iServiceRecord, scap, calc); - + var ii= new InvoiceItem(); + BillingData bd = calc.GetBillingData(iServiceRecord); + ii.AmountPerUnit = bd.AmountPerUnit; + ii.UnitCount = bd.UnitCount; + ii.AmountTotal = bd.AmountTotal; + ii.ItemPeriodStart = bd.BillingPeriodStart; + ii.ItemPeriodEnd = bd.BillingPeriodEnd; + ii.RateFactor = bd.RateFactor; + ii.GrossAmountTotal = bd.GrossAmountTotal; + ii.AccountingInterval = bd.AccountingInterval; + ii.ItemDescription = iServiceRecord.ServiceDescription.Name; + ii.ServiceRecord = DAOFactory.GenericDAO.LoadByID(iServiceRecord.ServiceRecordOid.Value); + if (scap != null) + ii.SupportConceptApprovalPeriodOid = scap.Oid; + if (iServiceRecord.ServiceDescription.Name.ToLower().Contains("fehlkontakt") || (iServiceRecord.ServiceDescription.ProzentAbrechnung.HasValue && iServiceRecord.ServiceDescription.ProzentAbrechnung.Value < 100)) + { + ii.RateFactor = null; + ii.GrossAmountTotal = ii.AmountTotal; + } + if (ii.ItemDescription.ToLower().Contains("probe")) { ii.UnitDescription = "GPos: 2001607"; diff --git a/ReportImp/FrauenhausEWFRA/ServiceInvoiceReport.Designer.cs b/ReportImp/FrauenhausEWFRA/ServiceInvoiceReport.Designer.cs index 5b417ba0b..ff30df7bb 100644 --- a/ReportImp/FrauenhausEWFRA/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/FrauenhausEWFRA/ServiceInvoiceReport.Designer.cs @@ -55,7 +55,6 @@ namespace FrauenhausEWFRA this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); @@ -143,7 +142,6 @@ namespace FrauenhausEWFRA this.xrLabel12, this.xrPictureBox1, this.xrLabel6, - this.xrLabel10, this.xrLabel7, this.xrLabel8}); this.Page1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); @@ -379,20 +377,6 @@ namespace FrauenhausEWFRA this.xrLabel6.StylePriority.UseForeColor = false; this.xrLabel6.Text = "Frauenhaus e.V., Postfach 190507, 42705 Solingen"; // - // xrLabel10 - // - this.xrLabel10.CanShrink = true; - this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Verdana", 16F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel10.ForeColor = System.Drawing.Color.Maroon; - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(29.50004F, 10.00001F); - this.xrLabel10.Name = "xrLabel10"; - this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel10.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrLabel10.SizeF = new System.Drawing.SizeF(316.9999F, 30.54167F); - this.xrLabel10.StylePriority.UseFont = false; - this.xrLabel10.StylePriority.UseForeColor = false; - this.xrLabel10.Text = "0212 3838893"; - // // xrLabel7 // this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(29.49994F, 90.70832F); @@ -626,7 +610,6 @@ namespace FrauenhausEWFRA private DevExpress.XtraReports.UI.XRLabel xrLabel7; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; private DevExpress.XtraReports.UI.XRLabel xrLabel6; - private DevExpress.XtraReports.UI.XRLabel xrLabel10; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; private DevExpress.XtraReports.UI.XRLabel xrLabel5; private DevExpress.XtraReports.UI.XRLabel xrLabel2; diff --git a/ReportImp/FrauenhausEWFRA/SettlementReport.Designer.cs b/ReportImp/FrauenhausEWFRA/SettlementReport.Designer.cs index 7bdb37589..54a2a3cba 100644 --- a/ReportImp/FrauenhausEWFRA/SettlementReport.Designer.cs +++ b/ReportImp/FrauenhausEWFRA/SettlementReport.Designer.cs @@ -58,8 +58,12 @@ namespace FrauenhausEWFRA this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); @@ -99,11 +103,6 @@ namespace FrauenhausEWFRA this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); - this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -361,7 +360,6 @@ namespace FrauenhausEWFRA this.xrLabel11, this.xrLabel14, this.xrLabel10, - this.xrLabel7, this.xrLabel20, this.xrLabel18, this.xrLabel19, @@ -385,6 +383,82 @@ namespace FrauenhausEWFRA this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // + // xrPictureBox1 + // + this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource")); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(470F, 0F); + this.xrPictureBox1.Name = "xrPictureBox1"; + this.xrPictureBox1.SizeF = new System.Drawing.SizeF(164.4662F, 144.9166F); + this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // + // xrLabel21 + // + this.xrLabel21.BackColor = System.Drawing.Color.Transparent; + this.xrLabel21.CanShrink = true; + this.xrLabel21.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); + this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(480.2502F, 238.2083F); + this.xrLabel21.Multiline = true; + this.xrLabel21.Name = "xrLabel21"; + this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel21.SizeF = new System.Drawing.SizeF(196.7498F, 18F); + this.xrLabel21.StylePriority.UseBackColor = false; + this.xrLabel21.StylePriority.UseFont = false; + this.xrLabel21.StylePriority.UseTextAlignment = false; + this.xrLabel21.Text = "frauenhaus-sg@t-online.de"; + this.xrLabel21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrLabel21.WordWrap = false; + // + // xrLabel8 + // + this.xrLabel8.BackColor = System.Drawing.Color.Transparent; + this.xrLabel8.CanShrink = true; + this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(480.25F, 220.2083F); + 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(196.7498F, 18F); + this.xrLabel8.StylePriority.UseBackColor = false; + this.xrLabel8.StylePriority.UseFont = false; + this.xrLabel8.StylePriority.UseTextAlignment = false; + this.xrLabel8.Text = "Tel.: 0212/3806978"; + this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrLabel8.WordWrap = false; + // + // xrLabel11 + // + this.xrLabel11.BackColor = System.Drawing.Color.Transparent; + this.xrLabel11.CanShrink = true; + this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(480.25F, 202.2083F); + 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(196.7498F, 18F); + this.xrLabel11.StylePriority.UseBackColor = false; + this.xrLabel11.StylePriority.UseFont = false; + this.xrLabel11.StylePriority.UseTextAlignment = false; + this.xrLabel11.Text = "Frau Lisa Breuer"; + this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrLabel11.WordWrap = false; + // + // xrLabel14 + // + this.xrLabel14.BackColor = System.Drawing.Color.Transparent; + this.xrLabel14.CanShrink = true; + this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(480.2502F, 166.2083F); + this.xrLabel14.Multiline = true; + this.xrLabel14.Name = "xrLabel14"; + this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel14.SizeF = new System.Drawing.SizeF(196.7497F, 18F); + this.xrLabel14.StylePriority.UseBackColor = false; + this.xrLabel14.StylePriority.UseFont = false; + this.xrLabel14.StylePriority.UseTextAlignment = false; + this.xrLabel14.Text = "GP-Nummer: [BusinessPartnerId]"; + this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrLabel14.WordWrap = false; + // // xrLabel10 // this.xrLabel10.BackColor = System.Drawing.Color.Transparent; @@ -404,20 +478,6 @@ namespace FrauenhausEWFRA this.xrLabel10.TextFormatString = "Solingen, den {0:dd.MM.yyyy}"; this.xrLabel10.WordWrap = false; // - // xrLabel7 - // - this.xrLabel7.CanShrink = true; - this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Verdana", 16F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel7.ForeColor = System.Drawing.Color.Maroon; - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(25F, 21.45834F); - this.xrLabel7.Name = "xrLabel7"; - this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel7.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrLabel7.SizeF = new System.Drawing.SizeF(316.9999F, 30.54167F); - this.xrLabel7.StylePriority.UseFont = false; - this.xrLabel7.StylePriority.UseForeColor = false; - this.xrLabel7.Text = "0212 3838893"; - // // xrLabel20 // this.xrLabel20.CanShrink = true; @@ -926,82 +986,6 @@ namespace FrauenhausEWFRA this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell58.Weight = 0.37019220629730171D; // - // xrPictureBox1 - // - this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource")); - this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(470F, 0F); - this.xrPictureBox1.Name = "xrPictureBox1"; - this.xrPictureBox1.SizeF = new System.Drawing.SizeF(164.4662F, 144.9166F); - this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - // - // xrLabel21 - // - this.xrLabel21.BackColor = System.Drawing.Color.Transparent; - this.xrLabel21.CanShrink = true; - this.xrLabel21.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(480.2502F, 238.2083F); - this.xrLabel21.Multiline = true; - this.xrLabel21.Name = "xrLabel21"; - this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel21.SizeF = new System.Drawing.SizeF(196.7498F, 18F); - this.xrLabel21.StylePriority.UseBackColor = false; - this.xrLabel21.StylePriority.UseFont = false; - this.xrLabel21.StylePriority.UseTextAlignment = false; - this.xrLabel21.Text = "frauenhaus-sg@t-online.de"; - this.xrLabel21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrLabel21.WordWrap = false; - // - // xrLabel8 - // - this.xrLabel8.BackColor = System.Drawing.Color.Transparent; - this.xrLabel8.CanShrink = true; - this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(480.25F, 220.2083F); - 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(196.7498F, 18F); - this.xrLabel8.StylePriority.UseBackColor = false; - this.xrLabel8.StylePriority.UseFont = false; - this.xrLabel8.StylePriority.UseTextAlignment = false; - this.xrLabel8.Text = "Tel.: 0212/3806978"; - this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrLabel8.WordWrap = false; - // - // xrLabel11 - // - this.xrLabel11.BackColor = System.Drawing.Color.Transparent; - this.xrLabel11.CanShrink = true; - this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(480.25F, 202.2083F); - 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(196.7498F, 18F); - this.xrLabel11.StylePriority.UseBackColor = false; - this.xrLabel11.StylePriority.UseFont = false; - this.xrLabel11.StylePriority.UseTextAlignment = false; - this.xrLabel11.Text = "Frau Lisa Breuer"; - this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrLabel11.WordWrap = false; - // - // xrLabel14 - // - this.xrLabel14.BackColor = System.Drawing.Color.Transparent; - this.xrLabel14.CanShrink = true; - this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(480.2502F, 166.2083F); - this.xrLabel14.Multiline = true; - this.xrLabel14.Name = "xrLabel14"; - this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel14.SizeF = new System.Drawing.SizeF(196.7497F, 18F); - this.xrLabel14.StylePriority.UseBackColor = false; - this.xrLabel14.StylePriority.UseFont = false; - this.xrLabel14.StylePriority.UseTextAlignment = false; - this.xrLabel14.Text = "GP-Nummer: [BusinessPartnerId]"; - this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrLabel14.WordWrap = false; - // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1098,7 +1082,6 @@ namespace FrauenhausEWFRA private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; - private DevExpress.XtraReports.UI.XRLabel xrLabel7; private DevExpress.XtraReports.UI.XRLabel xrLabel20; private DevExpress.XtraReports.UI.XRLabel xrLabel9; private DevExpress.XtraReports.UI.XRLabel xrLabel10; diff --git a/ReportImp/FrauenhausEWFRA/SettlementReport2.Designer.cs b/ReportImp/FrauenhausEWFRA/SettlementReport2.Designer.cs index a21f0d95b..37d266a70 100644 --- a/ReportImp/FrauenhausEWFRA/SettlementReport2.Designer.cs +++ b/ReportImp/FrauenhausEWFRA/SettlementReport2.Designer.cs @@ -57,7 +57,11 @@ namespace FrauenhausEWFRA.Alt this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); - this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); @@ -100,11 +104,6 @@ namespace FrauenhausEWFRA.Alt this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); - this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -334,7 +333,6 @@ namespace FrauenhausEWFRA.Alt this.xrLabel4, this.xrLabel10, this.xrLabel11, - this.xrLabel5, this.xrLabel6, this.xrLabel8, this.xrLabel13, @@ -359,19 +357,81 @@ namespace FrauenhausEWFRA.Alt this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // - // xrLabel5 + // xrPictureBox1 // - this.xrLabel5.CanShrink = true; - this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Verdana", 16F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel5.ForeColor = System.Drawing.Color.Maroon; - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(25.00022F, 22.50001F); - this.xrLabel5.Name = "xrLabel5"; - this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel5.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrLabel5.SizeF = new System.Drawing.SizeF(316.9999F, 30.54167F); - this.xrLabel5.StylePriority.UseFont = false; - this.xrLabel5.StylePriority.UseForeColor = false; - this.xrLabel5.Text = "0212 3838893"; + this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource")); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(470F, 0F); + this.xrPictureBox1.Name = "xrPictureBox1"; + this.xrPictureBox1.SizeF = new System.Drawing.SizeF(164.4662F, 144.9166F); + this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // + // xrLabel3 + // + this.xrLabel3.BackColor = System.Drawing.Color.Transparent; + this.xrLabel3.CanShrink = true; + this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(480.2502F, 238.2083F); + this.xrLabel3.Multiline = true; + this.xrLabel3.Name = "xrLabel3"; + this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(196.7498F, 18F); + this.xrLabel3.StylePriority.UseBackColor = false; + this.xrLabel3.StylePriority.UseFont = false; + this.xrLabel3.StylePriority.UseTextAlignment = false; + this.xrLabel3.Text = "frauenhaus-sg@t-online.de"; + this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrLabel3.WordWrap = false; + // + // xrLabel4 + // + this.xrLabel4.BackColor = System.Drawing.Color.Transparent; + this.xrLabel4.CanShrink = true; + this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(480.25F, 220.2083F); + this.xrLabel4.Multiline = true; + this.xrLabel4.Name = "xrLabel4"; + this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(196.7498F, 18F); + this.xrLabel4.StylePriority.UseBackColor = false; + this.xrLabel4.StylePriority.UseFont = false; + this.xrLabel4.StylePriority.UseTextAlignment = false; + this.xrLabel4.Text = "Tel.: 0212/3806978"; + this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrLabel4.WordWrap = false; + // + // xrLabel10 + // + this.xrLabel10.BackColor = System.Drawing.Color.Transparent; + this.xrLabel10.CanShrink = true; + this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(480.25F, 202.2083F); + this.xrLabel10.Multiline = true; + this.xrLabel10.Name = "xrLabel10"; + this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel10.SizeF = new System.Drawing.SizeF(196.7498F, 18F); + this.xrLabel10.StylePriority.UseBackColor = false; + this.xrLabel10.StylePriority.UseFont = false; + this.xrLabel10.StylePriority.UseTextAlignment = false; + this.xrLabel10.Text = "Frau Lisa Breuer"; + this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrLabel10.WordWrap = false; + // + // xrLabel11 + // + this.xrLabel11.BackColor = System.Drawing.Color.Transparent; + this.xrLabel11.CanShrink = true; + this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(480.2502F, 166.2083F); + 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(196.7497F, 18F); + this.xrLabel11.StylePriority.UseBackColor = false; + this.xrLabel11.StylePriority.UseFont = false; + this.xrLabel11.StylePriority.UseTextAlignment = false; + this.xrLabel11.Text = "GP-Nummer: [BusinessPartnerId]"; + this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrLabel11.WordWrap = false; // // xrLabel6 // @@ -926,82 +986,6 @@ namespace FrauenhausEWFRA.Alt this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell17.Weight = 0.21685899000901443D; // - // xrPictureBox1 - // - this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource")); - this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(470F, 0F); - this.xrPictureBox1.Name = "xrPictureBox1"; - this.xrPictureBox1.SizeF = new System.Drawing.SizeF(164.4662F, 144.9166F); - this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - // - // xrLabel3 - // - this.xrLabel3.BackColor = System.Drawing.Color.Transparent; - this.xrLabel3.CanShrink = true; - this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(480.2502F, 238.2083F); - this.xrLabel3.Multiline = true; - this.xrLabel3.Name = "xrLabel3"; - this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(196.7498F, 18F); - this.xrLabel3.StylePriority.UseBackColor = false; - this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.StylePriority.UseTextAlignment = false; - this.xrLabel3.Text = "frauenhaus-sg@t-online.de"; - this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrLabel3.WordWrap = false; - // - // xrLabel4 - // - this.xrLabel4.BackColor = System.Drawing.Color.Transparent; - this.xrLabel4.CanShrink = true; - this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(480.25F, 220.2083F); - this.xrLabel4.Multiline = true; - this.xrLabel4.Name = "xrLabel4"; - this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel4.SizeF = new System.Drawing.SizeF(196.7498F, 18F); - this.xrLabel4.StylePriority.UseBackColor = false; - this.xrLabel4.StylePriority.UseFont = false; - this.xrLabel4.StylePriority.UseTextAlignment = false; - this.xrLabel4.Text = "Tel.: 0212/3806978"; - this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrLabel4.WordWrap = false; - // - // xrLabel10 - // - this.xrLabel10.BackColor = System.Drawing.Color.Transparent; - this.xrLabel10.CanShrink = true; - this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(480.25F, 202.2083F); - this.xrLabel10.Multiline = true; - this.xrLabel10.Name = "xrLabel10"; - this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel10.SizeF = new System.Drawing.SizeF(196.7498F, 18F); - this.xrLabel10.StylePriority.UseBackColor = false; - this.xrLabel10.StylePriority.UseFont = false; - this.xrLabel10.StylePriority.UseTextAlignment = false; - this.xrLabel10.Text = "Frau Lisa Breuer"; - this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrLabel10.WordWrap = false; - // - // xrLabel11 - // - this.xrLabel11.BackColor = System.Drawing.Color.Transparent; - this.xrLabel11.CanShrink = true; - this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(480.2502F, 166.2083F); - 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(196.7497F, 18F); - this.xrLabel11.StylePriority.UseBackColor = false; - this.xrLabel11.StylePriority.UseFont = false; - this.xrLabel11.StylePriority.UseTextAlignment = false; - this.xrLabel11.Text = "GP-Nummer: [BusinessPartnerId]"; - this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrLabel11.WordWrap = false; - // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1100,7 +1084,6 @@ namespace FrauenhausEWFRA.Alt private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; private DevExpress.XtraReports.UI.XRTableCell xrTableCell17; private DevExpress.XtraReports.UI.XRLabel xrLabel2; - private DevExpress.XtraReports.UI.XRLabel xrLabel5; private DevExpress.XtraReports.UI.XRLabel xrLabel6; private DevExpress.XtraReports.UI.XRLabel xrLabel9; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; diff --git a/ReportImp/LebenshilfeStadeMID/Invoicing/CustomInvoiceCreation.cs b/ReportImp/LebenshilfeStadeMID/Invoicing/CustomInvoiceCreation.cs index 3adf7f34e..b5641d6d0 100644 --- a/ReportImp/LebenshilfeStadeMID/Invoicing/CustomInvoiceCreation.cs +++ b/ReportImp/LebenshilfeStadeMID/Invoicing/CustomInvoiceCreation.cs @@ -99,8 +99,8 @@ namespace LebenshilfeStadeMID.Invoicing var newList = result.Where(i => i.UnitCount.HasValue && i.UnitCount.Value > 0).OrderBy(i => i.ItemPeriodStart).ToList(); - - return CreateSummaryInvoiceItems(newList, invoicePeriod, scap, calc, false, false); + + return CreateSummaryInvoiceItems(newList, invoicePeriod, scap, calc, false, false); } @@ -202,6 +202,7 @@ namespace LebenshilfeStadeMID.Invoicing case "Qualifizierte Schulbegleitung (EGH)": maxKrankheitstage = 10; break; case "Einfache Schulassistenz (JAS)": maxKrankheitstage = 20; break; case "Qualifizierte Schulassistenz (JAS)": maxKrankheitstage = 20; break; + case "Nachqualifizierte Schulbegleitung (JAS)": maxKrankheitstage = 20; break; } } } diff --git a/ReportImp/LebenshilfeStadeMID/LebenshilfeStadeMID.csproj b/ReportImp/LebenshilfeStadeMID/LebenshilfeStadeMID.csproj index 95e4ba121..f268a556d 100644 --- a/ReportImp/LebenshilfeStadeMID/LebenshilfeStadeMID.csproj +++ b/ReportImp/LebenshilfeStadeMID/LebenshilfeStadeMID.csproj @@ -45,6 +45,8 @@ + + @@ -142,6 +144,8 @@ SbdRechnung.cs - + + + \ No newline at end of file diff --git a/ReportImp/LebenshilfeStadeMID/Quittierungsbeleg.cs b/ReportImp/LebenshilfeStadeMID/Quittierungsbeleg.cs index 22bbbcca2..4123dc19d 100644 --- a/ReportImp/LebenshilfeStadeMID/Quittierungsbeleg.cs +++ b/ReportImp/LebenshilfeStadeMID/Quittierungsbeleg.cs @@ -11,6 +11,7 @@ using BeWo.Report.ReportObjects; using BeWo.Service.DCEntityMapper; using BS.Shared.Core; using BS.Shared.DataContracts; +using BS.Shared.Extensions; using DevExpress.XtraReports.UI; namespace LebenshilfeStadeMID @@ -29,6 +30,14 @@ namespace LebenshilfeStadeMID if (pRO.Services != null) { + // Verfügungszeiten und Zusatzleistungen aus der Liste rauskopieren, weil die Werte am Ende alle in einer Zeile stehen sollen + List verfuegungszeiten = new List(); + List zusatzleistungen = new List(); + verfuegungszeiten.AddRange(pRO.Services.Where(s => s.ServiceDescription.ToLower().Contains("verfügungszeit")).ToList()); + zusatzleistungen.AddRange(pRO.Services.Where(s => s.ServiceDescription.ToLower().Contains("bewilligte zusatzleistung")).ToList()); + pRO.Services.RemoveRange(verfuegungszeiten); + pRO.Services.RemoveRange(zusatzleistungen); + var customer = MapperFactory.CustomerDC_Customer.MapToNewDC(DAOFactory.GenericDAO.GetByID(pRO.CustomerOid)); if (customer.RelatedEmployees != null && customer.RelatedEmployees.Count > 0) { @@ -47,19 +56,28 @@ namespace LebenshilfeStadeMID sd.Notice = ""; sd.Notice2 = ""; - if (sd.ServiceDescription.ToLower().Contains("verfügungszeit")) + // Verfügungszeit in eigentlichen ServiceRecord eintragen und aus Liste entfernen, dass der nicht mehrfach übertragen wird + var vz = verfuegungszeiten.FirstOrDefault(s => s.StartDate.Date == sd.StartDate.Date); + var zl = zusatzleistungen.FirstOrDefault(s => s.StartDate.Date == sd.StartDate.Date); + if (vz != null) { - sd.Notice = string.Format("{0:0}", sd.Minutes); - summeVerfuegungszeit += sd.Minutes; - } - else if (sd.ServiceDescription.ToLower().Contains("bewilligte zusatzleistung")) + sd.Notice = string.Format("{0:0}", vz.Minutes); + sd.Minutes += vz.Minutes; + summeVerfuegungszeit += vz.Minutes; + verfuegungszeiten.Remove(vz); + } + // Zusatzleistung in eigentlichen ServiceRecord eintragen und aus Liste entfernen, dass der nicht mehrfach übertragen wird + else if (zl != null) { - sd.Notice2 = string.Format("{0:0}", sd.Minutes); - summeZusatzleistung += sd.Minutes; + sd.Notice2 = string.Format("{0:0}", zl.Minutes); + sd.Minutes += zl.Minutes; + summeZusatzleistung += zl.Minutes; + zusatzleistungen.Remove(zl); } if (sd.IsBillable || sd.ServiceDescription.ToLower().Contains("fehlkontakt") || sd.ServiceCategory.ToLower().Contains("fehlkontakt")) - servicesBillable.Add(sd); + if (!sd.ServiceDescription.IsNullOrEmpty()) + servicesBillable.Add(sd); } pRO.Services = servicesBillable;