diff --git a/ReportImp/DomizielAnsbach/Invoicing/InvoiceHelper.cs b/ReportImp/DomizielAnsbach/Invoicing/InvoiceHelper.cs index 431253b27..7712a824e 100644 --- a/ReportImp/DomizielAnsbach/Invoicing/InvoiceHelper.cs +++ b/ReportImp/DomizielAnsbach/Invoicing/InvoiceHelper.cs @@ -41,7 +41,11 @@ namespace DomizielAnsbach.Invoicing while (start <= ende) { DateTime monatStart = start; //new DateTime(start.Year, start.Month, 1); - DateTime monatEnde = ende.AddDays(1); // monatStart.AddMonths(1); + DateTime monatEnde = monatStart.AddMonths(1); //ende.AddDays(1); + if (ende.AddDays(2) < monatStart.AddMonths(1)) + { + monatEnde = ende.AddDays(1); + } var tageMonat = monatEnde.Subtract(start).Days; @@ -96,10 +100,8 @@ namespace DomizielAnsbach.Invoicing ii.SupportConceptApprovalPeriodOid = scap.Oid; ii.ItemDescription = ""; - ergebnis.Add(ii); - ii = new InvoiceItem(); ii.UnitCount = tageAbwesendImMonat; ii.AmountPerUnit = freihalte; diff --git a/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTab.Designer.cs b/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTab.Designer.cs index ea962b91e..6a59247f0 100644 --- a/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTab.Designer.cs +++ b/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTab.Designer.cs @@ -36,7 +36,6 @@ namespace KlinikumWerraMeissner this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); @@ -104,8 +103,7 @@ namespace KlinikumWerraMeissner this.xrPictureBox1, this.xrLabel2, this.xrLabel1, - this.xrLabel3, - this.xrLabel5}); + this.xrLabel3}); this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F); this.ReportHeader.HeightF = 120.625F; this.ReportHeader.Name = "ReportHeader"; @@ -129,7 +127,7 @@ namespace KlinikumWerraMeissner this.xrLabel2.Multiline = true; this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel2.SizeF = new System.Drawing.SizeF(254.5001F, 25F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(202.9164F, 25F); this.xrLabel2.StylePriority.UseBackColor = false; this.xrLabel2.StylePriority.UseBorders = false; this.xrLabel2.StylePriority.UseFont = false; @@ -164,10 +162,10 @@ namespace KlinikumWerraMeissner this.xrLabel3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel3.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(254.5004F, 85.62498F); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(202.9168F, 85.62498F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(130.4999F, 25F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(259.5866F, 25F); this.xrLabel3.StylePriority.UseBackColor = false; this.xrLabel3.StylePriority.UseBorders = false; this.xrLabel3.StylePriority.UseFont = false; @@ -177,22 +175,6 @@ namespace KlinikumWerraMeissner this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrLabel3.WordWrap = false; // - // xrLabel5 - // - this.xrLabel5.BackColor = System.Drawing.Color.Silver; - this.xrLabel5.Font = new System.Drawing.Font("Arial", 8F); - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(462.5037F, 72.08331F); - this.xrLabel5.Multiline = true; - this.xrLabel5.Name = "xrLabel5"; - this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel5.SizeF = new System.Drawing.SizeF(284.9999F, 48.54168F); - this.xrLabel5.StylePriority.UseBackColor = false; - this.xrLabel5.StylePriority.UseFont = false; - this.xrLabel5.StylePriority.UseTextAlignment = false; - this.xrLabel5.Text = "Die Werte ergeben sich aus der Anlage 2 zu\r\n§ 12 Abs. 1 Zusatzvereinbarung \"Betre" + - "utes Wohnen für Menschen mit Behinderungen\" "; - this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - // // ruleRateFactorNull // this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?"; @@ -802,7 +784,6 @@ namespace KlinikumWerraMeissner private DevExpress.XtraReports.UI.XRLabel xrLabel2; private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.XRLabel xrLabel3; - private DevExpress.XtraReports.UI.XRLabel xrLabel5; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; } } diff --git a/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTabIntern.Designer.cs b/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTabIntern.Designer.cs index b605a61a8..0faf60d53 100644 --- a/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTabIntern.Designer.cs +++ b/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTabIntern.Designer.cs @@ -36,7 +36,6 @@ namespace KlinikumWerraMeissner this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); @@ -104,8 +103,7 @@ namespace KlinikumWerraMeissner this.xrPictureBox1, this.xrLabel2, this.xrLabel1, - this.xrLabel3, - this.xrLabel5}); + this.xrLabel3}); this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F); this.ReportHeader.HeightF = 120.625F; this.ReportHeader.Name = "ReportHeader"; @@ -129,7 +127,7 @@ namespace KlinikumWerraMeissner this.xrLabel2.Multiline = true; this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel2.SizeF = new System.Drawing.SizeF(254.5001F, 25F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(202.9164F, 25F); this.xrLabel2.StylePriority.UseBackColor = false; this.xrLabel2.StylePriority.UseBorders = false; this.xrLabel2.StylePriority.UseFont = false; @@ -164,10 +162,10 @@ namespace KlinikumWerraMeissner this.xrLabel3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel3.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(254.5004F, 85.62498F); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(202.9168F, 85.62498F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(130.4999F, 25F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(259.5866F, 25F); this.xrLabel3.StylePriority.UseBackColor = false; this.xrLabel3.StylePriority.UseBorders = false; this.xrLabel3.StylePriority.UseFont = false; @@ -177,22 +175,6 @@ namespace KlinikumWerraMeissner this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrLabel3.WordWrap = false; // - // xrLabel5 - // - this.xrLabel5.BackColor = System.Drawing.Color.Silver; - this.xrLabel5.Font = new System.Drawing.Font("Arial", 8F); - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(462.5037F, 72.08331F); - this.xrLabel5.Multiline = true; - this.xrLabel5.Name = "xrLabel5"; - this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel5.SizeF = new System.Drawing.SizeF(284.9999F, 48.54168F); - this.xrLabel5.StylePriority.UseBackColor = false; - this.xrLabel5.StylePriority.UseFont = false; - this.xrLabel5.StylePriority.UseTextAlignment = false; - this.xrLabel5.Text = "Die Werte ergeben sich aus der Anlage 2 zu\r\n§ 12 Abs. 1 Zusatzvereinbarung \"Betre" + - "utes Wohnen für Menschen mit Behinderungen\" "; - this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - // // ruleRateFactorNull // this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?"; @@ -590,7 +572,8 @@ namespace KlinikumWerraMeissner this.xrTableCell23.StylePriority.UseFont = false; this.xrTableCell23.StylePriority.UsePadding = false; this.xrTableCell23.StylePriority.UseTextAlignment = false; - this.xrTableCell23.Text = "[CustomerLastname], [CustomerFirstname]"; + this.xrTableCell23.Text = "[ServiceInvoicePeriods.Customer.LastName], [ServiceInvoicePeriods.Customer.FirstN" + + "ame]"; this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; this.xrTableCell23.Weight = 0.56291127467692559D; // @@ -800,7 +783,6 @@ namespace KlinikumWerraMeissner private DevExpress.XtraReports.UI.XRLabel xrLabel2; private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.XRLabel xrLabel3; - private DevExpress.XtraReports.UI.XRLabel xrLabel5; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; } } diff --git a/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTab_alt.Designer.cs b/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTab_alt.Designer.cs index 8c462a8f4..acf39eaa9 100644 --- a/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTab_alt.Designer.cs +++ b/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTab_alt.Designer.cs @@ -47,6 +47,10 @@ namespace KlinikumWerraMeissner this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); this.ruleNoticeNull = new DevExpress.XtraReports.UI.FormattingRule(); this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -75,11 +79,6 @@ namespace KlinikumWerraMeissner this.fieldMonatskontingent = new DevExpress.XtraReports.UI.CalculatedField(); this.feldEurStd = new DevExpress.XtraReports.UI.CalculatedField(); this.feldEurMin = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); @@ -230,7 +229,6 @@ namespace KlinikumWerraMeissner // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel5, this.xrLabel3, this.xrLabel1, this.xrLabel2, @@ -242,6 +240,72 @@ namespace KlinikumWerraMeissner this.Page1.StylePriority.UseBorders = false; this.Page1.StylePriority.UseFont = false; // + // xrLabel3 + // + this.xrLabel3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrLabel3.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(183.6671F, 88.43749F); + this.xrLabel3.Name = "xrLabel3"; + this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(255.4996F, 25F); + this.xrLabel3.StylePriority.UseBackColor = false; + this.xrLabel3.StylePriority.UseBorders = false; + this.xrLabel3.StylePriority.UseFont = false; + this.xrLabel3.StylePriority.UseForeColor = false; + this.xrLabel3.StylePriority.UseTextAlignment = false; + this.xrLabel3.Text = "[AccountingPeriodStart!MMMM yyyy]"; + this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrLabel3.WordWrap = false; + // + // xrLabel1 + // + this.xrLabel1.BackColor = System.Drawing.Color.Transparent; + this.xrLabel1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrLabel1.CanShrink = true; + this.xrLabel1.Font = new System.Drawing.Font("Arial", 16F, System.Drawing.FontStyle.Bold); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25.31252F); + this.xrLabel1.Multiline = true; + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(385.0001F, 25F); + this.xrLabel1.StylePriority.UseBackColor = false; + this.xrLabel1.StylePriority.UseBorders = false; + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.StylePriority.UseTextAlignment = false; + this.xrLabel1.Text = "Abrechnung Qualifizierte Assistenz"; + this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrLabel1.WordWrap = false; + // + // xrLabel2 + // + this.xrLabel2.BackColor = System.Drawing.Color.Transparent; + this.xrLabel2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0.0003814697F, 88.43749F); + this.xrLabel2.Multiline = true; + this.xrLabel2.Name = "xrLabel2"; + this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(183.6667F, 25F); + this.xrLabel2.StylePriority.UseBackColor = false; + this.xrLabel2.StylePriority.UseBorders = false; + this.xrLabel2.StylePriority.UseFont = false; + this.xrLabel2.StylePriority.UseTextAlignment = false; + this.xrLabel2.Text = "Abrechnungsmonat: "; + this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrLabel2.WordWrap = false; + // + // xrPictureBox1 + // + this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image"))); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(824.3785F, 0F); + this.xrPictureBox1.Name = "xrPictureBox1"; + this.xrPictureBox1.SizeF = new System.Drawing.SizeF(244.6215F, 120.625F); + this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // // xrTable5 // this.xrTable5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) @@ -541,88 +605,6 @@ namespace KlinikumWerraMeissner "ds.SupportConceptApprovalPeriod.ApprovedBEPerInterval], 4)"; this.feldEurMin.Name = "feldEurMin"; // - // xrLabel5 - // - this.xrLabel5.BackColor = System.Drawing.Color.Silver; - this.xrLabel5.Font = new System.Drawing.Font("Arial", 8F); - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(462.5036F, 74.89583F); - this.xrLabel5.Multiline = true; - this.xrLabel5.Name = "xrLabel5"; - this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel5.SizeF = new System.Drawing.SizeF(284.9999F, 48.54168F); - this.xrLabel5.StylePriority.UseBackColor = false; - this.xrLabel5.StylePriority.UseFont = false; - this.xrLabel5.StylePriority.UseTextAlignment = false; - this.xrLabel5.Text = "Die Werte ergeben sich aus der Anlage 2 zu\r\n§ 12 Abs. 1 Zusatzvereinbarung \"Betre" + - "utes Wohnen für Menschen mit Behinderungen\" "; - this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - // - // xrLabel3 - // - this.xrLabel3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel3.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(254.5003F, 88.43749F); - this.xrLabel3.Name = "xrLabel3"; - this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(130.4999F, 25F); - this.xrLabel3.StylePriority.UseBackColor = false; - this.xrLabel3.StylePriority.UseBorders = false; - this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.StylePriority.UseForeColor = false; - this.xrLabel3.StylePriority.UseTextAlignment = false; - this.xrLabel3.Text = "[AccountingPeriodStart!MMMM yyyy]"; - this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrLabel3.WordWrap = false; - // - // xrLabel1 - // - this.xrLabel1.BackColor = System.Drawing.Color.Transparent; - this.xrLabel1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel1.CanShrink = true; - this.xrLabel1.Font = new System.Drawing.Font("Arial", 16F, System.Drawing.FontStyle.Bold); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25.31252F); - this.xrLabel1.Multiline = true; - this.xrLabel1.Name = "xrLabel1"; - this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel1.SizeF = new System.Drawing.SizeF(385.0001F, 25F); - this.xrLabel1.StylePriority.UseBackColor = false; - this.xrLabel1.StylePriority.UseBorders = false; - this.xrLabel1.StylePriority.UseFont = false; - this.xrLabel1.StylePriority.UseTextAlignment = false; - this.xrLabel1.Text = "Abrechnung Qualifizierte Assistenz"; - this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrLabel1.WordWrap = false; - // - // xrLabel2 - // - this.xrLabel2.BackColor = System.Drawing.Color.Transparent; - this.xrLabel2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0.0003814697F, 88.43749F); - this.xrLabel2.Multiline = true; - this.xrLabel2.Name = "xrLabel2"; - this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel2.SizeF = new System.Drawing.SizeF(254.5001F, 25F); - this.xrLabel2.StylePriority.UseBackColor = false; - this.xrLabel2.StylePriority.UseBorders = false; - this.xrLabel2.StylePriority.UseFont = false; - this.xrLabel2.StylePriority.UseTextAlignment = false; - this.xrLabel2.Text = "Abrechnungsmonat: "; - this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrLabel2.WordWrap = false; - // - // xrPictureBox1 - // - this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image"))); - this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(824.3785F, 0F); - this.xrPictureBox1.Name = "xrPictureBox1"; - this.xrPictureBox1.SizeF = new System.Drawing.SizeF(244.6215F, 120.625F); - this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - // // Sammelrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -703,7 +685,6 @@ namespace KlinikumWerraMeissner private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; private DevExpress.XtraReports.UI.CalculatedField feldEurStd; private DevExpress.XtraReports.UI.CalculatedField feldEurMin; - private DevExpress.XtraReports.UI.XRLabel xrLabel5; private DevExpress.XtraReports.UI.XRLabel xrLabel3; private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.XRLabel xrLabel2; diff --git a/ReportImp/KlinikumWerraMeissner/CustomReportCreator.cs b/ReportImp/KlinikumWerraMeissner/CustomReportCreator.cs index 298b5e909..04761fdcf 100644 --- a/ReportImp/KlinikumWerraMeissner/CustomReportCreator.cs +++ b/ReportImp/KlinikumWerraMeissner/CustomReportCreator.cs @@ -57,7 +57,7 @@ namespace KlinikumWerraMeissner ((XtraReport)singleReport).CreateDocument(); invoiceReport = singleReport as XtraReport; - if (iDC.InvoiceBase.InvoiceId == "SammelrechnungNeu") + if (iDC.InvoiceBase.InvoiceId == "SammelrechnungNeu" || iDC.InvoiceBase.InvoiceId == "Sammelrechnung") { var anhang = new SammelrechnungInternTab(); anhang.SetReportDataSource(ro); diff --git a/ReportImp/KlinikumWerraMeissner/Invoicing/CustomInvoiceFactory.cs b/ReportImp/KlinikumWerraMeissner/Invoicing/CustomInvoiceFactory.cs index f097e7083..3e57cae31 100644 --- a/ReportImp/KlinikumWerraMeissner/Invoicing/CustomInvoiceFactory.cs +++ b/ReportImp/KlinikumWerraMeissner/Invoicing/CustomInvoiceFactory.cs @@ -13,7 +13,7 @@ namespace KlinikumWerraMeissner.Invoicing { foreach (var key in supportConcepts2ServiceRecords.Keys) { - if (!String.IsNullOrEmpty(key.CostBearer) && key.CostBearer.Contains("LWV Hessen (NEU)")) + if (!String.IsNullOrEmpty(key.CostBearer) && key.CostBearer.Contains("LWV Hessen (NEU)") || key.CostBearer.ToLower().Contains("(neu)")) { return new CollectiveInvoiceCreation(); } @@ -22,7 +22,7 @@ namespace KlinikumWerraMeissner.Invoicing return new CollectiveInvoiceCreationOld(); } } - return new CollectiveInvoiceCreation(); + return new CollectiveInvoiceCreationOld(); } } } diff --git a/ReportImp/SHKService/Invoicing/CollectiveInvoiceCreation.cs b/ReportImp/SHKService/Invoicing/CollectiveInvoiceCreation.cs index 814cc8f28..c07ee9e85 100644 --- a/ReportImp/SHKService/Invoicing/CollectiveInvoiceCreation.cs +++ b/ReportImp/SHKService/Invoicing/CollectiveInvoiceCreation.cs @@ -106,7 +106,7 @@ namespace SHKService.Invoicing } else { - ii.AmountPerUnit = supportConceptApprovalPeriod.ApprovedBEPerInterval / 60 * data[0].AmountTotal; + ii.AmountPerUnit = supportConceptApprovalPeriod.ApprovedBEPerInterval * (decimal)Math.Round((double)data[0].AmountTotal / 60, 4, MidpointRounding.AwayFromZero); if (cb2sc.SupportConcept.Customer.Person.LastNameFirstName.Contains("(ka)")) { ii.ItemDescription = "Kompensatorische Assistenz"; @@ -117,6 +117,7 @@ namespace SHKService.Invoicing } } + ii.AmountPerUnit = Math.Round((decimal)ii.AmountPerUnit, 2, MidpointRounding.AwayFromZero); ii.AmountTotal = ii.UnitCount * ii.AmountPerUnit; ii.GrossAmountTotal = ii.AmountTotal; serviceInvoicePeriod.InvoiceItemList.Add(ii); diff --git a/ReportImp/UebergangshilfeUnnaEV/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/UebergangshilfeUnnaEV/CustomMitarbeiterstundenkontoBerechnung.cs index bc11f8780..485a4d6ad 100644 --- a/ReportImp/UebergangshilfeUnnaEV/CustomMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/UebergangshilfeUnnaEV/CustomMitarbeiterstundenkontoBerechnung.cs @@ -7,20 +7,85 @@ using BeWo.Report.ReportObjects; namespace UebergangshilfeUnnaEV { - public class CustomMitarbeiterstundenkontoBerechnung : MitarbeiterstundenkontoBerechnung - { - public override bool ShouldCreateDayDetails() - { - return true; - } + public class CustomMitarbeiterstundenkontoBerechnung : MitarbeiterstundenkontoBerechnung + { + public override bool ShouldCreateDayDetails() + { + return true; + } - public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed) - { - var dd = base.CreateDayDetail(date, ed); - dd.BreakMinutes2 = 15; - dd.MaxHoursUntilBreak2 = 9; + public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed) + { + var dd = base.CreateDayDetail(date, ed); + dd.BreakMinutes2 = 15; + dd.MaxHoursUntilBreak2 = 9; - return dd; - } - } + return dd; + } + + public override bool AddServiceRecordToDuration(ServiceRecord item) + { + if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null) + { + if (item.ServiceDescription.ServiceCategory.Name == "Arbeitszeit") + { + return true; + } + } + return false; + } + + protected override ServiceRecordSummary BerechneStunden(MitarbeiterstundenkontoRO.EmployeeDetail empDetail, IList groupFilteredRecords, DateTime berichtsAnfang, + DateTime berichtsEnde) + { + decimal flsGesamt = 0; + decimal arbeitszeit = 0; + + var sum = new ServiceRecordSummary(); + sum.RecordsImBerichtszeitraum = new List(); + //base.CorrectOverlappingTimes(groupFilteredRecords); + + foreach (var item in groupFilteredRecords) + { + if (!IsServiceRecordFehlzeit(item)) + { + if (item.Start.Value >= berichtsAnfang && item.Start.Value < berichtsEnde) + { + //if (AddServiceRecordToDuration(item)) + //{ + decimal duration = 0; + + if (item.GroupRoundedDuration.HasValue) + { + duration = item.GroupRoundedDuration.Value; + } + else + { + duration = item.RoundedDuration; + } + + if (item.ServiceDescription != null && + item.ServiceDescription.ServiceCategory != null) + { + if (item.ServiceDescription.ServiceCategory.Name == "Arbeitszeit") + { + arbeitszeit += duration; + } + else if (item.ServiceDescription.ServiceCategory.IsBillable) + { + flsGesamt += duration; + } + + } + sum.RecordsImBerichtszeitraum.Add(item); + } + } + } + + sum.IstAbrechenbar = flsGesamt; + sum.IstNichtAbrechenbar = arbeitszeit - flsGesamt; + + return sum; + } + } } diff --git a/Service/Plugins/AccountingService.cs b/Service/Plugins/AccountingService.cs index 3c0db6581..1f2dd6a89 100644 --- a/Service/Plugins/AccountingService.cs +++ b/Service/Plugins/AccountingService.cs @@ -45,7 +45,7 @@ namespace BeWo.Service.Plugins if (!supportConceptOid.HasValue) { supportConcepts = - supportConcepts.Where(sc => sc.StartDate < newSpan.EndDate && sc.EndDate >= newSpan.StartDate); + supportConcepts.Where(sc => sc.StartDate < newSpan.EndDateTime && sc.EndDate >= newSpan.StartDate); } } var supportConcepts2ServiceRecords = supportConcepts.ToDictionary(