diff --git a/ReportImp/AKGG/Akgg.csproj b/ReportImp/AKGG/Akgg.csproj index 0516679c0..d9f7a5ee7 100644 --- a/ReportImp/AKGG/Akgg.csproj +++ b/ReportImp/AKGG/Akgg.csproj @@ -79,11 +79,11 @@ Quittierungsbeleg.cs - + Component - - ServiceInvoiceReport.cs + + ServiceInvoiceReportPK.cs @@ -127,8 +127,8 @@ Quittierungsbeleg.cs - - ServiceInvoiceReport.cs + + ServiceInvoiceReportPK.cs Designer diff --git a/ReportImp/AKGG/Invoicing/CustomInvoiceCreation.cs b/ReportImp/AKGG/Invoicing/CustomInvoiceCreation.cs index 581fbbd4e..2c5f62abf 100644 --- a/ReportImp/AKGG/Invoicing/CustomInvoiceCreation.cs +++ b/ReportImp/AKGG/Invoicing/CustomInvoiceCreation.cs @@ -14,6 +14,14 @@ namespace Akgg.Invoicing public class CustomInvoiceCreation : InvoiceCreation { + public override void SetInvoiceId(ServiceInvoice invoice) + { + { + invoice.InvoiceBase.InvoiceId = "PK"; + invoice.InvoiceBase.InvoiceTypeText = "Pflegekasse"; + } + } + public override IList CreateSummaryInvoiceItems(IList itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, Calculations calc) { return itemList; diff --git a/ReportImp/AKGG/Invoicing/CustomInvoiceFactory.cs b/ReportImp/AKGG/Invoicing/CustomInvoiceFactory.cs index a41ec4750..2eb205c12 100644 --- a/ReportImp/AKGG/Invoicing/CustomInvoiceFactory.cs +++ b/ReportImp/AKGG/Invoicing/CustomInvoiceFactory.cs @@ -13,8 +13,20 @@ namespace Akgg.Invoicing public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary> supportConcepts2ServiceRecords) { - return new CustomInvoiceCreation(); + foreach (var list in supportConcepts2ServiceRecords.Values) + { + foreach (var sr in list) + { + if (sr.CostBearer != null) + { + if (sr.CostBearer.Name.Contains("(PK)")) + { + return new CustomInvoiceCreation(); + } + } + } + } + return new CustomInvoiceCreation(); //bisher nur eine Anpassung, da folgen wohl noch ein paar... } - } } diff --git a/ReportImp/AKGG/ServiceInvoiceReport.Designer.cs b/ReportImp/AKGG/ServiceInvoiceReportPK.Designer.cs similarity index 96% rename from ReportImp/AKGG/ServiceInvoiceReport.Designer.cs rename to ReportImp/AKGG/ServiceInvoiceReportPK.Designer.cs index 77c0f642c..329c9f458 100644 --- a/ReportImp/AKGG/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/AKGG/ServiceInvoiceReportPK.Designer.cs @@ -1,7 +1,7 @@ using BeWo.Report.ReportObjects; namespace Akgg { - partial class ServiceInvoiceReport + partial class ServiceInvoiceReportPK { /// /// Required designer variable. @@ -29,13 +29,34 @@ namespace Akgg private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServiceInvoiceReport)); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServiceInvoiceReportPK)); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); + this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.xrLabel33 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel31 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel32 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel29 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel30 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel28 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel25 = new DevExpress.XtraReports.UI.XRLabel(); this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); @@ -43,6 +64,10 @@ namespace Akgg this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblKategorie = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -58,38 +83,13 @@ namespace Akgg this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.xrLabel1 = 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.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel23 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel25 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel28 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel29 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel30 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel31 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel32 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel33 = new DevExpress.XtraReports.UI.XRLabel(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -123,6 +123,27 @@ namespace Akgg this.topMarginBand1.HeightF = 209F; this.topMarginBand1.Name = "topMarginBand1"; // + // xrLabel6 + // + this.xrLabel6.Font = new System.Drawing.Font("Lato", 10F, System.Drawing.FontStyle.Bold); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(483.0835F, 162.0833F); + 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(166.9165F, 46.875F); + this.xrLabel6.StylePriority.UseFont = false; + this.xrLabel6.StylePriority.UseTextAlignment = false; + this.xrLabel6.Text = "Fachbereich\r\nInklusion & Teilhabe"; + this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + // + // xrPictureBox1 + // + this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image"))); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(483.0835F, 89F); + this.xrPictureBox1.Name = "xrPictureBox1"; + this.xrPictureBox1.SizeF = new System.Drawing.SizeF(166.9165F, 72.66668F); + this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // // bottomMarginBand1 // this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -138,6 +159,122 @@ namespace Akgg this.bottomMarginBand1.HeightF = 102F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // + // xrLabel33 + // + this.xrLabel33.Font = new System.Drawing.Font("Lato", 7F); + this.xrLabel33.ForeColor = System.Drawing.Color.Gray; + this.xrLabel33.LocationFloat = new DevExpress.Utils.PointFloat(430.5839F, 25F); + this.xrLabel33.Multiline = true; + this.xrLabel33.Name = "xrLabel33"; + this.xrLabel33.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel33.SizeF = new System.Drawing.SizeF(174.9166F, 59.20843F); + this.xrLabel33.StylePriority.UseFont = false; + this.xrLabel33.StylePriority.UseForeColor = false; + this.xrLabel33.Text = "DE42 3702 0500 0007 6000 05\r\nBFSWDE33XXX\r\n370 205 00\r\n76 000 05"; + // + // xrLabel31 + // + this.xrLabel31.Font = new System.Drawing.Font("Lato", 7F, System.Drawing.FontStyle.Bold); + this.xrLabel31.ForeColor = System.Drawing.Color.Gray; + this.xrLabel31.LocationFloat = new DevExpress.Utils.PointFloat(395.6875F, 9.999974F); + this.xrLabel31.Multiline = true; + this.xrLabel31.Name = "xrLabel31"; + this.xrLabel31.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel31.SizeF = new System.Drawing.SizeF(188.44F, 15F); + this.xrLabel31.StylePriority.UseFont = false; + this.xrLabel31.StylePriority.UseForeColor = false; + this.xrLabel31.Text = "Bank für Sozialwirtschaft"; + // + // xrLabel32 + // + this.xrLabel32.Font = new System.Drawing.Font("Lato", 7F); + this.xrLabel32.ForeColor = System.Drawing.Color.Gray; + this.xrLabel32.LocationFloat = new DevExpress.Utils.PointFloat(395.6875F, 25F); + this.xrLabel32.Multiline = true; + this.xrLabel32.Name = "xrLabel32"; + this.xrLabel32.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel32.SizeF = new System.Drawing.SizeF(34.89639F, 59.20843F); + this.xrLabel32.StylePriority.UseFont = false; + this.xrLabel32.StylePriority.UseForeColor = false; + this.xrLabel32.Text = "IBAN\r\nBIC \r\nBLZ Konto"; + // + // xrLabel29 + // + this.xrLabel29.Font = new System.Drawing.Font("Lato", 7F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic)))); + this.xrLabel29.ForeColor = System.Drawing.Color.Gray; + this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(162.6875F, 25F); + this.xrLabel29.Multiline = true; + this.xrLabel29.Name = "xrLabel29"; + this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel29.SizeF = new System.Drawing.SizeF(188.44F, 15F); + this.xrLabel29.StylePriority.UseFont = false; + this.xrLabel29.StylePriority.UseForeColor = false; + this.xrLabel29.Text = "Backoffice"; + // + // xrLabel30 + // + this.xrLabel30.Font = new System.Drawing.Font("Lato", 7F, System.Drawing.FontStyle.Italic); + this.xrLabel30.ForeColor = System.Drawing.Color.Gray; + this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(162.6875F, 40.00003F); + this.xrLabel30.Multiline = true; + this.xrLabel30.Name = "xrLabel30"; + this.xrLabel30.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel30.SizeF = new System.Drawing.SizeF(188.4375F, 50.66668F); + this.xrLabel30.StylePriority.UseFont = false; + this.xrLabel30.StylePriority.UseForeColor = false; + this.xrLabel30.Text = "Treppenstraße 4, 34117 Kassel\r\nTelefon +49 561 8 16 44 00\r\nTelefax +49 561 8 16 4" + + "4 490"; + // + // xrLabel28 + // + this.xrLabel28.Font = new System.Drawing.Font("Lato", 7F, System.Drawing.FontStyle.Italic); + this.xrLabel28.ForeColor = System.Drawing.Color.Gray; + this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(0F, 39.9999F); + this.xrLabel28.Multiline = true; + this.xrLabel28.Name = "xrLabel28"; + this.xrLabel28.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel28.SizeF = new System.Drawing.SizeF(138.875F, 50.66668F); + this.xrLabel28.StylePriority.UseFont = false; + this.xrLabel28.StylePriority.UseForeColor = false; + this.xrLabel28.Text = "Claudia Baer, Søren Link\r\nHRB 16045\r\nwww.akgg.de"; + // + // xrLabel27 + // + this.xrLabel27.Font = new System.Drawing.Font("Lato", 7F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic)))); + this.xrLabel27.ForeColor = System.Drawing.Color.Gray; + this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); + this.xrLabel27.Multiline = true; + this.xrLabel27.Name = "xrLabel27"; + this.xrLabel27.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel27.SizeF = new System.Drawing.SizeF(138.88F, 15F); + this.xrLabel27.StylePriority.UseFont = false; + this.xrLabel27.StylePriority.UseForeColor = false; + this.xrLabel27.Text = "Geschäftsführung:"; + // + // xrLabel26 + // + this.xrLabel26.Font = new System.Drawing.Font("Lato", 7F); + this.xrLabel26.ForeColor = System.Drawing.Color.Gray; + this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(40.96F, 9.999974F); + this.xrLabel26.Multiline = true; + this.xrLabel26.Name = "xrLabel26"; + this.xrLabel26.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel26.SizeF = new System.Drawing.SizeF(283.67F, 15F); + this.xrLabel26.StylePriority.UseFont = false; + this.xrLabel26.StylePriority.UseForeColor = false; + this.xrLabel26.Text = "Arbeitskreis Gemeindenahe Gesundheitsversorgung GmbH"; + // + // xrLabel25 + // + this.xrLabel25.Font = new System.Drawing.Font("Lato", 7F, System.Drawing.FontStyle.Bold); + this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(0F, 9.999974F); + this.xrLabel25.Multiline = true; + this.xrLabel25.Name = "xrLabel25"; + this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel25.SizeF = new System.Drawing.SizeF(40.96F, 15F); + this.xrLabel25.StylePriority.UseFont = false; + this.xrLabel25.Text = "AKGG"; + // // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -160,6 +297,155 @@ namespace Akgg this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // + // xrLabel19 + // + this.xrLabel19.Font = new System.Drawing.Font("Lato", 9.749999F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(513.3755F, 172F); + this.xrLabel19.Name = "xrLabel19"; + this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel19.SizeF = new System.Drawing.SizeF(51.58301F, 23F); + this.xrLabel19.StylePriority.UseFont = false; + this.xrLabel19.StylePriority.UseTextAlignment = false; + this.xrLabel19.Text = "Datum"; + this.xrLabel19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrLabel21 + // + this.xrLabel21.Borders = DevExpress.XtraPrinting.BorderSide.Right; + this.xrLabel21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "DebitorNumber")}); + this.xrLabel21.Font = new System.Drawing.Font("Lato", 8.999999F, System.Drawing.FontStyle.Italic); + this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(565.3751F, 100.1033F); + 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(90.62463F, 18.23F); + this.xrLabel21.StylePriority.UseBorders = false; + this.xrLabel21.StylePriority.UseFont = false; + this.xrLabel21.StylePriority.UseTextAlignment = false; + this.xrLabel21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrLabel17 + // + this.xrLabel17.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrLabel17.Font = new System.Drawing.Font("Lato", 8.999999F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(465.8754F, 118.3333F); + this.xrLabel17.Multiline = true; + this.xrLabel17.Name = "xrLabel17"; + this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel17.SizeF = new System.Drawing.SizeF(190.2913F, 18.45834F); + this.xrLabel17.StylePriority.UseBorders = false; + this.xrLabel17.StylePriority.UseFont = false; + this.xrLabel17.StylePriority.UseTextAlignment = false; + this.xrLabel17.Text = "Bei Zahlung bitte stets angeben!"; + this.xrLabel17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrLabel18 + // + this.xrLabel18.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); + this.xrLabel18.Font = new System.Drawing.Font("Lato", 8.999999F, System.Drawing.FontStyle.Italic); + this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(465.8754F, 81.87498F); + this.xrLabel18.Multiline = true; + this.xrLabel18.Name = "xrLabel18"; + this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel18.SizeF = new System.Drawing.SizeF(99.49973F, 36.45837F); + this.xrLabel18.StylePriority.UseBorders = false; + this.xrLabel18.StylePriority.UseFont = false; + this.xrLabel18.StylePriority.UseTextAlignment = false; + this.xrLabel18.Text = "Rechnung Nr.\r\nKunden-Nr.\r\n"; + this.xrLabel18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrLabel20 + // + this.xrLabel20.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrLabel20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceNumber")}); + this.xrLabel20.Font = new System.Drawing.Font("Lato", 8.999999F, System.Drawing.FontStyle.Italic); + this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(565.3751F, 81.87498F); + this.xrLabel20.Multiline = true; + this.xrLabel20.Name = "xrLabel20"; + this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel20.SizeF = new System.Drawing.SizeF(90.78998F, 18.22837F); + this.xrLabel20.StylePriority.UseBorders = false; + this.xrLabel20.StylePriority.UseFont = false; + this.xrLabel20.StylePriority.UseTextAlignment = false; + this.xrLabel20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrLabel16 + // + this.xrLabel16.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrLabel16.Font = new System.Drawing.Font("Lato", 8.999999F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel16.ForeColor = System.Drawing.Color.Gray; + this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(529.0834F, 28.45834F); + this.xrLabel16.Multiline = true; + this.xrLabel16.Name = "xrLabel16"; + this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel16.SizeF = new System.Drawing.SizeF(127.0833F, 36.45833F); + this.xrLabel16.StylePriority.UseBorders = false; + this.xrLabel16.StylePriority.UseFont = false; + this.xrLabel16.StylePriority.UseForeColor = false; + this.xrLabel16.StylePriority.UseTextAlignment = false; + this.xrLabel16.Text = "0561 8 16 44 417\r\nkarla.erbe@akgg.de"; + this.xrLabel16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrLabel13 + // + this.xrLabel13.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); + this.xrLabel13.Font = new System.Drawing.Font("Lato", 10F, System.Drawing.FontStyle.Bold); + this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(465.8754F, 10.00001F); + this.xrLabel13.Multiline = true; + this.xrLabel13.Name = "xrLabel13"; + this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel13.SizeF = new System.Drawing.SizeF(118.2497F, 18.45834F); + this.xrLabel13.StylePriority.UseBorders = false; + this.xrLabel13.StylePriority.UseFont = false; + this.xrLabel13.StylePriority.UseTextAlignment = false; + this.xrLabel13.Text = "Buchhaltung"; + this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrLabel12 + // + this.xrLabel12.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrLabel12.Font = new System.Drawing.Font("Lato", 8.999999F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel12.ForeColor = System.Drawing.Color.Gray; + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(465.8754F, 28.45834F); + this.xrLabel12.Multiline = true; + this.xrLabel12.Name = "xrLabel12"; + this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel12.SizeF = new System.Drawing.SizeF(63.20804F, 36.45833F); + this.xrLabel12.StylePriority.UseBorders = false; + this.xrLabel12.StylePriority.UseFont = false; + this.xrLabel12.StylePriority.UseForeColor = false; + this.xrLabel12.StylePriority.UseTextAlignment = false; + this.xrLabel12.Text = "Telefon\r\nE-Mail"; + this.xrLabel12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrLabel11 + // + this.xrLabel11.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrLabel11.Font = new System.Drawing.Font("Lato", 10F, System.Drawing.FontStyle.Bold); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(584.125F, 10.00001F); + 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(71.87476F, 18.45834F); + this.xrLabel11.StylePriority.UseBorders = false; + this.xrLabel11.StylePriority.UseFont = false; + this.xrLabel11.StylePriority.UseTextAlignment = false; + this.xrLabel11.Text = "Karla Erbe"; + this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrLabel10 + // + this.xrLabel10.Font = new System.Drawing.Font("Lato", 8.25F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLabel10.Name = "xrLabel10"; + this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel10.SizeF = new System.Drawing.SizeF(317F, 17F); + this.xrLabel10.StylePriority.UseFont = false; + this.xrLabel10.Text = "AKGG GmbH | Teppenstraße 4 | 34117 Kassel"; + // // xrLabel7 // this.xrLabel7.Font = new System.Drawing.Font("Lato", 11F); @@ -237,11 +523,55 @@ namespace Akgg this.xrLabel22, this.xrLabel4, this.xrLabel3, - this.xrLabel2, + this.lblKategorie, this.xrTable5}); - this.Detail1.HeightF = 126.0417F; + this.Detail1.HeightF = 143.75F; this.Detail1.Name = "Detail1"; // + // xrLabel22 + // + this.xrLabel22.Font = new System.Drawing.Font("Lato", 10F); + this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(0F, 105.9584F); + this.xrLabel22.Multiline = true; + this.xrLabel22.Name = "xrLabel22"; + this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel22.SizeF = new System.Drawing.SizeF(300.33F, 20F); + this.xrLabel22.StylePriority.UseFont = false; + this.xrLabel22.Text = "Zeitraum: [AccountingPeriod]"; + // + // xrLabel4 + // + this.xrLabel4.Font = new System.Drawing.Font("Lato", 10F); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 75.54169F); + 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(300.33F, 20F); + this.xrLabel4.StylePriority.UseFont = false; + this.xrLabel4.Text = "KV-Nr. : [CustomerReferenceNumber]"; + // + // xrLabel3 + // + this.xrLabel3.Font = new System.Drawing.Font("Lato", 10F); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 55.54168F); + 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(300.33F, 20F); + this.xrLabel3.StylePriority.UseFont = false; + this.xrLabel3.Text = "[CustomerName], geb. [CustomerBirthdate!dd.MM.yyyy]"; + // + // lblKategorie + // + this.lblKategorie.Font = new System.Drawing.Font("Lato", 10F); + this.lblKategorie.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); + this.lblKategorie.Multiline = true; + this.lblKategorie.Name = "lblKategorie"; + this.lblKategorie.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblKategorie.SizeF = new System.Drawing.SizeF(300.33F, 20F); + this.lblKategorie.StylePriority.UseFont = false; + this.lblKategorie.Text = "Verhinderungspflege gem. § 39 SGB XI"; + // // xrTable5 // this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); @@ -376,7 +706,7 @@ namespace Akgg this.xrTableCell42.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell42.Borders = DevExpress.XtraPrinting.BorderSide.None; this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Duration", "Pflegestunden {0}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Duration", "{0}")}); this.xrTableCell42.Font = new System.Drawing.Font("Lato", 10F); this.xrTableCell42.Name = "xrTableCell42"; this.xrTableCell42.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); @@ -450,6 +780,17 @@ namespace Akgg this.GroupFooter1.HeightF = 137.2501F; this.GroupFooter1.Name = "GroupFooter1"; // + // xrLabel23 + // + this.xrLabel23.Font = new System.Drawing.Font("Lato", 10F); + this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(0F, 65.20831F); + this.xrLabel23.Multiline = true; + this.xrLabel23.Name = "xrLabel23"; + this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel23.SizeF = new System.Drawing.SizeF(300.33F, 20F); + this.xrLabel23.StylePriority.UseFont = false; + this.xrLabel23.Text = "Institutionskennzeichen (IK): 460 661 431"; + // // xrLabel1 // this.xrLabel1.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Dash; @@ -469,347 +810,6 @@ namespace Akgg this.xrLabel1.Text = "xrLabel1"; this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; // - // xrPictureBox1 - // - this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image"))); - this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(483.0835F, 89F); - this.xrPictureBox1.Name = "xrPictureBox1"; - this.xrPictureBox1.SizeF = new System.Drawing.SizeF(166.9165F, 72.66668F); - this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - // - // xrLabel6 - // - this.xrLabel6.Font = new System.Drawing.Font("Lato", 10F, System.Drawing.FontStyle.Bold); - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(483.0835F, 162.0833F); - 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(166.9165F, 46.875F); - this.xrLabel6.StylePriority.UseFont = false; - this.xrLabel6.StylePriority.UseTextAlignment = false; - this.xrLabel6.Text = "Fachbereich\r\nInklusion & Teilhabe"; - this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - // - // xrLabel10 - // - this.xrLabel10.Font = new System.Drawing.Font("Lato", 8F); - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrLabel10.Name = "xrLabel10"; - this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel10.SizeF = new System.Drawing.SizeF(317F, 17F); - this.xrLabel10.StylePriority.UseFont = false; - this.xrLabel10.Text = "AKGG GmbH | Teppenstraße 4 | 34117 Kassel"; - // - // xrLabel11 - // - this.xrLabel11.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrLabel11.Font = new System.Drawing.Font("Lato", 10F, System.Drawing.FontStyle.Bold); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(584.125F, 10.00001F); - 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(71.87476F, 18.45834F); - this.xrLabel11.StylePriority.UseBorders = false; - this.xrLabel11.StylePriority.UseFont = false; - this.xrLabel11.StylePriority.UseTextAlignment = false; - this.xrLabel11.Text = "Karla Erbe"; - this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - // - // xrLabel12 - // - this.xrLabel12.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel12.Font = new System.Drawing.Font("Lato", 8.999999F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(465.8754F, 28.45834F); - this.xrLabel12.Multiline = true; - this.xrLabel12.Name = "xrLabel12"; - this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel12.SizeF = new System.Drawing.SizeF(63.20804F, 36.45833F); - this.xrLabel12.StylePriority.UseBorders = false; - this.xrLabel12.StylePriority.UseFont = false; - this.xrLabel12.StylePriority.UseTextAlignment = false; - this.xrLabel12.Text = "Telefon\r\nE-Mail"; - this.xrLabel12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - // - // xrLabel13 - // - this.xrLabel13.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); - this.xrLabel13.Font = new System.Drawing.Font("Lato", 10F, System.Drawing.FontStyle.Bold); - this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(465.8754F, 10.00001F); - this.xrLabel13.Multiline = true; - this.xrLabel13.Name = "xrLabel13"; - this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel13.SizeF = new System.Drawing.SizeF(118.2497F, 18.45834F); - this.xrLabel13.StylePriority.UseBorders = false; - this.xrLabel13.StylePriority.UseFont = false; - this.xrLabel13.StylePriority.UseTextAlignment = false; - this.xrLabel13.Text = "Buchhaltung"; - this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - // - // xrLabel16 - // - this.xrLabel16.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel16.Font = new System.Drawing.Font("Lato", 8.999999F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(529.0834F, 28.45834F); - this.xrLabel16.Multiline = true; - this.xrLabel16.Name = "xrLabel16"; - this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel16.SizeF = new System.Drawing.SizeF(127.0833F, 36.45833F); - this.xrLabel16.StylePriority.UseBorders = false; - this.xrLabel16.StylePriority.UseFont = false; - this.xrLabel16.StylePriority.UseTextAlignment = false; - this.xrLabel16.Text = "0561 8 16 44 417\r\nkarla.erbe@akgg.de"; - this.xrLabel16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - // - // xrLabel18 - // - this.xrLabel18.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); - this.xrLabel18.Font = new System.Drawing.Font("Lato", 8.999999F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(465.8754F, 81.87498F); - this.xrLabel18.Multiline = true; - this.xrLabel18.Name = "xrLabel18"; - this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel18.SizeF = new System.Drawing.SizeF(99.49973F, 36.45837F); - this.xrLabel18.StylePriority.UseBorders = false; - this.xrLabel18.StylePriority.UseFont = false; - this.xrLabel18.StylePriority.UseTextAlignment = false; - this.xrLabel18.Text = "Rechnung Nr.\r\nKunden-Nr.\r\n"; - this.xrLabel18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - // - // xrLabel20 - // - this.xrLabel20.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrLabel20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceNumber")}); - this.xrLabel20.Font = new System.Drawing.Font("Lato", 8.999999F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(565.3751F, 81.87498F); - this.xrLabel20.Multiline = true; - this.xrLabel20.Name = "xrLabel20"; - this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel20.SizeF = new System.Drawing.SizeF(90.78998F, 18.22837F); - this.xrLabel20.StylePriority.UseBorders = false; - this.xrLabel20.StylePriority.UseFont = false; - this.xrLabel20.StylePriority.UseTextAlignment = false; - this.xrLabel20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - // - // xrLabel17 - // - this.xrLabel17.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel17.Font = new System.Drawing.Font("Lato", 8.999999F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(465.8754F, 118.3333F); - this.xrLabel17.Multiline = true; - this.xrLabel17.Name = "xrLabel17"; - this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel17.SizeF = new System.Drawing.SizeF(190.2913F, 18.45834F); - this.xrLabel17.StylePriority.UseBorders = false; - this.xrLabel17.StylePriority.UseFont = false; - this.xrLabel17.StylePriority.UseTextAlignment = false; - this.xrLabel17.Text = "Bei Zahlung bitte stets angeben!"; - this.xrLabel17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - // - // xrLabel21 - // - this.xrLabel21.Borders = DevExpress.XtraPrinting.BorderSide.Right; - this.xrLabel21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "DebitorNumber")}); - this.xrLabel21.Font = new System.Drawing.Font("Lato", 8.999999F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(565.3751F, 100.1033F); - 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(90.62463F, 18.23F); - this.xrLabel21.StylePriority.UseBorders = false; - this.xrLabel21.StylePriority.UseFont = false; - this.xrLabel21.StylePriority.UseTextAlignment = false; - this.xrLabel21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - // - // xrLabel19 - // - this.xrLabel19.Font = new System.Drawing.Font("Lato", 9.749999F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(513.3755F, 172F); - this.xrLabel19.Name = "xrLabel19"; - this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel19.SizeF = new System.Drawing.SizeF(51.58301F, 23F); - this.xrLabel19.StylePriority.UseFont = false; - this.xrLabel19.StylePriority.UseTextAlignment = false; - this.xrLabel19.Text = "Datum"; - this.xrLabel19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - // - // xrLabel2 - // - this.xrLabel2.Font = new System.Drawing.Font("Lato", 10F); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); - 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(300.33F, 20F); - this.xrLabel2.StylePriority.UseFont = false; - this.xrLabel2.Text = "Verhinderungspflege gem. § 39 SGB XI"; - // - // xrLabel3 - // - this.xrLabel3.Font = new System.Drawing.Font("Lato", 10F); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 55.54168F); - 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(300.33F, 20F); - this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.Text = "[CustomerName], geb. [CustomerBirthdate!dd.MM.yyyy]"; - // - // xrLabel4 - // - this.xrLabel4.Font = new System.Drawing.Font("Lato", 10F); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 75.54169F); - 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(300.33F, 20F); - this.xrLabel4.StylePriority.UseFont = false; - this.xrLabel4.Text = "KV-Nr. : [CustomerReferenceNumber]"; - // - // xrLabel22 - // - this.xrLabel22.Font = new System.Drawing.Font("Lato", 10F); - this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(0F, 105.9584F); - this.xrLabel22.Multiline = true; - this.xrLabel22.Name = "xrLabel22"; - this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel22.SizeF = new System.Drawing.SizeF(300.33F, 20F); - this.xrLabel22.StylePriority.UseFont = false; - this.xrLabel22.Text = "Zeitraum: [AccountingPeriod]"; - // - // xrLabel23 - // - this.xrLabel23.Font = new System.Drawing.Font("Lato", 10F); - this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(0F, 65.20831F); - this.xrLabel23.Multiline = true; - this.xrLabel23.Name = "xrLabel23"; - this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel23.SizeF = new System.Drawing.SizeF(300.33F, 20F); - this.xrLabel23.StylePriority.UseFont = false; - this.xrLabel23.Text = "Institutionskennzeichen (IK): 460 661 431"; - // - // xrLabel25 - // - this.xrLabel25.Font = new System.Drawing.Font("Lato", 7F, System.Drawing.FontStyle.Bold); - this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(0F, 9.999974F); - this.xrLabel25.Multiline = true; - this.xrLabel25.Name = "xrLabel25"; - this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel25.SizeF = new System.Drawing.SizeF(40.96F, 15F); - this.xrLabel25.StylePriority.UseFont = false; - this.xrLabel25.Text = "AKGG"; - // - // xrLabel26 - // - this.xrLabel26.Font = new System.Drawing.Font("Lato", 7F); - this.xrLabel26.ForeColor = System.Drawing.Color.Gray; - this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(40.96F, 9.999974F); - this.xrLabel26.Multiline = true; - this.xrLabel26.Name = "xrLabel26"; - this.xrLabel26.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel26.SizeF = new System.Drawing.SizeF(283.67F, 15F); - this.xrLabel26.StylePriority.UseFont = false; - this.xrLabel26.StylePriority.UseForeColor = false; - this.xrLabel26.Text = "Arbeitskreis Gemeindenahe Gesundheitsversorgung GmbH"; - // - // xrLabel27 - // - this.xrLabel27.Font = new System.Drawing.Font("Lato", 7F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic)))); - this.xrLabel27.ForeColor = System.Drawing.Color.Gray; - this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); - this.xrLabel27.Multiline = true; - this.xrLabel27.Name = "xrLabel27"; - this.xrLabel27.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel27.SizeF = new System.Drawing.SizeF(138.88F, 15F); - this.xrLabel27.StylePriority.UseFont = false; - this.xrLabel27.StylePriority.UseForeColor = false; - this.xrLabel27.Text = "Geschäftsführung:"; - // - // xrLabel28 - // - this.xrLabel28.Font = new System.Drawing.Font("Lato", 7F, System.Drawing.FontStyle.Italic); - this.xrLabel28.ForeColor = System.Drawing.Color.Gray; - this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(0F, 39.9999F); - this.xrLabel28.Multiline = true; - this.xrLabel28.Name = "xrLabel28"; - this.xrLabel28.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel28.SizeF = new System.Drawing.SizeF(138.875F, 50.66668F); - this.xrLabel28.StylePriority.UseFont = false; - this.xrLabel28.StylePriority.UseForeColor = false; - this.xrLabel28.Text = "Claudia Baer, Søren Link\r\nHRB 16045\r\nwww.akgg.de"; - // - // xrLabel29 - // - this.xrLabel29.Font = new System.Drawing.Font("Lato", 7F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic)))); - this.xrLabel29.ForeColor = System.Drawing.Color.Gray; - this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(162.6875F, 25F); - this.xrLabel29.Multiline = true; - this.xrLabel29.Name = "xrLabel29"; - this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel29.SizeF = new System.Drawing.SizeF(188.44F, 15F); - this.xrLabel29.StylePriority.UseFont = false; - this.xrLabel29.StylePriority.UseForeColor = false; - this.xrLabel29.Text = "Backoffice"; - // - // xrLabel30 - // - this.xrLabel30.Font = new System.Drawing.Font("Lato", 7F, System.Drawing.FontStyle.Italic); - this.xrLabel30.ForeColor = System.Drawing.Color.Gray; - this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(162.6875F, 40.00003F); - this.xrLabel30.Multiline = true; - this.xrLabel30.Name = "xrLabel30"; - this.xrLabel30.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel30.SizeF = new System.Drawing.SizeF(188.4375F, 50.66668F); - this.xrLabel30.StylePriority.UseFont = false; - this.xrLabel30.StylePriority.UseForeColor = false; - this.xrLabel30.Text = "Treppenstraße 4, 34117 Kassel\r\nTelefon +49 561 8 16 44 00\r\nTelefax +49 561 8 16 4" + - "4 490"; - // - // xrLabel31 - // - this.xrLabel31.Font = new System.Drawing.Font("Lato", 7F, System.Drawing.FontStyle.Bold); - this.xrLabel31.ForeColor = System.Drawing.Color.Gray; - this.xrLabel31.LocationFloat = new DevExpress.Utils.PointFloat(395.6875F, 9.999974F); - this.xrLabel31.Multiline = true; - this.xrLabel31.Name = "xrLabel31"; - this.xrLabel31.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel31.SizeF = new System.Drawing.SizeF(188.44F, 15F); - this.xrLabel31.StylePriority.UseFont = false; - this.xrLabel31.StylePriority.UseForeColor = false; - this.xrLabel31.Text = "Bank für Sozialwirtschaft"; - // - // xrLabel32 - // - this.xrLabel32.Font = new System.Drawing.Font("Lato", 7F); - this.xrLabel32.ForeColor = System.Drawing.Color.Gray; - this.xrLabel32.LocationFloat = new DevExpress.Utils.PointFloat(395.6875F, 25F); - this.xrLabel32.Multiline = true; - this.xrLabel32.Name = "xrLabel32"; - this.xrLabel32.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel32.SizeF = new System.Drawing.SizeF(34.89639F, 59.20843F); - this.xrLabel32.StylePriority.UseFont = false; - this.xrLabel32.StylePriority.UseForeColor = false; - this.xrLabel32.Text = "IBAN\r\nBIC \r\nBLZ Konto"; - // - // xrLabel33 - // - this.xrLabel33.Font = new System.Drawing.Font("Lato", 7F); - this.xrLabel33.ForeColor = System.Drawing.Color.Gray; - this.xrLabel33.LocationFloat = new DevExpress.Utils.PointFloat(430.5839F, 25F); - this.xrLabel33.Multiline = true; - this.xrLabel33.Name = "xrLabel33"; - this.xrLabel33.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel33.SizeF = new System.Drawing.SizeF(174.9166F, 59.20843F); - this.xrLabel33.StylePriority.UseFont = false; - this.xrLabel33.StylePriority.UseForeColor = false; - this.xrLabel33.Text = "DE42 3702 0500 0007 6000 05\r\nBFSWDE33XXX\r\n370 205 00\r\n76 000 05"; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); - // // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -846,13 +846,17 @@ namespace Akgg // this.xrPageInfo2.Font = new System.Drawing.Font("Lato", 10F); this.xrPageInfo2.Format = "Seite {0}"; - this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(568.9586F, 56.66669F); + this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(543.9586F, 56.66669F); this.xrPageInfo2.Name = "xrPageInfo2"; this.xrPageInfo2.SizeF = new System.Drawing.SizeF(85.04144F, 20.00002F); this.xrPageInfo2.StylePriority.UseFont = false; this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; // - // ServiceInvoiceReport + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); + // + // ServiceInvoiceReportPK // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { this.Detail, @@ -924,7 +928,7 @@ namespace Akgg private DevExpress.XtraReports.UI.XRLabel xrLabel22; private DevExpress.XtraReports.UI.XRLabel xrLabel4; private DevExpress.XtraReports.UI.XRLabel xrLabel3; - private DevExpress.XtraReports.UI.XRLabel xrLabel2; + private DevExpress.XtraReports.UI.XRLabel lblKategorie; private DevExpress.XtraReports.UI.XRLabel xrLabel23; private DevExpress.XtraReports.UI.XRLabel xrLabel33; private DevExpress.XtraReports.UI.XRLabel xrLabel31; diff --git a/ReportImp/AKGG/ServiceInvoiceReport.cs b/ReportImp/AKGG/ServiceInvoiceReportPK.cs similarity index 52% rename from ReportImp/AKGG/ServiceInvoiceReport.cs rename to ReportImp/AKGG/ServiceInvoiceReportPK.cs index 60e8787fc..73c9d660c 100644 --- a/ReportImp/AKGG/ServiceInvoiceReport.cs +++ b/ReportImp/AKGG/ServiceInvoiceReportPK.cs @@ -1,14 +1,15 @@ using System; using BeWo.Report; using BeWo.Report.ReportObjects; - +using BS.Shared.Core; using DevExpress.XtraReports.UI; namespace Akgg { - public partial class ServiceInvoiceReport : XtraReport, IBeWoReport + [IDSpecificClass(Identifier = "PK")] + public partial class ServiceInvoiceReportPK : XtraReport, IBeWoReport { - public ServiceInvoiceReport() + public ServiceInvoiceReportPK() { this.InitializeComponent(); } @@ -30,9 +31,14 @@ namespace Akgg { foreach (var ii in sip.ServiceInvoiceItems) { - ii.Duration = ii.Duration.Substring(0, 8); + if (ii.ServiceRecord != null && ii.ServiceRecord.ServiceDescription.CategoryName.Contains("Entlastung")) + ii.Duration = String.Format("Betreuungsstunden {0}", ii.Duration.Substring(0, 8)); + else // (ii.ServiceRecord != null && ii.ServiceRecord.ServiceDescription.CategoryName.Contains("Verhinderung")) + ii.Duration = String.Format("Pflegestunden {0}", ii.Duration.Substring(0, 8)); } } + if (pRO.ServiceInvoicePeriods[0].ServiceInvoiceItems[0].Duration.Contains("Betreuung")) + lblKategorie.Text = "Entlastungsbetrag gem. § 45 SGB XI"; this.bindingSource1.DataSource = pRO; } diff --git a/ReportImp/AKGG/ServiceInvoiceReport.resx b/ReportImp/AKGG/ServiceInvoiceReportPK.resx similarity index 100% rename from ReportImp/AKGG/ServiceInvoiceReport.resx rename to ReportImp/AKGG/ServiceInvoiceReportPK.resx diff --git a/Service/ServiceImplementations/AccountingServiceImp.cs b/Service/ServiceImplementations/AccountingServiceImp.cs index 66075a1ef..fbf6f707d 100644 --- a/Service/ServiceImplementations/AccountingServiceImp.cs +++ b/Service/ServiceImplementations/AccountingServiceImp.cs @@ -354,6 +354,13 @@ namespace BeWo.Service.ServiceImplementations foreach (var ib in newInvoices) { + if (ib.Type == InvoiceType.General) + { + foreach (var item in ib.InvoiceItems) + { + item.AmountTotal = Math.Round(item.AmountTotal ?? 0, 2, MidpointRounding.AwayFromZero); + } + } var nextNumber = inc.GetNextInvoiceNumber(count, ib); if (!String.IsNullOrEmpty(nextNumber)) {