diff --git a/ReportImp/Alloheim/Alloheim.csproj b/ReportImp/Alloheim/Alloheim.csproj index f038442b4..ca3745173 100644 --- a/ReportImp/Alloheim/Alloheim.csproj +++ b/ReportImp/Alloheim/Alloheim.csproj @@ -49,6 +49,7 @@ + Component diff --git a/ReportImp/Alloheim/Invoicing/SettlementInvoiceCreation.cs b/ReportImp/Alloheim/Invoicing/SettlementInvoiceCreation.cs new file mode 100644 index 000000000..57ca24e0f --- /dev/null +++ b/ReportImp/Alloheim/Invoicing/SettlementInvoiceCreation.cs @@ -0,0 +1,14 @@ +using BeWo.Data.Entities; +using BeWo.Service.Invoicing; +using BS.Shared.DataContracts; + +namespace Alloheim +{ + public class CustomSettlementInvoiceCreation : SettlementInvoiceCreation + { + public override bool CanCreateInvoiceTheOldWay(Settlement2DC si, CostBearer2SupportConcept c2s) + { + return false; + } + } +} diff --git a/ReportImp/Alloheim/ServiceInvoiceReport.Designer.cs b/ReportImp/Alloheim/ServiceInvoiceReport.Designer.cs index 80c0349ff..91a6ffac0 100644 --- a/ReportImp/Alloheim/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/Alloheim/ServiceInvoiceReport.Designer.cs @@ -160,7 +160,7 @@ namespace Alloheim 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(676.9999F, 82.29166F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(676.9999F, 72.29163F); this.xrLabel11.StylePriority.UseFont = false; this.xrLabel11.Text = resources.GetString("xrLabel11.Text"); // @@ -494,8 +494,6 @@ namespace Alloheim // this.xrLabel30.Borders = DevExpress.XtraPrinting.BorderSide.Right; this.xrLabel30.CanGrow = false; - this.xrLabel30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerBirthdate")}); this.xrLabel30.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(510.0834F, 336.6751F); this.xrLabel30.Name = "xrLabel30"; @@ -503,7 +501,7 @@ namespace Alloheim this.xrLabel30.SizeF = new System.Drawing.SizeF(166.7498F, 17F); this.xrLabel30.StylePriority.UseBorders = false; this.xrLabel30.StylePriority.UseFont = false; - this.xrLabel30.Text = "nach SGB IX"; + this.xrLabel30.Text = "[CustomerBirthdate!dd.MM.yyyy]"; // // xrLabel23 // @@ -535,8 +533,6 @@ namespace Alloheim // this.xrLabel20.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel20.CanGrow = false; - this.xrLabel20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "AccountingPeriodEnd")}); this.xrLabel20.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(288.1536F, 319.6751F); this.xrLabel20.Name = "xrLabel20"; @@ -544,6 +540,7 @@ namespace Alloheim this.xrLabel20.SizeF = new System.Drawing.SizeF(97.26303F, 17F); this.xrLabel20.StylePriority.UseBorders = false; this.xrLabel20.StylePriority.UseFont = false; + this.xrLabel20.Text = "[AccountingPeriodEnd!dd.MM.yyyy]"; // // xrLabel14 // @@ -562,8 +559,6 @@ namespace Alloheim // this.xrLabel9.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel9.CanGrow = false; - this.xrLabel9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "AccountingPeriodStart")}); this.xrLabel9.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(157.4447F, 319.6751F); this.xrLabel9.Name = "xrLabel9"; @@ -571,6 +566,7 @@ namespace Alloheim this.xrLabel9.SizeF = new System.Drawing.SizeF(95.55278F, 17F); this.xrLabel9.StylePriority.UseBorders = false; this.xrLabel9.StylePriority.UseFont = false; + this.xrLabel9.Text = "[AccountingPeriodStart!dd.MM.yyyy]"; // // xrLabel18 // diff --git a/ReportImp/Alloheim/SettlementReport2.Designer.cs b/ReportImp/Alloheim/SettlementReport2.Designer.cs index 591955d6c..7cf9c4a10 100644 --- a/ReportImp/Alloheim/SettlementReport2.Designer.cs +++ b/ReportImp/Alloheim/SettlementReport2.Designer.cs @@ -71,6 +71,7 @@ namespace Alloheim this.lblNotice = new DevExpress.XtraReports.UI.XRLabel(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); @@ -149,7 +150,7 @@ namespace Alloheim // xrTable1 // this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 470.4999F); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 463.4999F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.rowErbrachteLeistung}); @@ -188,11 +189,11 @@ namespace Alloheim // this.xrLabel6.BackColor = System.Drawing.Color.Transparent; this.xrLabel6.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 395.4999F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 389.4999F); this.xrLabel6.Multiline = true; this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel6.SizeF = new System.Drawing.SizeF(642F, 67F); + this.xrLabel6.SizeF = new System.Drawing.SizeF(650F, 67F); this.xrLabel6.StylePriority.UseBackColor = false; this.xrLabel6.StylePriority.UseFont = false; this.xrLabel6.Text = resources.GetString("xrLabel6.Text"); @@ -316,7 +317,7 @@ namespace Alloheim this.xrLabel11, this.lblNotice}); this.ReportFooter.Font = new System.Drawing.Font("Verdana", 10F); - this.ReportFooter.HeightF = 209F; + this.ReportFooter.HeightF = 229.8333F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; @@ -324,7 +325,7 @@ namespace Alloheim // xrLabel10 // this.xrLabel10.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 133F); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 139F); this.xrLabel10.Name = "xrLabel10"; this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel10.SizeF = new System.Drawing.SizeF(175F, 17F); @@ -455,7 +456,7 @@ namespace Alloheim // xrLabel12 // this.xrLabel12.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192F); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 198F); this.xrLabel12.Name = "xrLabel12"; this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel12.SizeF = new System.Drawing.SizeF(225F, 17F); @@ -465,7 +466,7 @@ namespace Alloheim // xrLabel11 // this.xrLabel11.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(582.9999F, 192F); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(582.9999F, 198F); this.xrLabel11.Name = "xrLabel11"; this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel11.SizeF = new System.Drawing.SizeF(67F, 17F); @@ -492,9 +493,22 @@ namespace Alloheim // // bottomMarginBand1 // - this.bottomMarginBand1.HeightF = 43F; + this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel14}); + this.bottomMarginBand1.HeightF = 72.29163F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // + // xrLabel14 + // + this.xrLabel14.Font = new System.Drawing.Font("Arial", 7.5F); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0.500061F, 0F); + 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(676.9999F, 72.29163F); + this.xrLabel14.StylePriority.UseFont = false; + this.xrLabel14.Text = resources.GetString("xrLabel14.Text"); + // // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -518,7 +532,7 @@ namespace Alloheim this.xrLabel6, this.xrTable1}); this.GroupHeader1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.GroupHeader1.HeightF = 487.4999F; + this.GroupHeader1.HeightF = 480.4999F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // @@ -598,7 +612,7 @@ namespace Alloheim this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel9.SizeF = new System.Drawing.SizeF(213.3751F, 19.99994F); this.xrLabel9.StylePriority.UseTextAlignment = false; - this.xrLabel9.Text = "Datum: [InvoiceDate]"; + this.xrLabel9.Text = "Datum: [InvoiceDate!dd.MM.yyyy]"; this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // // xrLabel7 @@ -979,7 +993,7 @@ namespace Alloheim | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell60.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Claim", "{0:c}")}); - this.xrTableCell60.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); + this.xrTableCell60.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrTableCell60.Name = "xrTableCell60"; this.xrTableCell60.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell60.StylePriority.UseBorderColor = false; @@ -1007,7 +1021,7 @@ namespace Alloheim this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new System.Drawing.Printing.Margins(75, 74, 100, 43); + this.Margins = new System.Drawing.Printing.Margins(75, 74, 100, 72); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = System.Drawing.Printing.PaperKind.A4; @@ -1106,5 +1120,6 @@ namespace Alloheim private DevExpress.XtraReports.UI.XRLabel xrLabel8; private DevExpress.XtraReports.UI.XRLabel xrLabel18; private DevExpress.XtraReports.UI.XRLabel xrLabel9; + private DevExpress.XtraReports.UI.XRLabel xrLabel14; } } \ No newline at end of file diff --git a/ReportImp/Alloheim/SettlementReport2.cs b/ReportImp/Alloheim/SettlementReport2.cs index defec5312..7ae68ede8 100644 --- a/ReportImp/Alloheim/SettlementReport2.cs +++ b/ReportImp/Alloheim/SettlementReport2.cs @@ -36,10 +36,6 @@ namespace Alloheim if (!pRO.FehlkontakteString.IsNullOrEmpty() && ii.RateFactor == 0) { Zwischensumme.Visible = true; - //if (!ii.ItemDescription.IsNullOrEmpty()) - //{ - //ii.AbrechnungsText = Regex.Replace(ii.DetailDescription, ii.ItemDescription, "Fehlkontakte"); - //} ii.AbrechnungsText = ii.AbrechnungsText.Replace("FLS", "Std."); ii.ItemDescription = "Fehlkontakte"; } diff --git a/ReportImp/Alloheim/SettlementReport2.resx b/ReportImp/Alloheim/SettlementReport2.resx index 7a5fc3f71..5e2ca8c82 100644 --- a/ReportImp/Alloheim/SettlementReport2.resx +++ b/ReportImp/Alloheim/SettlementReport2.resx @@ -707,6 +707,13 @@ anbei sende ich Ihnen die unterschriebenen Nachweise über die im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerFirstName] [CustomerLastName] erbrachten Leistungen zu. Nach unserer Berechnung ergeben sich für den Betreuungszeitraum [AccountingPeriod] hieraus: + + + Alloheim Ambulante Dienste Erste SE & Co. KG, Sitz der Gesellschaft: Düsseldorf, Handelsregister: HRA AG Düsseldorf Nr. 24465, +Persönlich haftender Gesellschafter: Alloheim Senioren-Residenzen SE +(Sitz der Gesellschaft: Düsseldorf, Handelsregister: HRB AG Düsseldorf Nr. 73406, +Geschäftsführende Direktoren: Dr. Steffen Hehner, Dr. Chima Abuba, Carolin Behrendt, Petra Groth, Christoph Mosler, Thomas Rietz, Vorsitzender des Verwaltungsrates: Marcus Friedrichs) +Bankverbindung: IBAN: DE60370205000001458611 - BIC: BFSWDE33XXX - Bank für Sozialwirtschaft 17, 17