diff --git a/ReportImp/PerspektivenEV/CollectiveBillingReportTabBthg.designer.cs b/ReportImp/PerspektivenEV/CollectiveBillingReportTabBthg.designer.cs index a5b2d9e80..6aa973f30 100644 --- a/ReportImp/PerspektivenEV/CollectiveBillingReportTabBthg.designer.cs +++ b/ReportImp/PerspektivenEV/CollectiveBillingReportTabBthg.designer.cs @@ -85,9 +85,6 @@ namespace PerspektivenEV this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); - this.fieldMonatskontingent = new DevExpress.XtraReports.UI.CalculatedField(); - this.PageFooter = new DevExpress.XtraReports.UI.PageFooterBand(); - this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo(); this.GroupHeader3 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); @@ -95,6 +92,9 @@ namespace PerspektivenEV this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); + this.fieldMonatskontingent = new DevExpress.XtraReports.UI.CalculatedField(); + this.PageFooter = new DevExpress.XtraReports.UI.PageFooterBand(); + this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); @@ -689,31 +689,6 @@ namespace PerspektivenEV this.xrPictureBox1.SizeF = new System.Drawing.SizeF(231.4583F, 57.22917F); this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; // - // fieldMonatskontingent - // - this.fieldMonatskontingent.DataMember = "ServiceInvoicePeriods"; - this.fieldMonatskontingent.Expression = "[SupportConceptApprovalPeriod.ApprovedBEPerInterval]/12"; - this.fieldMonatskontingent.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; - this.fieldMonatskontingent.Name = "fieldMonatskontingent"; - // - // PageFooter - // - this.PageFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrPageInfo2}); - this.PageFooter.HeightF = 32.99997F; - this.PageFooter.Name = "PageFooter"; - // - // xrPageInfo2 - // - this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8.25F); - this.xrPageInfo2.Format = "Seite {0} von {1}"; - this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(863.0001F, 9.999974F); - this.xrPageInfo2.Name = "xrPageInfo2"; - this.xrPageInfo2.RunningBand = this.DetailReport; - this.xrPageInfo2.SizeF = new System.Drawing.SizeF(219.9999F, 23F); - this.xrPageInfo2.StylePriority.UseFont = false; - this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - // // GroupHeader3 // this.GroupHeader3.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] { @@ -794,6 +769,31 @@ namespace PerspektivenEV this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell18.Weight = 0.23571046330983655D; // + // fieldMonatskontingent + // + this.fieldMonatskontingent.DataMember = "ServiceInvoicePeriods"; + this.fieldMonatskontingent.Expression = "[SupportConceptApprovalPeriod.ApprovedBEPerInterval]/12"; + this.fieldMonatskontingent.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldMonatskontingent.Name = "fieldMonatskontingent"; + // + // PageFooter + // + this.PageFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrPageInfo2}); + this.PageFooter.HeightF = 32.99997F; + this.PageFooter.Name = "PageFooter"; + // + // xrPageInfo2 + // + this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8.25F); + this.xrPageInfo2.Format = "Seite {0} von {1}"; + this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(863.0001F, 9.999974F); + this.xrPageInfo2.Name = "xrPageInfo2"; + this.xrPageInfo2.RunningBand = this.DetailReport; + this.xrPageInfo2.SizeF = new System.Drawing.SizeF(219.9999F, 23F); + this.xrPageInfo2.StylePriority.UseFont = false; + this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); diff --git a/ReportImp/PerspektivenEV/Invoicing/CollectiveInvoiceCreationBthg.cs b/ReportImp/PerspektivenEV/Invoicing/CollectiveInvoiceCreationBthg.cs index 0ee2993e7..6828dd7f3 100644 --- a/ReportImp/PerspektivenEV/Invoicing/CollectiveInvoiceCreationBthg.cs +++ b/ReportImp/PerspektivenEV/Invoicing/CollectiveInvoiceCreationBthg.cs @@ -217,9 +217,16 @@ namespace PerspektivenEV.Invoicing { LG = (decimal)GetLeistungsgruppe(supportConceptApprovalPeriod.ApprovedBEPerInterval, cat); ii.Notice = LG.ToString(); - ii.AmountPerUnit = LG * (decimal)Math.Round((double)data[0].AmountTotal / 60, 4, MidpointRounding.AwayFromZero); + if (cat.Abbreviation.ToLower().Substring(cat.Abbreviation.Length - 3) == "alt") + { + ii.AmountPerUnit = LG * (decimal)Math.Round((double)data[0].AmountTotal / 60, 4, MidpointRounding.AwayFromZero); + } + else + { + ii.AmountPerUnit = (decimal)Math.Round((double)data[0].AmountTotal * Math.Round((double)LG / 60, 2, MidpointRounding.AwayFromZero), 2, MidpointRounding.AwayFromZero); + } // Leistung - if (cat.Abbreviation.Substring(cat.Abbreviation.Length - 2) == "QA" || cat.Abbreviation.Substring(cat.Abbreviation.Length - 5) == "QAAlt" || cat.Abbreviation.Substring(cat.Abbreviation.Length - 5) == "KAAlt") + if (cat.Abbreviation.Substring(cat.Abbreviation.Length - 2) == "QA" || cat.Abbreviation.Substring(cat.Abbreviation.Length - 5) == "QAAlt") { ii.ItemDescription = "Qualifizierte Assistenz"; } @@ -328,6 +335,7 @@ namespace PerspektivenEV.Invoicing if (catQA.Abbreviation.ToLower().Substring(catQA.Abbreviation.Length - 5) == "qaalt") { preisQa = lgQA * (decimal)Math.Round((double)stdPreis / 60, 4, MidpointRounding.AwayFromZero); + preisQa =(decimal)Math.Round((double)preisQa, 2, MidpointRounding.AwayFromZero); } else { @@ -382,6 +390,33 @@ namespace PerspektivenEV.Invoicing lg = 18; } } + else if (cat.Abbreviation.ToLower().Substring(cat.Abbreviation.Length - 2) == "ka") + { + if (approvedBEPerInterval == null || approvedBEPerInterval.Value < 16) + { + lg = 0; + } + else if (approvedBEPerInterval.Value < 45) + { + lg = 30; + } + else if (approvedBEPerInterval.Value < 75) + { + lg = 60; + } + else if (approvedBEPerInterval.Value < 105) + { + lg = 90; + } + else if (approvedBEPerInterval.Value < 135) + { + lg = 120; + } + else if (approvedBEPerInterval.Value < 165) + { + lg = 150; + } + } else if (cat.Abbreviation.StartsWith("TS")) { if (approvedBEPerInterval == null || approvedBEPerInterval.Value < 91)