diff --git a/BeWoAllReports.sln b/BeWoAllReports.sln index 371216a8f..4cf17d852 100644 --- a/BeWoAllReports.sln +++ b/BeWoAllReports.sln @@ -8,6 +8,9 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{FEB0336B-F053-40B6-92DD-7DE56AB9408A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReportImp", "ReportImp", "{D8A691C5-146D-4613-86CC-438F02FE9106}" + ProjectSection(SolutionItems) = preProject + ReportImp\Wabe\Wabe.csproj = ReportImp\Wabe\Wabe.csproj + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWo", "BeWo\BeWo.csproj", "{3FEBB560-9275-413A-9767-BB68C44EEBC3}" ProjectSection(ProjectDependencies) = postProject @@ -852,6 +855,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VereinBeratungTherapie", "R EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AkkuratDienstleistungsgesellschaft", "ReportImp\AkkuratDienstleistungsgesellschaft\AkkuratDienstleistungsgesellschaft.csproj", "{AE5234BB-D0E3-4735-B965-D0397564334E}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wabe", "ReportImp\Wabe\Wabe.csproj", "{DD0ABE1B-6181-40D4-B9B7-51FFFFFD8A52}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -10463,6 +10468,30 @@ Global {AE5234BB-D0E3-4735-B965-D0397564334E}.Release|Mixed Platforms.Build.0 = Release|Any CPU {AE5234BB-D0E3-4735-B965-D0397564334E}.Release|x86.ActiveCfg = Release|Any CPU {AE5234BB-D0E3-4735-B965-D0397564334E}.Release|x86.Build.0 = Release|Any CPU + {DD0ABE1B-6181-40D4-B9B7-51FFFFFD8A52}.Debug|.NET.ActiveCfg = Debug|Any CPU + {DD0ABE1B-6181-40D4-B9B7-51FFFFFD8A52}.Debug|.NET.Build.0 = Debug|Any CPU + {DD0ABE1B-6181-40D4-B9B7-51FFFFFD8A52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DD0ABE1B-6181-40D4-B9B7-51FFFFFD8A52}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DD0ABE1B-6181-40D4-B9B7-51FFFFFD8A52}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {DD0ABE1B-6181-40D4-B9B7-51FFFFFD8A52}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {DD0ABE1B-6181-40D4-B9B7-51FFFFFD8A52}.Debug|x86.ActiveCfg = Debug|Any CPU + {DD0ABE1B-6181-40D4-B9B7-51FFFFFD8A52}.Debug|x86.Build.0 = Debug|Any CPU + {DD0ABE1B-6181-40D4-B9B7-51FFFFFD8A52}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU + {DD0ABE1B-6181-40D4-B9B7-51FFFFFD8A52}.DebugRemote|.NET.Build.0 = Debug|Any CPU + {DD0ABE1B-6181-40D4-B9B7-51FFFFFD8A52}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU + {DD0ABE1B-6181-40D4-B9B7-51FFFFFD8A52}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU + {DD0ABE1B-6181-40D4-B9B7-51FFFFFD8A52}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU + {DD0ABE1B-6181-40D4-B9B7-51FFFFFD8A52}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU + {DD0ABE1B-6181-40D4-B9B7-51FFFFFD8A52}.DebugRemote|x86.ActiveCfg = Debug|Any CPU + {DD0ABE1B-6181-40D4-B9B7-51FFFFFD8A52}.DebugRemote|x86.Build.0 = Debug|Any CPU + {DD0ABE1B-6181-40D4-B9B7-51FFFFFD8A52}.Release|.NET.ActiveCfg = Release|Any CPU + {DD0ABE1B-6181-40D4-B9B7-51FFFFFD8A52}.Release|.NET.Build.0 = Release|Any CPU + {DD0ABE1B-6181-40D4-B9B7-51FFFFFD8A52}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DD0ABE1B-6181-40D4-B9B7-51FFFFFD8A52}.Release|Any CPU.Build.0 = Release|Any CPU + {DD0ABE1B-6181-40D4-B9B7-51FFFFFD8A52}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {DD0ABE1B-6181-40D4-B9B7-51FFFFFD8A52}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {DD0ABE1B-6181-40D4-B9B7-51FFFFFD8A52}.Release|x86.ActiveCfg = Release|Any CPU + {DD0ABE1B-6181-40D4-B9B7-51FFFFFD8A52}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -10887,6 +10916,7 @@ Global {40C28D21-E6A0-400D-B8E8-27341D580BD5} = {D8A691C5-146D-4613-86CC-438F02FE9106} {89BD2C63-5B2E-4BA0-BCEF-B66997A8CBAC} = {D8A691C5-146D-4613-86CC-438F02FE9106} {AE5234BB-D0E3-4735-B965-D0397564334E} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {DD0ABE1B-6181-40D4-B9B7-51FFFFFD8A52} = {D8A691C5-146D-4613-86CC-438F02FE9106} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9} diff --git a/ReportImp/BzhEssenGGmbH/BzhEssenGGmbH.csproj b/ReportImp/BzhEssenGGmbH/BzhEssenGGmbH.csproj index a134d8a2c..f2a827248 100644 --- a/ReportImp/BzhEssenGGmbH/BzhEssenGGmbH.csproj +++ b/ReportImp/BzhEssenGGmbH/BzhEssenGGmbH.csproj @@ -63,6 +63,7 @@ + Component @@ -70,6 +71,12 @@ Quittierungsbeleg.cs + + Component + + + ServiceInvoiceReport.cs + Component @@ -107,6 +114,10 @@ Quittierungsbeleg.cs Designer + + ServiceInvoiceReport.cs + Designer + SettlementReport.cs Designer diff --git a/ReportImp/BzhEssenGGmbH/Invoicing/SettlementInvoiceCreation.cs b/ReportImp/BzhEssenGGmbH/Invoicing/SettlementInvoiceCreation.cs new file mode 100644 index 000000000..fd7795fab --- /dev/null +++ b/ReportImp/BzhEssenGGmbH/Invoicing/SettlementInvoiceCreation.cs @@ -0,0 +1,18 @@ +using BeWo.Data.Entities; +using BeWo.Service.Invoicing; +using BS.Shared.DataContracts; +using BS.Shared.Services; +using System; +using System.Collections.Generic; +using System.Linq; + +namespace BzhEssenGGmbH +{ + public class CustomSettlementInvoiceCreation : SettlementInvoiceCreation + { + public override bool CanCreateInvoiceTheOldWay(Settlement2DC si, CostBearer2SupportConcept c2s) + { + return false; + } + } +} diff --git a/ReportImp/BzhEssenGGmbH/Properties/licenses.licx b/ReportImp/BzhEssenGGmbH/Properties/licenses.licx index e69de29bb..d59547a61 100644 --- a/ReportImp/BzhEssenGGmbH/Properties/licenses.licx +++ b/ReportImp/BzhEssenGGmbH/Properties/licenses.licx @@ -0,0 +1 @@ +DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/ReportImp/BzhEssenGGmbH/ServiceInvoiceReport.Designer.cs b/ReportImp/BzhEssenGGmbH/ServiceInvoiceReport.Designer.cs new file mode 100644 index 000000000..d788bb947 --- /dev/null +++ b/ReportImp/BzhEssenGGmbH/ServiceInvoiceReport.Designer.cs @@ -0,0 +1,797 @@ +using BeWo.Report.ReportObjects; +namespace BzhEssenGGmbH +{ + partial class ServiceInvoiceReport + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServiceInvoiceReport)); + 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.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblAnrede = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblAbrechnungszeitraum = new DevExpress.XtraReports.UI.XRLabel(); + this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); + this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); + this.DetailReport2 = new DevExpress.XtraReports.UI.DetailReportBand(); + this.Detail3 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTable6 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow25 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell46 = 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.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); + this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); + // + // Detail + // + this.Detail.HeightF = 0F; + this.Detail.Name = "Detail"; + this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // ReportHeader + // + this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); + this.ReportHeader.HeightF = 0F; + this.ReportHeader.Name = "ReportHeader"; + this.ReportHeader.StylePriority.UseFont = false; + // + // ruleRateFactorNull + // + this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?"; + this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; + this.ruleRateFactorNull.Name = "ruleRateFactorNull"; + // + // topMarginBand1 + // + this.topMarginBand1.HeightF = 157.5F; + this.topMarginBand1.Name = "topMarginBand1"; + // + // bottomMarginBand1 + // + this.bottomMarginBand1.HeightF = 50F; + this.bottomMarginBand1.Name = "bottomMarginBand1"; + // + // Page1 + // + this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel6, + this.xrLabel7, + this.xrLabel13, + this.xrRichText1, + this.lblAdresse, + this.xrLabel4, + this.xrLabel3, + this.xrLabel2, + this.lblAnrede, + this.xrLabel8, + this.lblAbrechnungszeitraum}); + this.Page1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); + this.Page1.HeightF = 503.6666F; + this.Page1.Name = "Page1"; + this.Page1.StylePriority.UseFont = false; + // + // lblAdresse + // + this.lblAdresse.Font = new DevExpress.Drawing.DXFont("Calibri", 12F); + this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 22.99999F); + this.lblAdresse.Multiline = true; + this.lblAdresse.Name = "lblAdresse"; + this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblAdresse.SizeF = new System.Drawing.SizeF(317F, 111.5F); + this.lblAdresse.StylePriority.UseFont = false; + this.lblAdresse.Text = "[RecipientOrganisation]\r\n[RecipientDivision]\r\n[RecipientContactPerson]\r\n[Recipien" + + "tStreet]\r\n[RecipientPostCodeAndTown]"; + // + // xrLabel4 + // + this.xrLabel4.BackColor = System.Drawing.Color.Transparent; + this.xrLabel4.CanShrink = true; + this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Calibri", 12F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 445.1249F); + 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(650F, 20F); + this.xrLabel4.StylePriority.UseBackColor = false; + this.xrLabel4.StylePriority.UseFont = false; + this.xrLabel4.Text = "Zeitraum: [AccountingPeriod]"; + this.xrLabel4.WordWrap = false; + // + // xrLabel3 + // + this.xrLabel3.BackColor = System.Drawing.Color.Transparent; + this.xrLabel3.CanShrink = true; + this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Calibri", 12F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 465.1249F); + this.xrLabel3.Name = "xrLabel3"; + this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 20F); + this.xrLabel3.StylePriority.UseBackColor = false; + this.xrLabel3.StylePriority.UseFont = false; + this.xrLabel3.Text = "Klient/in: [CustomerName]"; + this.xrLabel3.WordWrap = false; + // + // xrLabel2 + // + this.xrLabel2.BackColor = System.Drawing.Color.Transparent; + this.xrLabel2.CanShrink = true; + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Calibri", 12F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 262.7084F); + this.xrLabel2.Name = "xrLabel2"; + this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(650F, 20F); + this.xrLabel2.StylePriority.UseBackColor = false; + this.xrLabel2.StylePriority.UseFont = false; + this.xrLabel2.Text = "Rechnung Nr. [InvoiceNumber]"; + this.xrLabel2.WordWrap = false; + // + // lblAnrede + // + this.lblAnrede.Font = new DevExpress.Drawing.DXFont("Calibri", 12F); + this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 365.2083F); + this.lblAnrede.Name = "lblAnrede"; + this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblAnrede.SizeF = new System.Drawing.SizeF(317F, 17F); + this.lblAnrede.StylePriority.UseFont = false; + this.lblAnrede.Text = "Sehr geehrte Damen und Herren,"; + // + // xrLabel8 + // + this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")}); + this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Calibri", 12F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(394F, 225.125F); + this.xrLabel8.Name = "xrLabel8"; + this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel8.SizeF = new System.Drawing.SizeF(283F, 23F); + this.xrLabel8.StylePriority.UseFont = false; + this.xrLabel8.StylePriority.UseTextAlignment = false; + this.xrLabel8.Text = "xrLabel8"; + this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + // + // lblAbrechnungszeitraum + // + this.lblAbrechnungszeitraum.Font = new DevExpress.Drawing.DXFont("Calibri", 12F); + this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 390.2083F); + this.lblAbrechnungszeitraum.Multiline = true; + this.lblAbrechnungszeitraum.Name = "lblAbrechnungszeitraum"; + this.lblAbrechnungszeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblAbrechnungszeitraum.SizeF = new System.Drawing.SizeF(642F, 42.20828F); + this.lblAbrechnungszeitraum.StylePriority.UseFont = false; + this.lblAbrechnungszeitraum.Text = "die Fachleistungsstunden für die ambulante Betreuung berechnen wir gemäß des beil" + + "iegenden Quittierungsbelegs wie folgt:"; + // + // xrTable4 + // + this.xrTable4.Font = new DevExpress.Drawing.DXFont("Calibri", 12F); + this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 39.58333F); + this.xrTable4.Name = "xrTable4"; + this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow10, + this.xrTableRow14}); + this.xrTable4.SizeF = new System.Drawing.SizeF(650F, 26F); + this.xrTable4.StylePriority.UseFont = false; + // + // xrTableRow10 + // + this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell9}); + this.xrTableRow10.Name = "xrTableRow10"; + this.xrTableRow10.Weight = 0.38095238095238093D; + // + // xrTableCell9 + // + this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")}); + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell9.StylePriority.UsePadding = false; + this.xrTableCell9.Text = "xrTableCell1"; + this.xrTableCell9.Weight = 3D; + // + // xrTableRow14 + // + this.xrTableRow14.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell12}); + this.xrTableRow14.Name = "xrTableRow14"; + this.xrTableRow14.Weight = 0.23809523809523808D; + // + // xrTableCell12 + // + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.Weight = 3D; + // + // DetailReport + // + this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail1, + this.DetailReport2}); + this.DetailReport.DataMember = "ServiceInvoicePeriods"; + this.DetailReport.DataSource = this.bindingSource1; + this.DetailReport.Level = 0; + this.DetailReport.Name = "DetailReport"; + // + // Detail1 + // + this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable5}); + this.Detail1.HeightF = 25F; + this.Detail1.Name = "Detail1"; + // + // xrTable5 + // + this.xrTable5.Font = new DevExpress.Drawing.DXFont("Calibri", 10F); + this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable5.Name = "xrTable5"; + this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow23}); + this.xrTable5.SizeF = new System.Drawing.SizeF(677F, 25F); + this.xrTable5.StylePriority.UseFont = false; + // + // xrTableRow23 + // + this.xrTableRow23.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell32, + this.xrTableCell37, + this.xrTableCell35, + this.xrTableCell33, + this.xrTableCell36, + this.xrTableCell38, + this.xrTableCell34}); + this.xrTableRow23.Name = "xrTableRow23"; + this.xrTableRow23.Weight = 1D; + // + // xrTableCell32 + // + this.xrTableCell32.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell32.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell32.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell32.Name = "xrTableCell32"; + this.xrTableCell32.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell32.StylePriority.UseBackColor = false; + this.xrTableCell32.StylePriority.UseBorderColor = false; + this.xrTableCell32.StylePriority.UseBorders = false; + this.xrTableCell32.StylePriority.UsePadding = false; + this.xrTableCell32.StylePriority.UseTextAlignment = false; + this.xrTableCell32.Text = "Zeitraum"; + this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell32.Weight = 0.62463077449375981D; + // + // xrTableCell37 + // + this.xrTableCell37.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell37.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell37.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell37.Name = "xrTableCell37"; + this.xrTableCell37.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell37.StylePriority.UseBackColor = false; + this.xrTableCell37.StylePriority.UseBorderColor = false; + this.xrTableCell37.StylePriority.UseBorders = false; + this.xrTableCell37.StylePriority.UsePadding = false; + this.xrTableCell37.StylePriority.UseTextAlignment = false; + this.xrTableCell37.Text = "Leistung"; + this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell37.Weight = 0.85081236260328186D; + // + // xrTableCell35 + // + this.xrTableCell35.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell35.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell35.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell35.Name = "xrTableCell35"; + this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell35.StylePriority.UseBackColor = false; + this.xrTableCell35.StylePriority.UseBorderColor = false; + this.xrTableCell35.StylePriority.UseBorders = false; + this.xrTableCell35.StylePriority.UsePadding = false; + this.xrTableCell35.StylePriority.UseTextAlignment = false; + this.xrTableCell35.Text = "Satz"; + this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell35.Weight = 0.23245943032832414D; + // + // xrTableCell33 + // + this.xrTableCell33.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell33.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell33.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell33.Name = "xrTableCell33"; + this.xrTableCell33.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell33.StylePriority.UseBackColor = false; + this.xrTableCell33.StylePriority.UseBorderColor = false; + this.xrTableCell33.StylePriority.UseBorders = false; + this.xrTableCell33.StylePriority.UsePadding = false; + this.xrTableCell33.StylePriority.UseTextAlignment = false; + this.xrTableCell33.Text = "Stunden"; + this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell33.Weight = 0.2893277257020575D; + // + // xrTableCell36 + // + this.xrTableCell36.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell36.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell36.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell36.Name = "xrTableCell36"; + this.xrTableCell36.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell36.StylePriority.UseBackColor = false; + this.xrTableCell36.StylePriority.UseBorderColor = false; + this.xrTableCell36.StylePriority.UseBorders = false; + this.xrTableCell36.StylePriority.UsePadding = false; + this.xrTableCell36.StylePriority.UseTextAlignment = false; + this.xrTableCell36.Text = "Betrag"; + this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell36.Weight = 0.26310971709438763D; + // + // xrTableCell38 + // + this.xrTableCell38.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell38.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell38.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell38.Name = "xrTableCell38"; + this.xrTableCell38.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell38.StylePriority.UseBackColor = false; + this.xrTableCell38.StylePriority.UseBorderColor = false; + this.xrTableCell38.StylePriority.UseBorders = false; + this.xrTableCell38.StylePriority.UsePadding = false; + this.xrTableCell38.StylePriority.UseTextAlignment = false; + this.xrTableCell38.Text = "pausch Fakt."; + this.xrTableCell38.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell38.Weight = 0.42042083402151886D; + // + // xrTableCell34 + // + this.xrTableCell34.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell34.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell34.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell34.Name = "xrTableCell34"; + this.xrTableCell34.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell34.StylePriority.UseBackColor = false; + this.xrTableCell34.StylePriority.UseBorderColor = false; + this.xrTableCell34.StylePriority.UseBorders = false; + this.xrTableCell34.StylePriority.UsePadding = false; + this.xrTableCell34.StylePriority.UseTextAlignment = false; + this.xrTableCell34.Text = "Gesamt"; + this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell34.Weight = 0.31923915575667006D; + // + // DetailReport2 + // + this.DetailReport2.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail3, + this.GroupFooter1}); + this.DetailReport2.DataMember = "ServiceInvoicePeriods.ServiceInvoiceItems"; + this.DetailReport2.DataSource = this.bindingSource1; + this.DetailReport2.Level = 0; + this.DetailReport2.Name = "DetailReport2"; + this.DetailReport2.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand; + // + // Detail3 + // + this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable6}); + this.Detail3.HeightF = 25F; + this.Detail3.Name = "Detail3"; + // + // xrTable6 + // + this.xrTable6.Font = new DevExpress.Drawing.DXFont("Calibri", 10F); + this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable6.Name = "xrTable6"; + this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow25}); + this.xrTable6.SizeF = new System.Drawing.SizeF(677F, 25F); + this.xrTable6.StylePriority.UseFont = false; + // + // xrTableRow25 + // + this.xrTableRow25.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell40, + this.xrTableCell42, + this.xrTableCell43, + this.xrTableCell44, + this.xrTableCell45, + this.xrTableCell46, + this.xrTableCell47}); + this.xrTableRow25.Name = "xrTableRow25"; + this.xrTableRow25.Weight = 1D; + // + // xrTableCell40 + // + this.xrTableCell40.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell40.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Duration")}); + this.xrTableCell40.Name = "xrTableCell40"; + this.xrTableCell40.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell40.StylePriority.UseBorderColor = false; + this.xrTableCell40.StylePriority.UseBorders = false; + this.xrTableCell40.StylePriority.UsePadding = false; + this.xrTableCell40.StylePriority.UseTextAlignment = false; + this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell40.Weight = 0.62463084211025488D; + // + // xrTableCell42 + // + this.xrTableCell42.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell42.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.ServiceDescription")}); + this.xrTableCell42.Name = "xrTableCell42"; + this.xrTableCell42.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell42.StylePriority.UseBorderColor = false; + this.xrTableCell42.StylePriority.UseBorders = false; + this.xrTableCell42.StylePriority.UsePadding = false; + this.xrTableCell42.StylePriority.UseTextAlignment = false; + this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell42.Weight = 0.85081229498678679D; + // + // xrTableCell43 + // + this.xrTableCell43.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell43.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell43.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.HourlyRate", "{0:0.00}")}); + this.xrTableCell43.Name = "xrTableCell43"; + this.xrTableCell43.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell43.StylePriority.UseBorderColor = false; + this.xrTableCell43.StylePriority.UseBorders = false; + this.xrTableCell43.StylePriority.UsePadding = false; + this.xrTableCell43.StylePriority.UseTextAlignment = false; + this.xrTableCell43.Text = "xrTableCell43"; + this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell43.Weight = 0.23245943032832414D; + // + // xrTableCell44 + // + this.xrTableCell44.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell44.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Hours", "{0:0.##}")}); + this.xrTableCell44.Name = "xrTableCell44"; + this.xrTableCell44.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell44.StylePriority.UseBorderColor = false; + this.xrTableCell44.StylePriority.UseBorders = false; + this.xrTableCell44.StylePriority.UsePadding = false; + this.xrTableCell44.StylePriority.UseTextAlignment = false; + this.xrTableCell44.Text = "xrTableCell44"; + this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell44.Weight = 0.2893277257020575D; + // + // xrTableCell45 + // + this.xrTableCell45.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell45.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell45.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.NetAmount", "{0:0.00}")}); + this.xrTableCell45.Name = "xrTableCell45"; + this.xrTableCell45.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell45.StylePriority.UseBorderColor = false; + this.xrTableCell45.StylePriority.UseBorders = false; + this.xrTableCell45.StylePriority.UsePadding = false; + this.xrTableCell45.StylePriority.UseTextAlignment = false; + this.xrTableCell45.Text = "xrTableCell45"; + this.xrTableCell45.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell45.Weight = 0.26310971709438763D; + // + // xrTableCell46 + // + this.xrTableCell46.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell46.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell46.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.RateFactor")}); + this.xrTableCell46.Name = "xrTableCell46"; + this.xrTableCell46.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell46.StylePriority.UseBorderColor = false; + this.xrTableCell46.StylePriority.UseBorders = false; + this.xrTableCell46.StylePriority.UsePadding = false; + this.xrTableCell46.StylePriority.UseTextAlignment = false; + this.xrTableCell46.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell46.Weight = 0.42042083402151886D; + // + // xrTableCell47 + // + this.xrTableCell47.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell47.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell47.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.GrossAmount")}); + this.xrTableCell47.Name = "xrTableCell47"; + this.xrTableCell47.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell47.StylePriority.UseBorderColor = false; + this.xrTableCell47.StylePriority.UseBorders = false; + this.xrTableCell47.StylePriority.UsePadding = false; + this.xrTableCell47.StylePriority.UseTextAlignment = false; + this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell47.Weight = 0.31923915575667006D; + // + // GroupFooter1 + // + this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel12, + this.xrLabel10, + this.xrLabel16, + this.xrLabel5, + this.xrLabel1, + this.xrTable4}); + this.GroupFooter1.HeightF = 268.5416F; + this.GroupFooter1.Name = "GroupFooter1"; + // + // xrLabel1 + // + this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim", "Gesamtsumme: {0}")}); + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Calibri", 12F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(420.9999F, 0F); + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(255.8333F, 25F); + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.StylePriority.UsePadding = false; + this.xrLabel1.StylePriority.UseTextAlignment = false; + this.xrLabel1.Text = "xrLabel1"; + this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); + // + // xrRichText1 + // + this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Calibri", 8F); + this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrRichText1.Name = "xrRichText1"; + this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); + this.xrRichText1.SizeF = new System.Drawing.SizeF(479.5F, 23F); + this.xrRichText1.StylePriority.UseFont = false; + // + // xrLabel6 + // + this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(419.4997F, 152.9166F); + this.xrLabel6.Name = "xrLabel6"; + this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel6.SizeF = new System.Drawing.SizeF(257.5001F, 22.99998F); + this.xrLabel6.StylePriority.UseFont = false; + this.xrLabel6.StylePriority.UseTextAlignment = false; + this.xrLabel6.Text = "www.bzh-essen.de"; + this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + // + // xrLabel7 + // + this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(419.4997F, 22.99999F); + this.xrLabel7.Multiline = true; + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(257.5002F, 34.00002F); + this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.StylePriority.UseTextAlignment = false; + this.xrLabel7.Text = "Ambulant Betreutes Wohnen\r\nJugend- und Familienhilfe"; + this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + // + // xrLabel13 + // + this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Calibri", 10F); + this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(419.4997F, 57F); + 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(257.5001F, 95.91666F); + this.xrLabel13.StylePriority.UseFont = false; + this.xrLabel13.StylePriority.UseTextAlignment = false; + this.xrLabel13.Text = "Kerckhoffstr. 127\r\n45144 Essen\r\nTel: 0201 / 760 02-25\r\nFax: 0201 / 760 02-23\r\nE-M" + + "ail: ina-maria.osmanovic@bzh-essen.de"; + this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + // + // xrLabel12 + // + this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Calibri", 12F); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 234.5416F); + this.xrLabel12.Name = "xrLabel12"; + this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel12.SizeF = new System.Drawing.SizeF(186.4583F, 17F); + this.xrLabel12.StylePriority.UseFont = false; + this.xrLabel12.Text = "i.A. Ina-Maria Osmanovic"; + // + // xrLabel10 + // + this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Calibri", 12F); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 168.0834F); + 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); + this.xrLabel10.StylePriority.UseFont = false; + this.xrLabel10.Text = "Mit freundlichen Grüßen"; + // + // xrLabel16 + // + this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Calibri", 12F); + this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(0F, 76.75012F); + 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(676.9999F, 61.12492F); + this.xrLabel16.StylePriority.UseFont = false; + this.xrLabel16.Text = "Wir bitten um Überweisung des Rechnungsbetrages auf unser u. g. Konto.\r\n\r\nVielen " + + "Dank!"; + // + // xrLabel5 + // + this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Calibri", 12F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 251.5416F); + this.xrLabel5.Name = "xrLabel5"; + this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel5.SizeF = new System.Drawing.SizeF(186.4583F, 17F); + this.xrLabel5.StylePriority.UseFont = false; + this.xrLabel5.StylePriority.UseTextAlignment = false; + this.xrLabel5.Text = "(Verwaltung)"; + this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + // + // ServiceInvoiceReport + // + this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail, + this.ReportHeader, + this.topMarginBand1, + this.bottomMarginBand1, + this.Page1, + this.DetailReport}); + this.DataSource = this.bindingSource1; + this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; + this.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); + this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { + this.ruleRateFactorNull}); + this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 157.5F, 50F); + this.PageHeight = 1169; + this.PageWidth = 827; + this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; + this.Version = "23.2"; + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); + + } + + + private DevExpress.XtraReports.UI.DetailBand Detail; + private System.Windows.Forms.BindingSource bindingSource1; + private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; + private DevExpress.XtraReports.UI.FormattingRule ruleRateFactorNull; + private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; + private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; + private DevExpress.XtraReports.UI.GroupHeaderBand Page1; + private DevExpress.XtraReports.UI.XRLabel xrLabel4; + private DevExpress.XtraReports.UI.XRLabel xrLabel3; + private DevExpress.XtraReports.UI.XRLabel xrLabel2; + private DevExpress.XtraReports.UI.XRLabel lblAnrede; + private DevExpress.XtraReports.UI.XRLabel xrLabel8; + private DevExpress.XtraReports.UI.XRLabel lblAbrechnungszeitraum; + private DevExpress.XtraReports.UI.XRTable xrTable4; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow14; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport; + private DevExpress.XtraReports.UI.DetailBand Detail1; + private DevExpress.XtraReports.UI.XRTable xrTable5; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow23; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell32; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell37; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell35; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell33; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell36; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell38; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell34; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport2; + private DevExpress.XtraReports.UI.DetailBand Detail3; + private DevExpress.XtraReports.UI.XRTable xrTable6; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow25; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell40; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell42; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell43; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell44; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell45; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell46; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell47; + private DevExpress.XtraReports.UI.XRLabel lblAdresse; + private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; + private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRRichText xrRichText1; + private DevExpress.XtraReports.UI.XRLabel xrLabel6; + private DevExpress.XtraReports.UI.XRLabel xrLabel7; + private DevExpress.XtraReports.UI.XRLabel xrLabel13; + private DevExpress.XtraReports.UI.XRLabel xrLabel12; + private DevExpress.XtraReports.UI.XRLabel xrLabel10; + private DevExpress.XtraReports.UI.XRLabel xrLabel16; + private DevExpress.XtraReports.UI.XRLabel xrLabel5; + } +} diff --git a/ReportImp/BzhEssenGGmbH/ServiceInvoiceReport.cs b/ReportImp/BzhEssenGGmbH/ServiceInvoiceReport.cs new file mode 100644 index 000000000..51271d783 --- /dev/null +++ b/ReportImp/BzhEssenGGmbH/ServiceInvoiceReport.cs @@ -0,0 +1,101 @@ +using System; +using System.Text; +using BeWo.Data.Entities; +using BeWo.Report; +using BeWo.Report.ReportObjects; +using BS.Shared; +using DevExpress.XtraReports.UI; + +namespace BzhEssenGGmbH +{ + public partial class ServiceInvoiceReport : XtraReport, IBeWoReport + { + public ServiceInvoiceReport() + { + this.InitializeComponent(); + } + + public void SetReportDataSource(ServiceInvoiceRO pRO) + { + DateTime start = pRO.AccountingPeriodStart; + DateTime end = pRO.AccountingPeriodEnd; + if (start.Month == end.Month && start.Year == end.Year) + { + lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Monat {0:MMMM yyyy} folgende erbrachte Tätigkeiten:", start); + } + else + { + lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Zeitraum {0:MMMM yyyy} - {1:MMMM yyyy} folgende erbrachte Tätigkeiten:", start, end); + } + + SetzeAdresse(pRO); + SetzeAnrede(pRO); + + this.bindingSource1.DataSource = pRO; + } + + private void SetzeAdresse(ServiceInvoiceRO pRO) + { + StringBuilder sb = new StringBuilder(); + if (!String.IsNullOrEmpty(pRO.RecipientOrganisation) && pRO.RecipientOrganisation.ToLower() != "selbstzahler") + { + sb.AppendLine(pRO.RecipientOrganisation); + } + //if (!String.IsNullOrEmpty(pRO.RecipientAddressLine1)) + //{ + // sb.AppendLine(pRO.RecipientAddressLine1); + //} + if (!String.IsNullOrEmpty(pRO.RecipientDivision) && !String.IsNullOrEmpty(pRO.RecipientOrganisation) && pRO.RecipientOrganisation.ToLower() != "selbstzahler") + { + sb.AppendLine(pRO.RecipientDivision); + } + if (!String.IsNullOrEmpty(pRO.RecipientContactPerson)) + { + sb.AppendLine(pRO.RecipientContactPerson); + } + if (!String.IsNullOrEmpty(pRO.RecipientPoBox)) + { + sb.AppendLine(pRO.RecipientPoBox); + } + else if (!String.IsNullOrEmpty(pRO.RecipientStreet)) + { + sb.AppendLine(pRO.RecipientStreet); + } + if (!String.IsNullOrEmpty(pRO.RecipientPostCodeAndTown)) + { + sb.AppendLine(pRO.RecipientPostCodeAndTown); + } + lblAdresse.Text = sb.ToString(); + } + + private void SetzeAnrede(ServiceInvoiceRO pRO) + { + String anrede = "Sehr geehrte Damen und Herren,"; + var p = GetKontaktPerson(pRO); + + if (p != null) + { + if (p.Sex.HasValue && p.Sex.Value == Sex.Male) + { + anrede = "Sehr geehrter Herr " + p.LastName + ","; + } + else if (p.Sex.HasValue && p.Sex.Value == Sex.Female) + { + anrede = "Sehr geehrte Frau " + p.LastName + ","; + } + } + + lblAnrede.Text = anrede; + } + + private Person GetKontaktPerson(ServiceInvoiceRO pRO) + { + if (pRO.ServiceInvoicePeriods != null && pRO.ServiceInvoicePeriods.Count > 0) + { + var c2s = pRO.ServiceInvoicePeriods[0].CostBearer2SupportConcept; + return c2s.CostBearerContactPerson; + } + return null; + } + } +} \ No newline at end of file diff --git a/ReportImp/BzhEssenGGmbH/ServiceInvoiceReport.resx b/ReportImp/BzhEssenGGmbH/ServiceInvoiceReport.resx new file mode 100644 index 000000000..367ae1288 --- /dev/null +++ b/ReportImp/BzhEssenGGmbH/ServiceInvoiceReport.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMgA1ADUAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAwACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAKgBcAGQAZQBmAHAAYQBwACAAXAB3AGkAZABjAHQAbABwAGEAcgB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAMQBcAGYAcwAyADQAIABOAG8AcgBtAGEAbAA7AH0AewBcACoAXABjAHMAMQBcAGYAMQBcAGYAcwAyADQAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0ACAATABpAG4AZQAgAE4AdQBtAGIAZQByADsAfQB7AFwAKgBcAGMAcwAzAFwAZgAxAFwAZgBzADIANABcAHUAbABcAGMAZgAxACAASAB5AHAAZQByAGwAaQBuAGsAOwB9AHsAXAAqAFwAdABzADQAXAB0AHMAcgBvAHcAZABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAdAAzAFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABOAG8AcgBtAGEAbAAgAFQAYQBiAGwAZQA7AH0AewBcACoAXAB0AHMANQBcAHQAcwByAG8AdwBkAFwAcwBiAGEAcwBlAGQAbwBuADQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdAByAGIAcgBkAHIAdABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBsAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAcgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBoAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHYAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAFQAYQBiAGwAZQAgAFMAaQBtAHAAbABlACAAMQA7AH0AfQB7AFwAKgBcAGwAaQBzAHQAbwB2AGUAcgByAGkAZABlAHQAYQBiAGwAZQB9AFwAbgBvAHUAaQBjAG8AbQBwAGEAdABcAGgAdABtAGEAdQB0AHMAcABcAHMAcABsAHkAdAB3AG4AaQBuAGUAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADIAXABmAHMAMQA0AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGkAXABjAGYAMgAgAGIAegBoACAALQAgAEUAcwBzAGUAbgAgAGcAZQBtAGUAaQBuAG4AXAB1ADIANQAyAFwAJwBmAGMAdAB6AGkAZwBlACAARwBtAGIASAAgAH0AewBcAGYAMgBcAGYAcwAxADQAXABpAFwAYwBmADAAIABcAHUAOQA2ADcAOQBcACcAMwBmACAAfQB7AFwAZgAyAFwAZgBzADEANABcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABpAFwAYwBmADAAIABLAGUAcgBjAGsAaABvAGYAZgBzAHQAcgAuACAAMQAyADcAIAB9AHsAXABmADIAXABmAHMAMQA0AFwAaQBcAGMAZgAwACAAXAB1ADkANgA3ADkAXAAnADMAZgAgAH0AewBcAGYAMgBcAGYAcwAxADQAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAaQBcAGMAZgAwACAANAA1ADEANAA0ACAARQBzAHMAZQBuAH0AXABmADIAXABmAHMAMQA0AFwAaQBcAGMAZgAyAFwAcABhAHIAfQA= + + \ No newline at end of file diff --git a/ReportImp/BzhEssenGGmbH/SettlementReport2.Designer.cs b/ReportImp/BzhEssenGGmbH/SettlementReport2.Designer.cs index fae34c9e8..a1dd29dfd 100644 --- a/ReportImp/BzhEssenGGmbH/SettlementReport2.Designer.cs +++ b/ReportImp/BzhEssenGGmbH/SettlementReport2.Designer.cs @@ -38,9 +38,8 @@ namespace BzhEssenGGmbH this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblAnrede = new DevExpress.XtraReports.UI.XRLabel(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); - this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); @@ -67,6 +66,15 @@ namespace BzhEssenGGmbH this.xrTableRow33 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell52 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell53 = new DevExpress.XtraReports.UI.XRTableCell(); + this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.Zwischensumme = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrTable6 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); @@ -88,20 +96,12 @@ namespace BzhEssenGGmbH this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell(); - this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); - this.Zwischensumme = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.xrTable6 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -116,14 +116,14 @@ namespace BzhEssenGGmbH this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrRichText1, this.xrLabel9}); - this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F); + this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.ReportHeader.HeightF = 110F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; // // xrRichText1 // - this.xrRichText1.Font = new System.Drawing.Font("Calibri", 8F); + this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Calibri", 8F); this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 87.00002F); this.xrRichText1.Name = "xrRichText1"; this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); @@ -150,54 +150,43 @@ namespace BzhEssenGGmbH // xrLabel6 // this.xrLabel6.BackColor = System.Drawing.Color.Transparent; - this.xrLabel6.Font = new System.Drawing.Font("Calibri", 12F); - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 327F); + this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Calibri", 12F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 352.8333F); 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(677.9999F, 47.70831F); this.xrLabel6.StylePriority.UseBackColor = false; this.xrLabel6.StylePriority.UseFont = false; - this.xrLabel6.Text = "anbei übersenden wir Ihnen die Kopien der Stundennachweise über [RecordedFLS!0.00" + - "] geleistete Fachleistungsstunden für [AccountingPeriod]. Diese rechnen wir wie " + - "folgt ab:\r\n"; + this.xrLabel6.Text = "anbei übersenden wir Ihnen die Kopien der Stundennachweise für den o.g. Zeitraum." + + " \r\nDiese rechnen wir wie folgt ab:\r\n"; // - // xrLabel5 + // lblAnrede // - this.xrLabel5.Font = new System.Drawing.Font("Calibri", 12F); - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 294F); - this.xrLabel5.Name = "xrLabel5"; - this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F); - this.xrLabel5.StylePriority.UseFont = false; - this.xrLabel5.Text = "Sehr geehrte Damen und Herren,"; + this.lblAnrede.Font = new DevExpress.Drawing.DXFont("Calibri", 12F); + this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 319.8333F); + this.lblAnrede.Name = "lblAnrede"; + this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblAnrede.SizeF = new System.Drawing.SizeF(317F, 17F); + this.lblAnrede.StylePriority.UseFont = false; + this.lblAnrede.Text = "Sehr geehrte Damen und Herren,"; // // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel11, + this.xrLabel2, this.xrLabel16, this.xrLabel10, this.xrLabel12}); - this.ReportFooter.Font = new System.Drawing.Font("Verdana", 10F); - this.ReportFooter.HeightF = 127.5833F; + this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); + this.ReportFooter.HeightF = 149.4583F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // - // xrLabel11 - // - this.xrLabel11.Font = new System.Drawing.Font("Calibri", 12F); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 61.12499F); - this.xrLabel11.Name = "xrLabel11"; - this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel11.SizeF = new System.Drawing.SizeF(292F, 17F); - this.xrLabel11.StylePriority.UseFont = false; - this.xrLabel11.Text = "bzh - Essen gemeinnützige GmbH"; - // // xrLabel16 // - this.xrLabel16.Font = new System.Drawing.Font("Calibri", 12F); + this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Calibri", 12F); this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(0F, 9.04178F); this.xrLabel16.Multiline = true; this.xrLabel16.Name = "xrLabel16"; @@ -208,7 +197,7 @@ namespace BzhEssenGGmbH // // xrLabel10 // - this.xrLabel10.Font = new System.Drawing.Font("Calibri", 12F); + this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Calibri", 12F); this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 44.12505F); this.xrLabel10.Name = "xrLabel10"; this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -218,13 +207,13 @@ namespace BzhEssenGGmbH // // xrLabel12 // - this.xrLabel12.Font = new System.Drawing.Font("Calibri", 12F); - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 110.5833F); + this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Calibri", 12F); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 110.5832F); 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); + this.xrLabel12.SizeF = new System.Drawing.SizeF(186.4583F, 17F); this.xrLabel12.StylePriority.UseFont = false; - this.xrLabel12.Text = "[CreatorName]"; + this.xrLabel12.Text = "i.A. Ina-Maria Osmanovic"; // // topMarginBand1 // @@ -233,7 +222,6 @@ namespace BzhEssenGGmbH // // bottomMarginBand1 // - this.bottomMarginBand1.HeightF = 100F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // // GroupHeader1 @@ -252,10 +240,10 @@ namespace BzhEssenGGmbH this.xrLabel_RecipientContactPerson, this.xrLabel1, this.xrLabel14, - this.xrLabel5, + this.lblAnrede, this.xrLabel6}); - this.GroupHeader1.Font = new System.Drawing.Font("Verdana", 10F); - this.GroupHeader1.HeightF = 374.7083F; + this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); + this.GroupHeader1.HeightF = 400.5416F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // @@ -263,37 +251,36 @@ namespace BzhEssenGGmbH // this.xrLabel20.BackColor = System.Drawing.Color.Transparent; this.xrLabel20.CanShrink = true; - this.xrLabel20.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Bold); - this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(0.0001430511F, 257.7917F); + this.xrLabel20.Font = new DevExpress.Drawing.DXFont("Calibri", 12F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 283.625F); this.xrLabel20.Name = "xrLabel20"; this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel20.SizeF = new System.Drawing.SizeF(677.9999F, 17F); this.xrLabel20.StylePriority.UseBackColor = false; this.xrLabel20.StylePriority.UseFont = false; - this.xrLabel20.Text = "Bewilligte Stunden: [ApprovedFLS] Bewilligungszeitraum: [AccountingPeriod]"; + this.xrLabel20.Text = "Bewilligungszeitraum: [AccountingPeriod]"; this.xrLabel20.WordWrap = false; // // xrLabel19 // this.xrLabel19.BackColor = System.Drawing.Color.Transparent; this.xrLabel19.CanShrink = true; - this.xrLabel19.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Bold); - this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(0.0001430511F, 240.7917F); + this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Calibri", 12F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 266.625F); this.xrLabel19.Name = "xrLabel19"; this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel19.SizeF = new System.Drawing.SizeF(677.9999F, 17F); this.xrLabel19.StylePriority.UseBackColor = false; this.xrLabel19.StylePriority.UseFont = false; - this.xrLabel19.Text = "Ihre Bewilligung vom [AccountingStartDate!dd.MM.yyyy], Ihr Zeichen [CustomerRefer" + - "enceNumber]"; + this.xrLabel19.Text = "Ihr Zeichen [CustomerReferenceNumber]"; this.xrLabel19.WordWrap = false; // // xrLabel18 // this.xrLabel18.BackColor = System.Drawing.Color.Transparent; this.xrLabel18.CanShrink = true; - this.xrLabel18.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Bold); - this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(0F, 223.7917F); + this.xrLabel18.Font = new DevExpress.Drawing.DXFont("Calibri", 12F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 249.625F); this.xrLabel18.Name = "xrLabel18"; this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel18.SizeF = new System.Drawing.SizeF(677.9999F, 17F); @@ -306,8 +293,8 @@ namespace BzhEssenGGmbH // this.xrLabel17.BackColor = System.Drawing.Color.Transparent; this.xrLabel17.CanShrink = true; - this.xrLabel17.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Bold); - this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 206.7917F); + this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Calibri", 12F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 232.625F); this.xrLabel17.Name = "xrLabel17"; this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel17.SizeF = new System.Drawing.SizeF(677.9999F, 17F); @@ -321,8 +308,8 @@ namespace BzhEssenGGmbH // this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate", "{0:dd.MM.yyyy}")}); - this.xrLabel8.Font = new System.Drawing.Font("Calibri", 12F); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(394.9999F, 166F); + this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Calibri", 12F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(394.9999F, 194.0001F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel8.SizeF = new System.Drawing.SizeF(283F, 23F); @@ -333,30 +320,35 @@ namespace BzhEssenGGmbH // // xrLabel13 // - this.xrLabel13.Font = new System.Drawing.Font("Calibri", 11F); - this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(449.6666F, 22.99999F); + this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Calibri", 10F); + this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(420.4998F, 34.00002F); 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(228.3334F, 95.91666F); + this.xrLabel13.SizeF = new System.Drawing.SizeF(257.5001F, 95.91666F); this.xrLabel13.StylePriority.UseFont = false; + this.xrLabel13.StylePriority.UseTextAlignment = false; this.xrLabel13.Text = "Kerckhoffstr. 127\r\n45144 Essen\r\nTel: 0201 / 760 02-25\r\nFax: 0201 / 760 02-23\r\nE-M" + - "ail: iris.kuettner@bzh-essen.de"; + "ail: ina-maria.osmanovic@bzh-essen.de"; + this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; // // xrLabel7 // - this.xrLabel7.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold); - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(449.6666F, 0F); + this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(420.4998F, 0F); + this.xrLabel7.Multiline = true; this.xrLabel7.Name = "xrLabel7"; this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(228.3334F, 23F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(257.5002F, 34.00002F); this.xrLabel7.StylePriority.UseFont = false; - this.xrLabel7.Text = "Ambulant Betreutes Wohnen"; + this.xrLabel7.StylePriority.UseTextAlignment = false; + this.xrLabel7.Text = "Ambulant Betreutes Wohnen\r\nJugend- und Familienhilfe"; + this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; // // RecipientPostCodeAndTown // this.RecipientPostCodeAndTown.CanShrink = true; - this.RecipientPostCodeAndTown.Font = new System.Drawing.Font("Calibri", 11F); + this.RecipientPostCodeAndTown.Font = new DevExpress.Drawing.DXFont("Calibri", 11.5F); this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0F, 68.00003F); this.RecipientPostCodeAndTown.Name = "RecipientPostCodeAndTown"; this.RecipientPostCodeAndTown.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -368,7 +360,7 @@ namespace BzhEssenGGmbH // xrLabel_RecipientStreet // this.xrLabel_RecipientStreet.CanShrink = true; - this.xrLabel_RecipientStreet.Font = new System.Drawing.Font("Calibri", 11F); + this.xrLabel_RecipientStreet.Font = new DevExpress.Drawing.DXFont("Calibri", 11.5F); this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0F, 51.00002F); this.xrLabel_RecipientStreet.Name = "xrLabel_RecipientStreet"; this.xrLabel_RecipientStreet.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -380,8 +372,8 @@ namespace BzhEssenGGmbH // xrLabel_RecipientDivision // this.xrLabel_RecipientDivision.CanShrink = true; - this.xrLabel_RecipientDivision.Font = new System.Drawing.Font("Calibri", 11F); - this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 34.00002F); + this.xrLabel_RecipientDivision.Font = new DevExpress.Drawing.DXFont("Calibri", 11.5F); + this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 17.00001F); this.xrLabel_RecipientDivision.Name = "xrLabel_RecipientDivision"; this.xrLabel_RecipientDivision.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel_RecipientDivision.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; @@ -392,8 +384,8 @@ namespace BzhEssenGGmbH // xrLabel_RecipientContactPerson // this.xrLabel_RecipientContactPerson.CanShrink = true; - this.xrLabel_RecipientContactPerson.Font = new System.Drawing.Font("Calibri", 11F); - this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0F, 17.00001F); + this.xrLabel_RecipientContactPerson.Font = new DevExpress.Drawing.DXFont("Calibri", 11.5F); + this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0F, 34.00002F); this.xrLabel_RecipientContactPerson.Name = "xrLabel_RecipientContactPerson"; this.xrLabel_RecipientContactPerson.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel_RecipientContactPerson.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; @@ -404,7 +396,7 @@ namespace BzhEssenGGmbH // xrLabel1 // this.xrLabel1.CanShrink = true; - this.xrLabel1.Font = new System.Drawing.Font("Calibri", 11F); + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Calibri", 11.5F); this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrLabel1.Name = "xrLabel1"; this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -415,13 +407,15 @@ namespace BzhEssenGGmbH // // xrLabel14 // - this.xrLabel14.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(449.6666F, 118.9166F); + this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(420.4998F, 129.9166F); this.xrLabel14.Name = "xrLabel14"; this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel14.SizeF = new System.Drawing.SizeF(228.3334F, 23F); + this.xrLabel14.SizeF = new System.Drawing.SizeF(257.5001F, 22.99998F); this.xrLabel14.StylePriority.UseFont = false; + this.xrLabel14.StylePriority.UseTextAlignment = false; this.xrLabel14.Text = "www.bzh-essen.de"; + this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; // // fieldApprovedFLSWithFactor // @@ -444,7 +438,8 @@ namespace BzhEssenGGmbH // this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable4}); - this.Detail1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Detail1.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.Detail1.HeightF = 17F; this.Detail1.Name = "Detail1"; this.Detail1.SortFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] { @@ -476,7 +471,7 @@ namespace BzhEssenGGmbH | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell52.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.DetailDescription")}); - this.xrTableCell52.Font = new System.Drawing.Font("Calibri", 12F); + this.xrTableCell52.Font = new DevExpress.Drawing.DXFont("Calibri", 12F); this.xrTableCell52.Name = "xrTableCell52"; this.xrTableCell52.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell52.StylePriority.UseBorderColor = false; @@ -493,7 +488,7 @@ namespace BzhEssenGGmbH | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell53.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.GrossAmountTotal", "{0:c}")}); - this.xrTableCell53.Font = new System.Drawing.Font("Calibri", 12F); + this.xrTableCell53.Font = new DevExpress.Drawing.DXFont("Calibri", 12F); this.xrTableCell53.Name = "xrTableCell53"; this.xrTableCell53.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell53.StylePriority.UseBorderColor = false; @@ -504,27 +499,123 @@ namespace BzhEssenGGmbH this.xrTableCell53.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell53.Weight = 0.21685899000901443D; // + // GroupHeader2 + // + this.GroupHeader2.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] { + new DevExpress.XtraReports.UI.GroupField("RateFactor", DevExpress.XtraReports.UI.XRColumnSortOrder.Descending)}); + this.GroupHeader2.HeightF = 0F; + this.GroupHeader2.Name = "GroupHeader2"; + // + // Zwischensumme + // + this.Zwischensumme.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable6}); + this.Zwischensumme.HeightF = 29F; + this.Zwischensumme.Name = "Zwischensumme"; + this.Zwischensumme.Visible = false; + // + // xrTable6 + // + this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable6.Name = "xrTable6"; + this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow12, + this.xrTableRow10}); + this.xrTable6.SizeF = new System.Drawing.SizeF(678F, 29F); + this.xrTable6.StylePriority.UseFont = false; + // + // xrTableRow12 + // + this.xrTableRow12.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell9, + this.xrTableCell10}); + this.xrTableRow12.Name = "xrTableRow12"; + this.xrTableRow12.Weight = 0.40476190476190466D; + // + // xrTableCell9 + // + this.xrTableCell9.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Calibri", 12F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell9.StylePriority.UseBorderColor = false; + this.xrTableCell9.StylePriority.UseBorders = false; + this.xrTableCell9.StylePriority.UseFont = false; + this.xrTableCell9.StylePriority.UsePadding = false; + this.xrTableCell9.Text = "Zwischensumme [ItemDescription]:"; + this.xrTableCell9.Weight = 2.3494231616825862D; + // + // xrTableCell10 + // + this.xrTableCell10.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.GrossAmountTotal")}); + this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Calibri", 12F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTableCell10.Name = "xrTableCell10"; + this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell10.StylePriority.UseBorderColor = false; + this.xrTableCell10.StylePriority.UseBorders = false; + this.xrTableCell10.StylePriority.UseFont = false; + this.xrTableCell10.StylePriority.UsePadding = false; + this.xrTableCell10.StylePriority.UseTextAlignment = false; + xrSummary1.FormatString = "{0:c}"; + xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell10.Summary = xrSummary1; + this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell10.Weight = 0.650576838317414D; + // + // xrTableRow10 + // + this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell7}); + this.xrTableRow10.Name = "xrTableRow10"; + this.xrTableRow10.Weight = 0.28571428571428564D; + // + // xrTableCell7 + // + this.xrTableCell7.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Calibri", 12F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell7.StylePriority.UseBorderColor = false; + this.xrTableCell7.StylePriority.UseBorders = false; + this.xrTableCell7.StylePriority.UseFont = false; + this.xrTableCell7.StylePriority.UsePadding = false; + this.xrTableCell7.Weight = 3D; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); + // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabel15, this.xrTable5}); - this.GroupFooter1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.GroupFooter1.HeightF = 187.2083F; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; // // xrLabel15 // - this.xrLabel15.Font = new System.Drawing.Font("Calibri", 12F); + this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Calibri", 12F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 138.5834F); this.xrLabel15.Multiline = true; this.xrLabel15.Name = "xrLabel15"; this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel15.SizeF = new System.Drawing.SizeF(678F, 48.62493F); this.xrLabel15.StylePriority.UseFont = false; - this.xrLabel15.Text = "Wir bitten Sie, die Zahlung des Differenzbetrages in Höhe von [Claim!0.00] € auf " + - "unser u.g. Konto zu veranlassen."; + this.xrLabel15.Text = "Wir bitten Sie, die Differenz in Höhe von [Claim!0.00] € zu verrechnen."; // // xrTable5 // @@ -571,7 +662,7 @@ namespace BzhEssenGGmbH // xrTableCell49 // this.xrTableCell49.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell49.Font = new System.Drawing.Font("Calibri", 12F); + this.xrTableCell49.Font = new DevExpress.Drawing.DXFont("Calibri", 12F); this.xrTableCell49.Name = "xrTableCell49"; this.xrTableCell49.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell49.StylePriority.UseBorders = false; @@ -586,7 +677,7 @@ namespace BzhEssenGGmbH | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell50.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountBillableTotal", "{0:c}")}); - this.xrTableCell50.Font = new System.Drawing.Font("Calibri", 12F); + this.xrTableCell50.Font = new DevExpress.Drawing.DXFont("Calibri", 12F); this.xrTableCell50.Name = "xrTableCell50"; this.xrTableCell50.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell50.StylePriority.UseBorders = false; @@ -624,7 +715,7 @@ namespace BzhEssenGGmbH // this.xrTableCell54.BorderColor = System.Drawing.SystemColors.ControlLight; this.xrTableCell54.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell54.Font = new System.Drawing.Font("Calibri", 12F); + this.xrTableCell54.Font = new DevExpress.Drawing.DXFont("Calibri", 12F); this.xrTableCell54.Name = "xrTableCell54"; this.xrTableCell54.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell54.StylePriority.UseBorderColor = false; @@ -640,7 +731,7 @@ namespace BzhEssenGGmbH | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell55.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountAdvancedPayments", "{0:c}")}); - this.xrTableCell55.Font = new System.Drawing.Font("Calibri", 12F); + this.xrTableCell55.Font = new DevExpress.Drawing.DXFont("Calibri", 12F); this.xrTableCell55.Name = "xrTableCell55"; this.xrTableCell55.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell55.StylePriority.UseBorderColor = false; @@ -662,7 +753,7 @@ namespace BzhEssenGGmbH // xrTableCell56 // this.xrTableCell56.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell56.Font = new System.Drawing.Font("Calibri", 12F); + this.xrTableCell56.Font = new DevExpress.Drawing.DXFont("Calibri", 12F); this.xrTableCell56.Name = "xrTableCell56"; this.xrTableCell56.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell56.StylePriority.UseBorders = false; @@ -677,7 +768,7 @@ namespace BzhEssenGGmbH | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell57.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Eigenbeteiligung", "{0:c}")}); - this.xrTableCell57.Font = new System.Drawing.Font("Calibri", 12F); + this.xrTableCell57.Font = new DevExpress.Drawing.DXFont("Calibri", 12F); this.xrTableCell57.Name = "xrTableCell57"; this.xrTableCell57.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell57.StylePriority.UseBorders = false; @@ -716,11 +807,13 @@ namespace BzhEssenGGmbH // // xrTableCell59 // + this.xrTableCell59.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(153))))); this.xrTableCell59.BorderColor = System.Drawing.SystemColors.ControlLight; this.xrTableCell59.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell59.Font = new System.Drawing.Font("Calibri", 12F); + this.xrTableCell59.Font = new DevExpress.Drawing.DXFont("Calibri", 12F); this.xrTableCell59.Name = "xrTableCell59"; this.xrTableCell59.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell59.StylePriority.UseBackColor = false; this.xrTableCell59.StylePriority.UseBorderColor = false; this.xrTableCell59.StylePriority.UseBorders = false; this.xrTableCell59.StylePriority.UseFont = false; @@ -729,13 +822,15 @@ namespace BzhEssenGGmbH // // xrTableCell60 // + this.xrTableCell60.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(153))))); this.xrTableCell60.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | 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("Calibri", 12F, System.Drawing.FontStyle.Bold); + this.xrTableCell60.Font = new DevExpress.Drawing.DXFont("Calibri", 12F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell60.Name = "xrTableCell60"; this.xrTableCell60.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell60.StylePriority.UseBackColor = false; this.xrTableCell60.StylePriority.UseBorderColor = false; this.xrTableCell60.StylePriority.UseBorders = false; this.xrTableCell60.StylePriority.UseFont = false; @@ -744,98 +839,17 @@ namespace BzhEssenGGmbH this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell60.Weight = 0.21685899000901443D; // - // GroupHeader2 + // xrLabel2 // - this.GroupHeader2.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] { - new DevExpress.XtraReports.UI.GroupField("RateFactor", DevExpress.XtraReports.UI.XRColumnSortOrder.Descending)}); - this.GroupHeader2.HeightF = 0F; - this.GroupHeader2.Name = "GroupHeader2"; - // - // Zwischensumme - // - this.Zwischensumme.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrTable6}); - this.Zwischensumme.HeightF = 29F; - this.Zwischensumme.Name = "Zwischensumme"; - this.Zwischensumme.Visible = false; - // - // xrTable6 - // - this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrTable6.Name = "xrTable6"; - this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow12, - this.xrTableRow10}); - this.xrTable6.SizeF = new System.Drawing.SizeF(678F, 29F); - this.xrTable6.StylePriority.UseFont = false; - // - // xrTableRow12 - // - this.xrTableRow12.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell9, - this.xrTableCell10}); - this.xrTableRow12.Name = "xrTableRow12"; - this.xrTableRow12.Weight = 0.40476190476190466D; - // - // xrTableCell9 - // - this.xrTableCell9.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell9.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell9.Name = "xrTableCell9"; - this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell9.StylePriority.UseBorderColor = false; - this.xrTableCell9.StylePriority.UseBorders = false; - this.xrTableCell9.StylePriority.UseFont = false; - this.xrTableCell9.StylePriority.UsePadding = false; - this.xrTableCell9.Text = "Zwischensumme [ItemDescription]:"; - this.xrTableCell9.Weight = 2.3494231616825862D; - // - // xrTableCell10 - // - this.xrTableCell10.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.GrossAmountTotal")}); - this.xrTableCell10.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell10.Name = "xrTableCell10"; - this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell10.StylePriority.UseBorderColor = false; - this.xrTableCell10.StylePriority.UseBorders = false; - this.xrTableCell10.StylePriority.UseFont = false; - this.xrTableCell10.StylePriority.UsePadding = false; - this.xrTableCell10.StylePriority.UseTextAlignment = false; - xrSummary1.FormatString = "{0:c}"; - xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell10.Summary = xrSummary1; - this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell10.Weight = 0.650576838317414D; - // - // xrTableRow10 - // - this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell7}); - this.xrTableRow10.Name = "xrTableRow10"; - this.xrTableRow10.Weight = 0.28571428571428564D; - // - // xrTableCell7 - // - this.xrTableCell7.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell7.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell7.Name = "xrTableCell7"; - this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell7.StylePriority.UseBorderColor = false; - this.xrTableCell7.StylePriority.UseBorders = false; - this.xrTableCell7.StylePriority.UseFont = false; - this.xrTableCell7.StylePriority.UsePadding = false; - this.xrTableCell7.Weight = 3D; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Calibri", 12F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 127.5833F); + this.xrLabel2.Name = "xrLabel2"; + this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(186.4583F, 17F); + this.xrLabel2.StylePriority.UseFont = false; + this.xrLabel2.StylePriority.UseTextAlignment = false; + this.xrLabel2.Text = "(Verwaltung)"; + this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; // // Spitzabrechnung // @@ -854,16 +868,16 @@ namespace BzhEssenGGmbH this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new System.Drawing.Printing.Margins(75, 74, 26, 100); + this.Margins = new DevExpress.Drawing.DXMargins(75F, 74F, 26.04167F, 100F); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; - this.Version = "17.1"; + this.Version = "23.2"; ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -874,7 +888,7 @@ namespace BzhEssenGGmbH private System.Windows.Forms.BindingSource bindingSource1; private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; private DevExpress.XtraReports.UI.XRLabel xrLabel6; - private DevExpress.XtraReports.UI.XRLabel xrLabel5; + private DevExpress.XtraReports.UI.XRLabel lblAnrede; private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; private DevExpress.XtraReports.UI.XRLabel xrLabel12; private DevExpress.XtraReports.UI.XRLabel xrLabel10; @@ -922,7 +936,6 @@ namespace BzhEssenGGmbH private DevExpress.XtraReports.UI.XRLabel xrLabel8; private DevExpress.XtraReports.UI.XRLabel xrLabel15; private DevExpress.XtraReports.UI.XRLabel xrLabel16; - private DevExpress.XtraReports.UI.XRLabel xrLabel11; private DevExpress.XtraReports.UI.XRLabel xrLabel17; private DevExpress.XtraReports.UI.XRLabel xrLabel18; private DevExpress.XtraReports.UI.XRLabel xrLabel20; @@ -935,5 +948,6 @@ namespace BzhEssenGGmbH private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; private DevExpress.XtraReports.UI.XRTableRow xrTableRow10; private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; + private DevExpress.XtraReports.UI.XRLabel xrLabel2; } } diff --git a/ReportImp/BzhEssenGGmbH/SettlementReport2.cs b/ReportImp/BzhEssenGGmbH/SettlementReport2.cs index f6083b25b..66eb8a4a5 100644 --- a/ReportImp/BzhEssenGGmbH/SettlementReport2.cs +++ b/ReportImp/BzhEssenGGmbH/SettlementReport2.cs @@ -7,6 +7,9 @@ using BeWo.Report.ReportObjects; using BeWo.Report; using BS.Shared.Extensions; using System.Text.RegularExpressions; +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BS.Shared; namespace BzhEssenGGmbH { @@ -46,8 +49,33 @@ namespace BzhEssenGGmbH } } pRO.RateFactor = (double)rateFactor; + SetzeAnrede(pRO); this.bindingSource1.DataSource = pRO; } + + private void SetzeAnrede(Settlement2RO pRo) + { + if (pRo.InvoiceBaseOid.HasValue) + { + var ib = DAOFactory.GenericDAO.LoadByID(pRo.InvoiceBaseOid.Value); + if (ib.CostBearer2SupportConcept != null) + { + var cb2sc = ib.CostBearer2SupportConcept; + if (!String.IsNullOrEmpty(pRo.RecipientContactPerson)) + { + if (cb2sc.CostBearerContactPerson != null && cb2sc.CostBearerContactPerson.Sex.HasValue) + { + string anrede = "Sehr geehrte Frau"; + + if (cb2sc.CostBearerContactPerson.Sex.Value == Sex.Male) + anrede = "Sehr geehrter Herr"; + + lblAnrede.Text = String.Format("{0} {1},", anrede, cb2sc.CostBearerContactPerson.LastName); + } + } + } + } + } } } diff --git a/ReportImp/BzhEssenGGmbH/SettlementReport2.resx b/ReportImp/BzhEssenGGmbH/SettlementReport2.resx index cc98ff90f..04f635cc5 100644 --- a/ReportImp/BzhEssenGGmbH/SettlementReport2.resx +++ b/ReportImp/BzhEssenGGmbH/SettlementReport2.resx @@ -118,9 +118,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ewBcAHIAdABmADEAXABhAG4AcwBpAGMAcABnADEAMgA1ADIADQAKAHsADQAKAFwAZgBvAG4AdAB0AGIAbAANAAoAewBcAGYAMAAgAFQAaQBtAGUAcwAgAE4AZQB3ACAAUgBvAG0AYQBuADsAfQANAAoAewBcAGYAMQAgAEMAYQBsAGkAYgByAGkAOwB9AA0ACgB9AA0ACgB7AA0ACgBcAGMAbwBsAG8AcgB0AGIAbAANAAoAOwANAAoAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADAAOwANAAoAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ADsADQAKAH0ADQAKAFwAbgBvAHUAaQBjAG8AbQBwAGEAdABcAHMAcABsAHkAdAB3AG4AaQBuAGUAXABoAHQAbQBhAHUAdABzAHAAewBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADEAXABmAHMAMQA2AFwAYwBmADEAIABiAHoAaAAgAC0AIABFAHMAcwBlAG4AIABnAGUAbQBlAGkAbgBuAFwAdQAyADUAMgBcACcAZgBjAHQAegBpAGcAZQAgAEcAbQBiAEgAIAB9AHsAXABmADEAXABmAHMAMQA2AFwAYwBmADAAIABcAHUAOQA2ADcAOQBcACcAMwBmACAAfQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMQBcAGYAcwAxADYAXABjAGYAMAAgAEsAZQByAGMAawBoAG8AZgBmAHMAdAByAC4AIAAxADIANwAgAH0AewBcAGYAMQBcAGYAcwAxADYAXABjAGYAMAAgAFwAdQA5ADYANwA5AFwAJwAzAGYAIAB9AHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAxAFwAZgBzADEANgBcAGMAZgAwACAANAA1ADEANAA0ACAARQBzAHMAZQBuAH0AXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgB9AA0ACgB9AA0ACgA= + ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMgA1ADUAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAwACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAKgBcAGQAZQBmAHAAYQBwACAAXAB3AGkAZABjAHQAbABwAGEAcgB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAMQBcAGYAcwAyADQAIABOAG8AcgBtAGEAbAA7AH0AewBcACoAXABjAHMAMQBcAGYAMQBcAGYAcwAyADQAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0ACAATABpAG4AZQAgAE4AdQBtAGIAZQByADsAfQB7AFwAKgBcAGMAcwAzAFwAZgAxAFwAZgBzADIANABcAHUAbABcAGMAZgAxACAASAB5AHAAZQByAGwAaQBuAGsAOwB9AHsAXAAqAFwAdABzADQAXAB0AHMAcgBvAHcAZABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAdAAzAFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABOAG8AcgBtAGEAbAAgAFQAYQBiAGwAZQA7AH0AewBcACoAXAB0AHMANQBcAHQAcwByAG8AdwBkAFwAcwBiAGEAcwBlAGQAbwBuADQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdAByAGIAcgBkAHIAdABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBsAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAcgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBoAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHYAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAFQAYQBiAGwAZQAgAFMAaQBtAHAAbABlACAAMQA7AH0AfQB7AFwAKgBcAGwAaQBzAHQAbwB2AGUAcgByAGkAZABlAHQAYQBiAGwAZQB9AFwAbgBvAHUAaQBjAG8AbQBwAGEAdABcAGgAdABtAGEAdQB0AHMAcABcAHMAcABsAHkAdAB3AG4AaQBuAGUAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADIAXABmAHMAMQA0AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGkAXABjAGYAMgAgAGIAegBoACAALQAgAEUAcwBzAGUAbgAgAGcAZQBtAGUAaQBuAG4AXAB1ADIANQAyAFwAJwBmAGMAdAB6AGkAZwBlACAARwBtAGIASAAgAH0AewBcAGYAMgBcAGYAcwAxADQAXABpAFwAYwBmADAAIABcAHUAOQA2ADcAOQBcACcAMwBmACAAfQB7AFwAZgAyAFwAZgBzADEANABcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABpAFwAYwBmADAAIABLAGUAcgBjAGsAaABvAGYAZgBzAHQAcgAuACAAMQAyADcAIAB9AHsAXABmADIAXABmAHMAMQA0AFwAaQBcAGMAZgAwACAAXAB1ADkANgA3ADkAXAAnADMAZgAgAH0AewBcAGYAMgBcAGYAcwAxADQAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAaQBcAGMAZgAwACAANAA1ADEANAA0ACAARQBzAHMAZQBuAH0AXABmADIAXABmAHMAMQA0AFwAaQBcAGMAZgAyAFwAcABhAHIAfQA= - - 17, 17 - \ No newline at end of file diff --git a/ReportImp/LebenshilfeStade/Invoicing/CustomInvoiceCreation.cs b/ReportImp/LebenshilfeStade/Invoicing/CustomInvoiceCreation.cs index 4d07fec47..b9f5fe4e2 100644 --- a/ReportImp/LebenshilfeStade/Invoicing/CustomInvoiceCreation.cs +++ b/ReportImp/LebenshilfeStade/Invoicing/CustomInvoiceCreation.cs @@ -29,10 +29,11 @@ namespace LebenshilfeStade.Invoicing var minutesPerServiceUnit = crp.FirstOrDefault(c => c.CostRateType == BS.Shared.CostRatePeriodType.MinutesPerServiceUnit); var minsProFLS = minutesPerServiceUnit != null ? minutesPerServiceUnit.CostRateValue : 60; - //invoiceItem.UnitCount = invoiceItem.UnitCount * 60 / minsProFLS; - invoiceItem.GrossAmountTotal = invoiceItem.GrossAmountTotal * 60 / minsProFLS; - invoiceItem.AmountTotal = invoiceItem.AmountTotal * 60 / minsProFLS; - } + // der Kostenträger braucht die Zwischenrundung auf 2 Nachkommastellen + invoiceItem.UnitCount = (decimal)Math.Round((double)(invoiceItem.UnitCount * 60 / minsProFLS), 2, MidpointRounding.AwayFromZero); + invoiceItem.GrossAmountTotal = invoiceItem.AmountPerUnit * invoiceItem.UnitCount; + invoiceItem.AmountTotal = invoiceItem.AmountPerUnit * invoiceItem.UnitCount; + } return invoiceItem; } @@ -76,54 +77,56 @@ namespace LebenshilfeStade.Invoicing { // Rausfinden, ob FLS 50 statt 60 Minuten gehen // - var oid = newlist.FirstOrDefault(i => i.SupportConceptApprovalPeriodOid != null).SupportConceptApprovalPeriodOid; - SupportConceptApprovalPeriod ap = null; - if (oid != null) - ap = DAOFactory.GenericDAO.GetByID(oid.Value); + if (newlist != null && newlist.Count > 0) + { + var oid = newlist.FirstOrDefault(i => i.SupportConceptApprovalPeriodOid != null).SupportConceptApprovalPeriodOid; + SupportConceptApprovalPeriod ap = null; + if (oid != null) + ap = DAOFactory.GenericDAO.GetByID(oid.Value); - List crp = null; - if (ap != null) - crp = ap.CostBearer2SupportConcept.CostBearer.CostRatePeriods.ToList(); + List crp = null; + if (ap != null) + crp = ap.CostBearer2SupportConcept.CostBearer.CostRatePeriods.ToList(); - if (crp != null && crp.Count > 0) - { - var minutesPerServiceUnit = crp.FirstOrDefault(c => c.CostRateType == BS.Shared.CostRatePeriodType.MinutesPerServiceUnit); - var minsProFLS = minutesPerServiceUnit != null ? minutesPerServiceUnit.CostRateValue : 60; - - foreach (InvoiceItem invoiceItem in newlist) + if (crp != null && crp.Count > 0) { - if (!invoiceItem.AmountPerUnit.HasValue) + var minutesPerServiceUnit = crp.FirstOrDefault(c => c.CostRateType == BS.Shared.CostRatePeriodType.MinutesPerServiceUnit); + var minsProFLS = minutesPerServiceUnit != null ? minutesPerServiceUnit.CostRateValue : 60; + + foreach (InvoiceItem invoiceItem in newlist) { - invoiceItem.AmountPerUnit = 0; - } - invoiceItem.AmountPerUnit = Math.Round(invoiceItem.AmountPerUnit.Value, 2, MidpointRounding.AwayFromZero); + if (!invoiceItem.AmountPerUnit.HasValue) + { + invoiceItem.AmountPerUnit = 0; + } + invoiceItem.AmountPerUnit = Math.Round(invoiceItem.AmountPerUnit.Value, 2, MidpointRounding.AwayFromZero); - if (!invoiceItem.UnitCount.HasValue) - { - invoiceItem.UnitCount = 0; - } + if (!invoiceItem.UnitCount.HasValue) + { + invoiceItem.UnitCount = 0; + } - if (addRateFactorToUnitCount && invoiceItem.RateFactor.HasValue) - { - invoiceItem.UnitCount = (invoiceItem.UnitCount ?? 0) * ((invoiceItem.RateFactor + 100) / 100); - } + if (addRateFactorToUnitCount && invoiceItem.RateFactor.HasValue) + { + invoiceItem.UnitCount = (invoiceItem.UnitCount ?? 0) * ((invoiceItem.RateFactor + 100) / 100); + } - invoiceItem.UnitCount = Math.Round(invoiceItem.UnitCount.Value, 2, MidpointRounding.AwayFromZero); + invoiceItem.UnitCount = Math.Round(invoiceItem.UnitCount.Value, 2, MidpointRounding.AwayFromZero); - // Änderung: Eine FLS hat 50 statt 60 Minuten - invoiceItem.AmountTotal = invoiceItem.AmountPerUnit * (invoiceItem.UnitCount * 60 / minsProFLS); - invoiceItem.AmountTotal = Math.Round(invoiceItem.AmountTotal.Value, 2, MidpointRounding.AwayFromZero); + // Änderung: Eine FLS hat 50 statt 60 Minuten + invoiceItem.AmountTotal = invoiceItem.AmountPerUnit * (invoiceItem.UnitCount * 60 / minsProFLS); + invoiceItem.AmountTotal = Math.Round(invoiceItem.AmountTotal.Value, 2, MidpointRounding.AwayFromZero); - invoiceItem.GrossAmountTotal = invoiceItem.AmountTotal; + invoiceItem.GrossAmountTotal = invoiceItem.AmountTotal; - if (!addRateFactorToUnitCount && invoiceItem.RateFactor.HasValue) - { - invoiceItem.GrossAmountTotal *= (invoiceItem.RateFactor + 100) / 100; + if (!addRateFactorToUnitCount && invoiceItem.RateFactor.HasValue) + { + invoiceItem.GrossAmountTotal *= (invoiceItem.RateFactor + 100) / 100; + } } } - } } diff --git a/ReportImp/PraxisPusteblume/IfsSammelRechnung.cs b/ReportImp/PraxisPusteblume/IfsSammelRechnung.cs index d738be9e2..aa844ed41 100644 --- a/ReportImp/PraxisPusteblume/IfsSammelRechnung.cs +++ b/ReportImp/PraxisPusteblume/IfsSammelRechnung.cs @@ -280,6 +280,10 @@ namespace PraxisPusteblume preisTeam = 12.81m; preisGruppe = 38.35m; } + if (pRO.AccountingPeriodStart >= new DateTime(2024, 04, 1)) + { + preisTeam = 13.27m; + } if (DateTime.Now >= new DateTime(2021, 8, 17)) { preisInvest = 6.86m; diff --git a/ReportImp/PraxisPusteblume/Invoicing/IFSSammelInvoiceCreation.cs b/ReportImp/PraxisPusteblume/Invoicing/IFSSammelInvoiceCreation.cs index c117bd7bb..20bf3c174 100644 --- a/ReportImp/PraxisPusteblume/Invoicing/IFSSammelInvoiceCreation.cs +++ b/ReportImp/PraxisPusteblume/Invoicing/IFSSammelInvoiceCreation.cs @@ -171,6 +171,10 @@ namespace PraxisPusteblume.Invoicing { betrag = 12.81m; } + if (invoicePeriod.StartDateTime >= new DateTime(2024, 03, 31)) + { + betrag = 13.27m; + } var invoiceItem = new InvoiceItem(); invoiceItem.AmountPerUnit = betrag; diff --git a/ReportImp/SKMAachen/Invoicing/CustomInvoiceNumberGenerator.cs b/ReportImp/SKMAachen/Invoicing/CustomInvoiceNumberGenerator.cs new file mode 100644 index 000000000..4bff9a5d4 --- /dev/null +++ b/ReportImp/SKMAachen/Invoicing/CustomInvoiceNumberGenerator.cs @@ -0,0 +1,57 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics.Eventing.Reader; +using System.Linq; +using System.Text; +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BeWo.Service.DCEntityMapper; +using BeWo.Service.Invoicing; +using BeWo.Service.Plugins; +using BS.Shared; +using BS.Shared.Core; +using BS.Shared.DataContracts; +using BS.Shared.Services; + +namespace SKMAachen.Invoicing +{ + internal class CustomInvoiceNumberGenerator : InvoiceNumberGenerator + { + public override string GetNextInvoiceNumber(int increment, InvoiceBase invoiceBase) + { + string next = base.GetNextInvoiceNumber(increment, invoiceBase); + String maAbb = ""; + Customer c = null; + + if (invoiceBase.Type == InvoiceType.General && invoiceBase.RecipientCustomerOid.HasValue + || invoiceBase.Type == InvoiceType.CustomerEquity && invoiceBase.RecipientCustomerOid.HasValue) + { + c = DAOFactory.GenericDAO.LoadByID(invoiceBase.RecipientCustomerOid.Value); + } + else if (invoiceBase.CostBearer2SupportConcept != null) + { + c = invoiceBase.CostBearer2SupportConcept.SupportConcept.Customer; + } + if (c != null) + { + var hauptbetreuer = c.Employee2CustomerList.FirstOrDefault( + e2c => e2c.ValueList.Any(ve => ve.Entry.SystemEntryID.HasValue + && ve.Entry.SystemEntryID.Value == SystemEntryID.EmployeeRoleMainAttendant)); + if (hauptbetreuer != null) + { + if (hauptbetreuer.Employee.Person.Abbreviation != null) + { + maAbb = hauptbetreuer.Employee.Person.Abbreviation; + } + else + { + maAbb = String.Format("{0}{1}", hauptbetreuer.Employee.Person.LastName, hauptbetreuer.Employee.Person.FirstName); + } + } + next = next.Replace("{MA}", maAbb); + } + + return next; + } + } +} diff --git a/ReportImp/SKMAachen/RechnungBeWo67.cs b/ReportImp/SKMAachen/RechnungBeWo67.cs index e26b2d941..5fff424ff 100644 --- a/ReportImp/SKMAachen/RechnungBeWo67.cs +++ b/ReportImp/SKMAachen/RechnungBeWo67.cs @@ -1,64 +1,64 @@ -using System; -using BeWo.Data.Access; -using BeWo.Data.Entities; -using BeWo.Report; -using BeWo.Report.ReportObjects; -using BS.Shared.Core; -using DevExpress.XtraReports.UI; - -namespace SKMAachen -{ - [IDSpecificClass(Identifier = "BeWo67")] - public partial class RechnungBeWo67 : XtraReport, IBeWoReport - { - public RechnungBeWo67() - { - this.InitializeComponent(); - } - - public void SetReportDataSource(ServiceInvoiceRO pRO) - { - decimal hourlyRate = 0; - decimal hours = 0; - if (pRO.ServiceInvoicePeriods != null && pRO.ServiceInvoicePeriods.Count > 0) - { - foreach (var p in pRO.ServiceInvoicePeriods) - { - - if (p.ServiceInvoiceItems != null && p.ServiceInvoiceItems.Count > 0) - { - - foreach (var i in p.ServiceInvoiceItems) - { - if (i.HourlyRate.HasValue) - { - hourlyRate = i.HourlyRate.Value; - - if (!String.IsNullOrEmpty(i.RateFactor)) - { - var rfStr = i.RateFactor.Replace("%", "").Replace(",00", "").Trim(); - int rfInt = 0; - Int32.TryParse(rfStr, out rfInt); - } - } - +using System; +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BeWo.Report; +using BeWo.Report.ReportObjects; +using BS.Shared.Core; +using DevExpress.XtraReports.UI; + +namespace SKMAachen +{ + [IDSpecificClass(Identifier = "BeWo67")] + public partial class RechnungBeWo67 : XtraReport, IBeWoReport + { + public RechnungBeWo67() + { + this.InitializeComponent(); + } + + public void SetReportDataSource(ServiceInvoiceRO pRO) + { + decimal hourlyRate = 0; + decimal hours = 0; + if (pRO.ServiceInvoicePeriods != null && pRO.ServiceInvoicePeriods.Count > 0) + { + foreach (var p in pRO.ServiceInvoicePeriods) + { + + if (p.ServiceInvoiceItems != null && p.ServiceInvoiceItems.Count > 0) + { + + foreach (var i in p.ServiceInvoiceItems) + { + if (i.HourlyRate.HasValue) + { + hourlyRate = i.HourlyRate.Value; + + if (!String.IsNullOrEmpty(i.RateFactor)) + { + var rfStr = i.RateFactor.Replace("%", "").Replace(",00", "").Trim(); + int rfInt = 0; + Int32.TryParse(rfStr, out rfInt); + } + } + if (i.Hours.HasValue) { hours += i.Hours.Value; - } - } - } - } - } - - lblForderung.Text = - String.Format("Hieraus ergibt sich eine Forderung von {0:0.00} Std. x {1:0.00} EUR = {2:0.00} EUR.", hours, hourlyRate, pRO.NetClaim); - - lblAbrechnungszeitraum.Text = - String.Format( - "Im Zeitraum vom {0:dd.MM.yyyy} bis {1:dd.MM.yyyy} wurden {2:0.00} Dienstleistungsstunden unmittelbare Betreuungsleistungen des Ambulant Betreuten Wohnens erbracht.", - pRO.AccountingPeriodStart, pRO.AccountingPeriodEnd, hours); - this.bindingSource1.DataSource = pRO; - } - } + } + } + } + } + } + + lblForderung.Text = + String.Format("Hieraus ergibt sich eine Forderung von {0:0.00} Std. x {1:0.00} EUR = {2:0.00} EUR.", hours, hourlyRate, pRO.NetClaim); + + lblAbrechnungszeitraum.Text = + String.Format( + "Im Zeitraum vom {0:dd.MM.yyyy} bis {1:dd.MM.yyyy} wurden {2:0.00} Dienstleistungsstunden unmittelbare Betreuungsleistungen des Ambulant Betreuten Wohnens erbracht.", + pRO.AccountingPeriodStart, pRO.AccountingPeriodEnd, hours); + this.bindingSource1.DataSource = pRO; + } + } } \ No newline at end of file diff --git a/ReportImp/SKMAachen/SKMAachen.csproj b/ReportImp/SKMAachen/SKMAachen.csproj index 551b2ae80..8b7f2d69d 100644 --- a/ReportImp/SKMAachen/SKMAachen.csproj +++ b/ReportImp/SKMAachen/SKMAachen.csproj @@ -61,6 +61,7 @@ + Component diff --git a/ReportImp/Wabe/Calculation/CustomGroupDurationCalculator.cs b/ReportImp/Wabe/Calculation/CustomGroupDurationCalculator.cs new file mode 100644 index 000000000..1d4f06082 --- /dev/null +++ b/ReportImp/Wabe/Calculation/CustomGroupDurationCalculator.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using BeWo.Service.Plugins; +using BS.Shared.DataContracts; + +namespace Wabe.Calculation +{ + + public class CustomGroupDurationCalculator : GroupDurationCalculator + { + public override GroupDurationDC CalculateGroupDuration(int personCount, int employeeCount, decimal totalDuration) + { + return new GroupDurationDC() + { + SingleDuration = totalDuration / 3, + TotalDuration = totalDuration + }; + } + } +} diff --git a/ReportImp/Wabe/Properties/AssemblyInfo.cs b/ReportImp/Wabe/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..930888dd6 --- /dev/null +++ b/ReportImp/Wabe/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// Allgemeine Informationen über eine Assembly werden über die folgenden +// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, +// die einer Assembly zugeordnet sind. +[assembly: AssemblyTitle("KundeXyz")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("KundeXyz")] +[assembly: AssemblyCopyright("Copyright © 2020")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly +// für COM-Komponenten unsichtbar. Wenn Sie auf einen Typ in dieser Assembly von +// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen. +[assembly: ComVisible(false)] + +// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird +[assembly: Guid("c1fed668-adb9-47e0-b589-1389618e1b6e")] + +// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: +// +// Hauptversion +// Nebenversion +// Buildnummer +// Revision +// +// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, +// indem Sie "*" wie unten gezeigt eingeben: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/ReportImp/Wabe/Wabe.csproj b/ReportImp/Wabe/Wabe.csproj new file mode 100644 index 000000000..eea563853 --- /dev/null +++ b/ReportImp/Wabe/Wabe.csproj @@ -0,0 +1,80 @@ + + + + + Debug + AnyCPU + {DD0ABE1B-6181-40D4-B9B7-51FFFFFD8A52} + Library + Properties + Wabe + 2544632712_Reports + v4.7.2 + 512 + + + + true + full + false + ..\..\CustomerDlls\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + ..\..\CustomerDlls\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE} + Data + + + {40d8b312-ea64-49e3-a31a-5e57ed4d5654} + Report + + + {094331c3-ecee-4c89-bbfd-4c9ded89f0ef} + Service + + + {2f50b83d-a3f0-4ec4-979a-3f9b7e3d8ed4} + Shared + + + + \ No newline at end of file diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index a68ff6101..e459827c8 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -47,7 +47,7 @@ namespace BeWo.Service.Plugins //t = "2301474784"; // Hauskrankenpflege Leiendecker //t = "8243565510"; // Der Karren //t = "7709306800"; // Der Karren SBD - t = "2499262621"; // HPH Bersenbrück + //t = "2499262621"; // HPH Bersenbrück //t = "4950382346"; // Holsinger //t = "5973016645"; // Verein Lebensgestaltung Hanau //t = "7375324044"; // Diakonie KK Kleve @@ -85,7 +85,7 @@ namespace BeWo.Service.Plugins //t = "4867997795"; // ADiK Kleve //t = "3184859776"; // Sergej Becker //t = "7752610643"; // BWK Gbr - t = "3785623125"; // Betreuwo + //t = "3785623125"; // Betreuwo //t = "7130228334"; // LH Borken //t = "4209820830"; // VKM Hamm //t = "5700328131"; // Betreutes Wohnen St. Ludgerus Essen-Werden @@ -385,6 +385,7 @@ namespace BeWo.Service.Plugins //t = "5315865694"; // Wismarer Werkstätten //t = "7113513872"; // Verein für Beratung und Therapie - LOK //t = "1676990640"; // Perspektive - Selbständiges Leben + //t = "2544632712"; // Wabe gGmbH //t = "7077286353"; // PariSozial return t; diff --git a/Service/Plugins/VacationService.cs b/Service/Plugins/VacationService.cs index fdb756758..3f395007d 100644 --- a/Service/Plugins/VacationService.cs +++ b/Service/Plugins/VacationService.cs @@ -261,21 +261,30 @@ namespace BeWo.Service.Plugins list.Add(new FerienDC() { Name = "Winterferien 2024", Start = new DateTime(2024, 2, 1), Ende = new DateTime(2024, 2, 3) }); list.Add(new FerienDC() { Name = "Osterferien 2024", Start = new DateTime(2024, 3, 18), Ende = new DateTime(2024, 3, 29) }); - list.Add(new FerienDC() { Name = "Brückentag 2024", Start = new DateTime(2024, 5, 10), Ende = new DateTime(2024, 5, 11) }); //Brückentag Himmelfahrt - list.Add(new FerienDC() { Name = "Pfingstferien 2024", Start = new DateTime(2024, 5, 21), Ende = new DateTime(2024, 5, 22) }); //Pfingstdienstag + list.Add(new FerienDC() { Name = "Brückentag 2024", Start = new DateTime(2024, 5, 10), Ende = new DateTime(2024, 5, 10) }); //Brückentag Himmelfahrt + list.Add(new FerienDC() { Name = "Pfingstferien 2024", Start = new DateTime(2024, 5, 21), Ende = new DateTime(2024, 5, 21) }); //Pfingstdienstag list.Add(new FerienDC() { Name = "Sommerferien 2024", Start = new DateTime(2024, 6, 24), Ende = new DateTime(2024, 8, 3) }); list.Add(new FerienDC() { Name = "Herbstferien 2024", Start = new DateTime(2024, 10, 4), Ende = new DateTime(2024, 10, 19) }); - list.Add(new FerienDC() { Name = "Brückentag 2024", Start = new DateTime(2024, 11, 1), Ende = new DateTime(2024, 11, 2) }); + list.Add(new FerienDC() { Name = "Brückentag 2024", Start = new DateTime(2024, 11, 1), Ende = new DateTime(2024, 11, 1) }); list.Add(new FerienDC() { Name = "Weihnachtsferien 2024", Start = new DateTime(2024, 12, 23), Ende = new DateTime(2025, 1, 4) }); - list.Add(new FerienDC() { Name = "Winterferien 2025", Start = new DateTime(2025, 2, 3), Ende = new DateTime(2025, 2, 5) }); - list.Add(new FerienDC() { Name = "Osterferien 2025", Start = new DateTime(2025, 4, 7), Ende = new DateTime(2025, 4, 18) }); - list.Add(new FerienDC() { Name = "Brückentag 2025", Start = new DateTime(2025, 4, 30), Ende = new DateTime(2025, 5, 3) }); //Brückentag 1.Mai - list.Add(new FerienDC() { Name = "Brückentag 2025", Start = new DateTime(2025, 5, 30), Ende = new DateTime(2025, 5, 31) }); //Brückentag Himmelfahrt - list.Add(new FerienDC() { Name = "Pfingstferien 2025", Start = new DateTime(2025, 6, 10), Ende = new DateTime(2025, 6, 11) }); //Pfingstdienstag - list.Add(new FerienDC() { Name = "Sommerferien 2025", Start = new DateTime(2025, 7, 3), Ende = new DateTime(2025, 8, 14) }); + list.Add(new FerienDC() { Name = "Winterferien 2025", Start = new DateTime(2025, 2, 3), Ende = new DateTime(2025, 2, 4) }); + list.Add(new FerienDC() { Name = "Osterferien 2025", Start = new DateTime(2025, 4, 7), Ende = new DateTime(2025, 4, 19) }); + list.Add(new FerienDC() { Name = "Brückentag 2025", Start = new DateTime(2025, 4, 30), Ende = new DateTime(2025, 4, 30) }); //Brückentag 1.Mai + list.Add(new FerienDC() { Name = "Brückentag 2025", Start = new DateTime(2025, 5, 2), Ende = new DateTime(2025, 5, 2) }); //Brückentag Himmelfahrt + list.Add(new FerienDC() { Name = "Brückentag 2025", Start = new DateTime(2025, 5, 30), Ende = new DateTime(2025, 5, 30) }); + list.Add(new FerienDC() { Name = "Pfingstferien 2025", Start = new DateTime(2025, 6, 10), Ende = new DateTime(2025, 6, 10) }); //Pfingstdienstag + list.Add(new FerienDC() { Name = "Sommerferien 2025", Start = new DateTime(2025, 7, 3), Ende = new DateTime(2025, 8, 13) }); list.Add(new FerienDC() { Name = "Herbstferien 2025", Start = new DateTime(2025, 10, 13), Ende = new DateTime(2025, 10, 25) }); - list.Add(new FerienDC() { Name = "Weihnachtsferien 2025", Start = new DateTime(2025, 12, 22), Ende = new DateTime(2026, 1, 6) }); + list.Add(new FerienDC() { Name = "Weihnachtsferien 2025", Start = new DateTime(2025, 12, 22), Ende = new DateTime(2026, 1, 5) }); + + list.Add(new FerienDC() { Name = "Winterferien 2026", Start = new DateTime(2026, 2, 2), Ende = new DateTime(2026, 2, 3) }); + list.Add(new FerienDC() { Name = "Osterferien 2026", Start = new DateTime(2026, 3, 23), Ende = new DateTime(2026, 4, 7) }); + list.Add(new FerienDC() { Name = "Brückentag 2026", Start = new DateTime(2026, 5, 15), Ende = new DateTime(2026, 5, 15) }); //Brückentag Himmelfahrt + list.Add(new FerienDC() { Name = "Brückentag 2026", Start = new DateTime(2026, 5, 26), Ende = new DateTime(2026, 5, 26) }); + list.Add(new FerienDC() { Name = "Sommerferien 2026", Start = new DateTime(2026, 7, 2), Ende = new DateTime(2026, 8, 12) }); + list.Add(new FerienDC() { Name = "Herbstferien 2026", Start = new DateTime(2026, 10, 16), Ende = new DateTime(2026, 10, 30) }); + list.Add(new FerienDC() { Name = "Weihnachtsferien 2026", Start = new DateTime(2026, 12, 23), Ende = new DateTime(2027, 1, 9) }); } @@ -297,14 +306,19 @@ namespace BeWo.Service.Plugins list.Add(new FerienDC() { Name = "Weihnachtsferien 2023", Start = new DateTime(2023, 12, 27), Ende = new DateTime(2024, 1, 13) }); list.Add(new FerienDC() { Name = "Osterferien 2024", Start = new DateTime(2024, 3, 25), Ende = new DateTime(2024, 4, 13) }); - list.Add(new FerienDC() { Name = "Sommerferien 2024", Start = new DateTime(2024, 7, 15), Ende = new DateTime(2024, 8, 24) }); - list.Add(new FerienDC() { Name = "Herbstferien 2024", Start = new DateTime(2024, 10, 23), Ende = new DateTime(2024, 10, 28) }); - list.Add(new FerienDC() { Name = "Weihnachtsferien 2024", Start = new DateTime(2024, 12, 23), Ende = new DateTime(2025, 1, 11) }); + list.Add(new FerienDC() { Name = "Sommerferien 2024", Start = new DateTime(2024, 7, 15), Ende = new DateTime(2024, 8, 23) }); + list.Add(new FerienDC() { Name = "Herbstferien 2024", Start = new DateTime(2024, 10, 14), Ende = new DateTime(2024, 10, 25) }); + list.Add(new FerienDC() { Name = "Weihnachtsferien 2024", Start = new DateTime(2024, 12, 23), Ende = new DateTime(2025, 1, 10) }); - list.Add(new FerienDC() { Name = "Osterferien 2025", Start = new DateTime(2025, 4, 7), Ende = new DateTime(2025, 4, 18) }); - list.Add(new FerienDC() { Name = "Sommerferien 2025", Start = new DateTime(2025, 7, 7), Ende = new DateTime(2025, 8, 16) }); + list.Add(new FerienDC() { Name = "Osterferien 2025", Start = new DateTime(2025, 4, 7), Ende = new DateTime(2025, 4, 21) }); + list.Add(new FerienDC() { Name = "Sommerferien 2025", Start = new DateTime(2025, 7, 7), Ende = new DateTime(2025, 8, 15) }); list.Add(new FerienDC() { Name = "Herbstferien 2025", Start = new DateTime(2025, 10, 6), Ende = new DateTime(2025, 10, 18) }); list.Add(new FerienDC() { Name = "Weihnachtsferien 2025", Start = new DateTime(2025, 12, 22), Ende = new DateTime(2026, 1, 10) }); + + list.Add(new FerienDC() { Name = "Osterferien 2026", Start = new DateTime(2026, 3, 30), Ende = new DateTime(2026, 4, 10) }); + list.Add(new FerienDC() { Name = "Sommerferien 2026", Start = new DateTime(2026, 6, 29), Ende = new DateTime(2026, 8, 7) }); + list.Add(new FerienDC() { Name = "Herbstferien 2026", Start = new DateTime(2026, 10, 5), Ende = new DateTime(2026, 10, 17) }); + list.Add(new FerienDC() { Name = "Weihnachtsferien 2026", Start = new DateTime(2026, 12, 23), Ende = new DateTime(2027, 1, 12) }); } return list; }