diff --git a/ReportImp/BeWoSchillingReports/ServiceInvoiceReport.Designer.cs b/ReportImp/BeWoSchillingReports/ServiceInvoiceReport.Designer.cs index 2e7afc524..b3319abe1 100644 --- a/ReportImp/BeWoSchillingReports/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/BeWoSchillingReports/ServiceInvoiceReport.Designer.cs @@ -32,10 +32,26 @@ namespace BeWo.Report.DefaultReports 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.RecipientPostCodeAndTown = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel_RecipientContactPerson = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel_RecipientDivision = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel_RecipientStreet = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrRichText6 = new DevExpress.XtraReports.UI.XRRichText(); + this.xrRichText7 = new DevExpress.XtraReports.UI.XRRichText(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); + this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText(); + this.xrRichText8 = new DevExpress.XtraReports.UI.XRRichText(); + this.xrRichText4 = new DevExpress.XtraReports.UI.XRRichText(); + this.xrRichText5 = new DevExpress.XtraReports.UI.XRRichText(); this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.lblAbrechnungszeitraum = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); @@ -70,26 +86,8 @@ namespace BeWo.Report.DefaultReports this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); - this.RecipientPostCodeAndTown = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel_RecipientContactPerson = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel_RecipientDivision = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel_RecipientStreet = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrRichText6 = new DevExpress.XtraReports.UI.XRRichText(); - this.xrRichText7 = new DevExpress.XtraReports.UI.XRRichText(); - this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); - this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText(); - this.xrRichText8 = new DevExpress.XtraReports.UI.XRRichText(); - this.xrRichText4 = new DevExpress.XtraReports.UI.XRRichText(); - this.xrRichText5 = new DevExpress.XtraReports.UI.XRRichText(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); + this.lblIK = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); @@ -97,6 +95,9 @@ namespace BeWo.Report.DefaultReports ((System.ComponentModel.ISupportInitialize)(this.xrRichText8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText5)).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)).BeginInit(); // @@ -122,6 +123,77 @@ namespace BeWo.Report.DefaultReports this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; // + // RecipientPostCodeAndTown + // + this.RecipientPostCodeAndTown.CanShrink = true; + this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(7.000033F, 172.1667F); + this.RecipientPostCodeAndTown.Name = "RecipientPostCodeAndTown"; + this.RecipientPostCodeAndTown.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.RecipientPostCodeAndTown.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.RecipientPostCodeAndTown.SizeF = new System.Drawing.SizeF(292F, 17F); + this.RecipientPostCodeAndTown.StylePriority.UseFont = false; + this.RecipientPostCodeAndTown.Text = "[RecipientPostCodeAndTown]"; + // + // xrLabel_RecipientContactPerson + // + this.xrLabel_RecipientContactPerson.CanShrink = true; + this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(7.000033F, 121.1668F); + 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; + this.xrLabel_RecipientContactPerson.SizeF = new System.Drawing.SizeF(292F, 17F); + this.xrLabel_RecipientContactPerson.StylePriority.UseFont = false; + this.xrLabel_RecipientContactPerson.Text = "[RecipientContactPerson]"; + // + // xrLabel_RecipientDivision + // + this.xrLabel_RecipientDivision.CanShrink = true; + this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(7.000033F, 138.1668F); + 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; + this.xrLabel_RecipientDivision.SizeF = new System.Drawing.SizeF(292F, 17F); + this.xrLabel_RecipientDivision.StylePriority.UseFont = false; + this.xrLabel_RecipientDivision.Text = "[RecipientDivision]"; + // + // xrLabel_RecipientStreet + // + this.xrLabel_RecipientStreet.CanShrink = true; + this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(7.000033F, 155.1667F); + this.xrLabel_RecipientStreet.Name = "xrLabel_RecipientStreet"; + this.xrLabel_RecipientStreet.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel_RecipientStreet.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrLabel_RecipientStreet.SizeF = new System.Drawing.SizeF(292F, 17F); + this.xrLabel_RecipientStreet.StylePriority.UseFont = false; + this.xrLabel_RecipientStreet.Text = "[RecipientStreet]"; + // + // xrLabel6 + // + this.xrLabel6.CanShrink = true; + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(7.000033F, 104.1668F); + this.xrLabel6.Name = "xrLabel6"; + this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel6.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrLabel6.SizeF = new System.Drawing.SizeF(292F, 17F); + this.xrLabel6.StylePriority.UseFont = false; + this.xrLabel6.Text = "[RecipientOrganisation]"; + // + // xrRichText6 + // + this.xrRichText6.Font = new System.Drawing.Font("Verdana", 10F); + this.xrRichText6.LocationFloat = new DevExpress.Utils.PointFloat(7.000033F, 70.8334F); + this.xrRichText6.Name = "xrRichText6"; + this.xrRichText6.SerializableRtfString = resources.GetString("xrRichText6.SerializableRtfString"); + this.xrRichText6.SizeF = new System.Drawing.SizeF(334.1667F, 20.41666F); + // + // xrRichText7 + // + this.xrRichText7.Font = new System.Drawing.Font("Verdana", 10F); + this.xrRichText7.LocationFloat = new DevExpress.Utils.PointFloat(428.8752F, 70.8334F); + this.xrRichText7.Name = "xrRichText7"; + this.xrRichText7.SerializableRtfString = resources.GetString("xrRichText7.SerializableRtfString"); + this.xrRichText7.SizeF = new System.Drawing.SizeF(221.1248F, 161.0417F); + // // ruleRateFactorNull // this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?"; @@ -144,6 +216,47 @@ namespace BeWo.Report.DefaultReports this.bottomMarginBand1.HeightF = 155.9167F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // + // xrRichText1 + // + this.xrRichText1.Font = new System.Drawing.Font("Times New Roman", 9.75F); + this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 21.91671F); + this.xrRichText1.Name = "xrRichText1"; + this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); + this.xrRichText1.SizeF = new System.Drawing.SizeF(162.0845F, 60F); + // + // xrRichText2 + // + this.xrRichText2.Font = new System.Drawing.Font("Times New Roman", 9.75F); + this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(162.0845F, 21.91671F); + this.xrRichText2.Name = "xrRichText2"; + this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString"); + this.xrRichText2.SizeF = new System.Drawing.SizeF(116F, 60F); + // + // xrRichText8 + // + this.xrRichText8.Font = new System.Drawing.Font("Times New Roman", 9.75F); + this.xrRichText8.LocationFloat = new DevExpress.Utils.PointFloat(278.0843F, 21.91671F); + this.xrRichText8.Name = "xrRichText8"; + this.xrRichText8.SerializableRtfString = resources.GetString("xrRichText8.SerializableRtfString"); + this.xrRichText8.SizeF = new System.Drawing.SizeF(157.0009F, 59.99997F); + this.xrRichText8.StylePriority.UseFont = false; + // + // xrRichText4 + // + this.xrRichText4.Font = new System.Drawing.Font("Times New Roman", 9.75F); + this.xrRichText4.LocationFloat = new DevExpress.Utils.PointFloat(435.0852F, 21.91671F); + this.xrRichText4.Name = "xrRichText4"; + this.xrRichText4.SerializableRtfString = resources.GetString("xrRichText4.SerializableRtfString"); + this.xrRichText4.SizeF = new System.Drawing.SizeF(139.7038F, 60.00001F); + // + // xrRichText5 + // + this.xrRichText5.Font = new System.Drawing.Font("Times New Roman", 9.75F); + this.xrRichText5.LocationFloat = new DevExpress.Utils.PointFloat(574.789F, 21.91671F); + this.xrRichText5.Name = "xrRichText5"; + this.xrRichText5.SerializableRtfString = resources.GetString("xrRichText5.SerializableRtfString"); + this.xrRichText5.SizeF = new System.Drawing.SizeF(102.211F, 60.00001F); + // // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -158,6 +271,59 @@ namespace BeWo.Report.DefaultReports this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // + // xrLabel7 + // + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(448.8752F, 10.00001F); + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(228.1248F, 23F); + this.xrLabel7.StylePriority.UseTextAlignment = false; + this.xrLabel7.Text = "Datum: [InvoiceDate]"; + this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrLabel10 + // + this.xrLabel10.BackColor = System.Drawing.Color.Transparent; + this.xrLabel10.CanShrink = true; + this.xrLabel10.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 91.45832F); + this.xrLabel10.Multiline = true; + this.xrLabel10.Name = "xrLabel10"; + this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel10.SizeF = new System.Drawing.SizeF(673.8332F, 17F); + this.xrLabel10.StylePriority.UseBackColor = false; + this.xrLabel10.StylePriority.UseFont = false; + this.xrLabel10.Text = "[CustomerReferenceNumber]"; + this.xrLabel10.WordWrap = false; + // + // xrLabel11 + // + this.xrLabel11.BackColor = System.Drawing.Color.Transparent; + this.xrLabel11.CanShrink = true; + this.xrLabel11.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 75.45834F); + this.xrLabel11.Name = "xrLabel11"; + this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(676.8332F, 16F); + this.xrLabel11.StylePriority.UseBackColor = false; + this.xrLabel11.StylePriority.UseFont = false; + this.xrLabel11.Text = "Abrechnung Betreuungsleistungen für [CustomerSalutation] [CustomerName]"; + this.xrLabel11.WordWrap = false; + // + // xrLabel12 + // + this.xrLabel12.BackColor = System.Drawing.Color.Transparent; + this.xrLabel12.CanShrink = true; + this.xrLabel12.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 58.45833F); + this.xrLabel12.Name = "xrLabel12"; + this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel12.SizeF = new System.Drawing.SizeF(676.8332F, 17F); + this.xrLabel12.StylePriority.UseBackColor = false; + this.xrLabel12.StylePriority.UseFont = false; + this.xrLabel12.Text = "Rechnung Nr. [InvoiceNumber]"; + this.xrLabel12.WordWrap = false; + // // xrLabel5 // this.xrLabel5.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F); @@ -182,7 +348,7 @@ namespace BeWo.Report.DefaultReports // xrLabel15 // this.xrLabel15.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F); - this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 114.5833F); + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 144.7917F); this.xrLabel15.Name = "xrLabel15"; this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel15.SizeF = new System.Drawing.SizeF(175F, 17F); @@ -192,7 +358,7 @@ namespace BeWo.Report.DefaultReports // xrTable4 // this.xrTable4.Font = new System.Drawing.Font("Verdana", 10F); - this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 68.75F); + this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 98.95834F); this.xrTable4.Name = "xrTable4"; this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow10, @@ -236,7 +402,7 @@ namespace BeWo.Report.DefaultReports this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "CreatorName")}); this.xrLabel14.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 189.5833F); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 219.7917F); this.xrLabel14.Name = "xrLabel14"; this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel14.SizeF = new System.Drawing.SizeF(225F, 17F); @@ -604,12 +770,13 @@ namespace BeWo.Report.DefaultReports // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.lblIK, this.xrLabel1, this.xrLabel9, this.xrTable4, this.xrLabel14, this.xrLabel15}); - this.GroupFooter1.HeightF = 206.5833F; + this.GroupFooter1.HeightF = 236.7917F; this.GroupFooter1.Name = "GroupFooter1"; // // xrLabel1 @@ -627,175 +794,21 @@ namespace BeWo.Report.DefaultReports this.xrLabel1.Text = "xrLabel1"; this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; // - // RecipientPostCodeAndTown - // - this.RecipientPostCodeAndTown.CanShrink = true; - this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(7.000033F, 172.1667F); - this.RecipientPostCodeAndTown.Name = "RecipientPostCodeAndTown"; - this.RecipientPostCodeAndTown.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.RecipientPostCodeAndTown.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.RecipientPostCodeAndTown.SizeF = new System.Drawing.SizeF(292F, 17F); - this.RecipientPostCodeAndTown.StylePriority.UseFont = false; - this.RecipientPostCodeAndTown.Text = "[RecipientPostCodeAndTown]"; - // - // xrLabel_RecipientContactPerson - // - this.xrLabel_RecipientContactPerson.CanShrink = true; - this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(7.000033F, 121.1668F); - 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; - this.xrLabel_RecipientContactPerson.SizeF = new System.Drawing.SizeF(292F, 17F); - this.xrLabel_RecipientContactPerson.StylePriority.UseFont = false; - this.xrLabel_RecipientContactPerson.Text = "[RecipientContactPerson]"; - // - // xrLabel_RecipientDivision - // - this.xrLabel_RecipientDivision.CanShrink = true; - this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(7.000033F, 138.1668F); - 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; - this.xrLabel_RecipientDivision.SizeF = new System.Drawing.SizeF(292F, 17F); - this.xrLabel_RecipientDivision.StylePriority.UseFont = false; - this.xrLabel_RecipientDivision.Text = "[RecipientDivision]"; - // - // xrLabel_RecipientStreet - // - this.xrLabel_RecipientStreet.CanShrink = true; - this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(7.000033F, 155.1667F); - this.xrLabel_RecipientStreet.Name = "xrLabel_RecipientStreet"; - this.xrLabel_RecipientStreet.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel_RecipientStreet.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrLabel_RecipientStreet.SizeF = new System.Drawing.SizeF(292F, 17F); - this.xrLabel_RecipientStreet.StylePriority.UseFont = false; - this.xrLabel_RecipientStreet.Text = "[RecipientStreet]"; - // - // xrLabel6 - // - this.xrLabel6.CanShrink = true; - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(7.000033F, 104.1668F); - this.xrLabel6.Name = "xrLabel6"; - this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel6.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrLabel6.SizeF = new System.Drawing.SizeF(292F, 17F); - this.xrLabel6.StylePriority.UseFont = false; - this.xrLabel6.Text = "[RecipientOrganisation]"; - // - // xrRichText6 - // - this.xrRichText6.Font = new System.Drawing.Font("Verdana", 10F); - this.xrRichText6.LocationFloat = new DevExpress.Utils.PointFloat(7.000033F, 70.8334F); - this.xrRichText6.Name = "xrRichText6"; - this.xrRichText6.SerializableRtfString = resources.GetString("xrRichText6.SerializableRtfString"); - this.xrRichText6.SizeF = new System.Drawing.SizeF(334.1667F, 20.41666F); - // - // xrRichText7 - // - this.xrRichText7.Font = new System.Drawing.Font("Verdana", 10F); - this.xrRichText7.LocationFloat = new DevExpress.Utils.PointFloat(428.8752F, 70.8334F); - this.xrRichText7.Name = "xrRichText7"; - this.xrRichText7.SerializableRtfString = resources.GetString("xrRichText7.SerializableRtfString"); - this.xrRichText7.SizeF = new System.Drawing.SizeF(221.1248F, 161.0417F); - // - // xrLabel7 - // - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(448.8752F, 10.00001F); - this.xrLabel7.Name = "xrLabel7"; - this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(228.1248F, 23F); - this.xrLabel7.StylePriority.UseTextAlignment = false; - this.xrLabel7.Text = "Datum: [InvoiceDate]"; - this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - // - // xrLabel10 - // - this.xrLabel10.BackColor = System.Drawing.Color.Transparent; - this.xrLabel10.CanShrink = true; - this.xrLabel10.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold); - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 91.45832F); - this.xrLabel10.Multiline = true; - this.xrLabel10.Name = "xrLabel10"; - this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel10.SizeF = new System.Drawing.SizeF(673.8332F, 17F); - this.xrLabel10.StylePriority.UseBackColor = false; - this.xrLabel10.StylePriority.UseFont = false; - this.xrLabel10.Text = "[CustomerReferenceNumber]"; - this.xrLabel10.WordWrap = false; - // - // xrLabel11 - // - this.xrLabel11.BackColor = System.Drawing.Color.Transparent; - this.xrLabel11.CanShrink = true; - this.xrLabel11.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 75.45834F); - this.xrLabel11.Name = "xrLabel11"; - this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel11.SizeF = new System.Drawing.SizeF(676.8332F, 16F); - this.xrLabel11.StylePriority.UseBackColor = false; - this.xrLabel11.StylePriority.UseFont = false; - this.xrLabel11.Text = "Abrechnung Betreuungsleistungen für [CustomerSalutation] [CustomerName]"; - this.xrLabel11.WordWrap = false; - // - // xrLabel12 - // - this.xrLabel12.BackColor = System.Drawing.Color.Transparent; - this.xrLabel12.CanShrink = true; - this.xrLabel12.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold); - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 58.45833F); - this.xrLabel12.Name = "xrLabel12"; - this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel12.SizeF = new System.Drawing.SizeF(676.8332F, 17F); - this.xrLabel12.StylePriority.UseBackColor = false; - this.xrLabel12.StylePriority.UseFont = false; - this.xrLabel12.Text = "Rechnung Nr. [InvoiceNumber]"; - this.xrLabel12.WordWrap = false; - // - // xrRichText1 - // - this.xrRichText1.Font = new System.Drawing.Font("Times New Roman", 9.75F); - this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 21.91671F); - this.xrRichText1.Name = "xrRichText1"; - this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); - this.xrRichText1.SizeF = new System.Drawing.SizeF(162.0845F, 60F); - // - // xrRichText2 - // - this.xrRichText2.Font = new System.Drawing.Font("Times New Roman", 9.75F); - this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(162.0845F, 21.91671F); - this.xrRichText2.Name = "xrRichText2"; - this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString"); - this.xrRichText2.SizeF = new System.Drawing.SizeF(116F, 60F); - // - // xrRichText8 - // - this.xrRichText8.Font = new System.Drawing.Font("Times New Roman", 9.75F); - this.xrRichText8.LocationFloat = new DevExpress.Utils.PointFloat(278.0843F, 21.91671F); - this.xrRichText8.Name = "xrRichText8"; - this.xrRichText8.SerializableRtfString = resources.GetString("xrRichText8.SerializableRtfString"); - this.xrRichText8.SizeF = new System.Drawing.SizeF(157.0009F, 59.99997F); - this.xrRichText8.StylePriority.UseFont = false; - // - // xrRichText4 - // - this.xrRichText4.Font = new System.Drawing.Font("Times New Roman", 9.75F); - this.xrRichText4.LocationFloat = new DevExpress.Utils.PointFloat(435.0852F, 21.91671F); - this.xrRichText4.Name = "xrRichText4"; - this.xrRichText4.SerializableRtfString = resources.GetString("xrRichText4.SerializableRtfString"); - this.xrRichText4.SizeF = new System.Drawing.SizeF(139.7038F, 60.00001F); - // - // xrRichText5 - // - this.xrRichText5.Font = new System.Drawing.Font("Times New Roman", 9.75F); - this.xrRichText5.LocationFloat = new DevExpress.Utils.PointFloat(574.789F, 21.91671F); - this.xrRichText5.Name = "xrRichText5"; - this.xrRichText5.SerializableRtfString = resources.GetString("xrRichText5.SerializableRtfString"); - this.xrRichText5.SizeF = new System.Drawing.SizeF(102.211F, 60.00001F); - // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // + // lblIK + // + this.lblIK.Font = new System.Drawing.Font("Verdana", 10F); + this.lblIK.LocationFloat = new DevExpress.Utils.PointFloat(0F, 74.66666F); + this.lblIK.Name = "lblIK"; + this.lblIK.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblIK.SizeF = new System.Drawing.SizeF(250F, 17F); + this.lblIK.StylePriority.UseFont = false; + this.lblIK.Text = "IK Nummer: 590520704"; + this.lblIK.Visible = false; + // // ServiceInvoiceReport // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -817,9 +830,6 @@ namespace BeWo.Report.DefaultReports this.Version = "17.1"; this.Watermark.Image = ((System.Drawing.Image)(resources.GetObject("ServiceInvoiceReport.Watermark.Image"))); this.Watermark.ImageViewMode = DevExpress.XtraPrinting.Drawing.ImageViewMode.Zoom; - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); @@ -827,6 +837,9 @@ namespace BeWo.Report.DefaultReports ((System.ComponentModel.ISupportInitialize)(this.xrRichText8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText5)).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)).EndInit(); @@ -890,5 +903,6 @@ namespace BeWo.Report.DefaultReports private DevExpress.XtraReports.UI.XRRichText xrRichText8; private DevExpress.XtraReports.UI.XRRichText xrRichText4; private DevExpress.XtraReports.UI.XRRichText xrRichText5; + private DevExpress.XtraReports.UI.XRLabel lblIK; } } diff --git a/ReportImp/BeWoSchillingReports/ServiceInvoiceReport.cs b/ReportImp/BeWoSchillingReports/ServiceInvoiceReport.cs index 26d7dfc83..245dc1326 100644 --- a/ReportImp/BeWoSchillingReports/ServiceInvoiceReport.cs +++ b/ReportImp/BeWoSchillingReports/ServiceInvoiceReport.cs @@ -25,6 +25,11 @@ namespace BeWo.Report.DefaultReports lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Zeitraum {0:MMMM yyyy} - {1:MMMM yyyy} folgende erbrachte Tätigkeiten:", start, end); } + if (pRO.RecipientOrganisation.Contains("AOK") || pRO.RecipientOrganisation.Contains("IKK") || pRO.RecipientOrganisation.Contains("Mobil Krankenkasse") + || pRO.RecipientOrganisation.Contains("Pronova BKK") || pRO.RecipientOrganisation.Contains("BKK")) + lblIK.Visible = true; + + this.bindingSource1.DataSource = pRO; } } diff --git a/ReportImp/VkmHamm/CustomerMitarbeiterstundenkontoBerechnung.cs b/ReportImp/VkmHamm/CustomerMitarbeiterstundenkontoBerechnung.cs index a89ca9a0b..0342692da 100644 --- a/ReportImp/VkmHamm/CustomerMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/VkmHamm/CustomerMitarbeiterstundenkontoBerechnung.cs @@ -15,14 +15,24 @@ namespace VkmHamm public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed) { - var dd = base.CreateDayDetail(date, ed); - dd.MaxHoursUntilBreak = 6; - dd.MaxHoursUntilBreak2 = 9; - dd.BreakMinutes = 30; - dd.BreakMinutes2 = 15; + var dd = base.CreateDayDetail(date, ed); + if (date.Year >= 2023) + { + dd.MaxHoursUntilBreak = 6; + dd.MaxHoursUntilBreak2 = 9; + dd.BreakMinutes = 30; + dd.BreakMinutes2 = 15; - return dd; - } + } + else + { + dd.MaxHoursUntilBreak = 0; + dd.MaxHoursUntilBreak2 = 0; + dd.BreakMinutes = 0; + dd.BreakMinutes2 = 0; + } + return dd; + } public override bool AddServiceRecordToDuration(ServiceRecord item) {