diff --git a/ReportImp/DiakonischesWerkDinslakenBeWo/Invoicing/SettlementInvoiceCreation.cs b/ReportImp/DiakonischesWerkDinslakenBeWo/Invoicing/SettlementInvoiceCreation.cs index 4a0e1a18d..6d7c08bf5 100644 --- a/ReportImp/DiakonischesWerkDinslakenBeWo/Invoicing/SettlementInvoiceCreation.cs +++ b/ReportImp/DiakonischesWerkDinslakenBeWo/Invoicing/SettlementInvoiceCreation.cs @@ -1,9 +1,11 @@ using BeWo.Data.Entities; using BeWo.Service.Invoicing; +using BeWo.Service.Plugins; using BS.Shared.DataContracts; namespace DiakonischesWerkDinslakenBeWo { + [IgnoreAutoPlugin] public class CustomSettlementInvoiceCreation : SettlementInvoiceCreation { public override bool CanCreateInvoiceTheOldWay(Settlement2DC si, CostBearer2SupportConcept c2s) diff --git a/ReportImp/DiakonischesWerkDinslakenBeWo/ServiceInvoiceReport.Designer.cs b/ReportImp/DiakonischesWerkDinslakenBeWo/ServiceInvoiceReport.Designer.cs index 326502f18..8f81960d7 100644 --- a/ReportImp/DiakonischesWerkDinslakenBeWo/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/DiakonischesWerkDinslakenBeWo/ServiceInvoiceReport.Designer.cs @@ -76,11 +76,10 @@ namespace DiakonischesWerkDinslakenBeWo this.xrTableCell44 = 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.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); @@ -145,6 +144,7 @@ namespace DiakonischesWerkDinslakenBeWo // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel9, this.xrRichText5, this.xrRichText6, this.lblAdresse, @@ -155,7 +155,7 @@ namespace DiakonischesWerkDinslakenBeWo this.xrLabel8, this.lblAbrechnungszeitraum}); this.Page1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.Page1.HeightF = 354.0833F; + this.Page1.HeightF = 376.7916F; this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // @@ -192,7 +192,7 @@ namespace DiakonischesWerkDinslakenBeWo this.xrLabel4.CanShrink = true; this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 235F); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 257.9167F); this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -208,7 +208,7 @@ namespace DiakonischesWerkDinslakenBeWo this.xrLabel3.CanShrink = true; this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 215F); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 237.9166F); 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); @@ -223,7 +223,7 @@ namespace DiakonischesWerkDinslakenBeWo this.xrLabel2.CanShrink = true; this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 195F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 217.9167F); 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); @@ -234,7 +234,7 @@ namespace DiakonischesWerkDinslakenBeWo // // xrLabel5 // - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 278.75F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 301.6666F); 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); @@ -245,7 +245,7 @@ namespace DiakonischesWerkDinslakenBeWo // this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")}); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(420F, 172F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(420F, 194.9167F); 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); @@ -255,7 +255,7 @@ namespace DiakonischesWerkDinslakenBeWo // // lblAbrechnungszeitraum // - this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 303.75F); + this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 326.6666F); this.lblAbrechnungszeitraum.Multiline = true; this.lblAbrechnungszeitraum.Name = "lblAbrechnungszeitraum"; this.lblAbrechnungszeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -348,7 +348,7 @@ namespace DiakonischesWerkDinslakenBeWo this.xrTable5.Name = "xrTable5"; this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow23}); - this.xrTable5.SizeF = new System.Drawing.SizeF(703F, 25F); + this.xrTable5.SizeF = new System.Drawing.SizeF(699.15F, 25F); // // xrTableRow23 // @@ -358,7 +358,6 @@ namespace DiakonischesWerkDinslakenBeWo this.xrTableCell35, this.xrTableCell33, this.xrTableCell36, - this.xrTableCell1, this.xrTableCell34}); this.xrTableRow23.Name = "xrTableRow23"; this.xrTableRow23.Weight = 1D; @@ -433,7 +432,7 @@ namespace DiakonischesWerkDinslakenBeWo this.xrTableCell33.StylePriority.UseTextAlignment = false; this.xrTableCell33.Text = "Satz"; this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; - this.xrTableCell33.Weight = 0.29653830968757378D; + this.xrTableCell33.Weight = 0.43881247029864645D; // // xrTableCell36 // @@ -449,9 +448,9 @@ namespace DiakonischesWerkDinslakenBeWo this.xrTableCell36.StylePriority.UseBorders = false; this.xrTableCell36.StylePriority.UsePadding = false; this.xrTableCell36.StylePriority.UseTextAlignment = false; - this.xrTableCell36.Text = "Anzahl"; + this.xrTableCell36.Text = "Anzahl DLS"; this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell36.Weight = 0.35837475076287334D; + this.xrTableCell36.Weight = 0.43881244651482643D; // // xrTableCell34 // @@ -469,7 +468,7 @@ namespace DiakonischesWerkDinslakenBeWo this.xrTableCell34.StylePriority.UseTextAlignment = false; this.xrTableCell34.Text = "Betrag"; this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell34.Weight = 0.31923915575667006D; + this.xrTableCell34.Weight = 0.43881234350047793D; // // DetailReport2 // @@ -497,7 +496,7 @@ namespace DiakonischesWerkDinslakenBeWo this.xrTable6.Name = "xrTable6"; this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow25}); - this.xrTable6.SizeF = new System.Drawing.SizeF(703F, 25F); + this.xrTable6.SizeF = new System.Drawing.SizeF(700F, 25F); this.xrTable6.StylePriority.UseFont = false; // // xrTableRow25 @@ -508,7 +507,6 @@ namespace DiakonischesWerkDinslakenBeWo this.xrTableCell42, this.xrTableCell43, this.xrTableCell44, - this.xrTableCell2, this.xrTableCell47}); this.xrTableRow25.Name = "xrTableRow25"; this.xrTableRow25.Weight = 1D; @@ -580,7 +578,7 @@ namespace DiakonischesWerkDinslakenBeWo this.xrTableCell43.StylePriority.UseTextAlignment = false; this.xrTableCell43.Text = "xrTableCell43"; this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell43.Weight = 0.33588714305588518D; + this.xrTableCell43.Weight = 0.49754138093445671D; // // xrTableCell44 // @@ -597,7 +595,7 @@ namespace DiakonischesWerkDinslakenBeWo this.xrTableCell44.StylePriority.UseTextAlignment = false; this.xrTableCell44.Text = "xrTableCell44"; this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell44.Weight = 0.40592866919868448D; + this.xrTableCell44.Weight = 0.49714690811687434D; // // xrTableCell47 // @@ -613,7 +611,7 @@ namespace DiakonischesWerkDinslakenBeWo this.xrTableCell47.StylePriority.UsePadding = false; this.xrTableCell47.StylePriority.UseTextAlignment = false; this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell47.Weight = 0.36232009970662282D; + this.xrTableCell47.Weight = 0.50117194524608533D; // // GroupFooter1 // @@ -626,21 +624,6 @@ namespace DiakonischesWerkDinslakenBeWo this.GroupFooter1.HeightF = 229.5F; 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("Verdana", 9F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(447.1667F, 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; - // // xrLabel7 // this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); @@ -652,47 +635,41 @@ namespace DiakonischesWerkDinslakenBeWo this.xrLabel7.StylePriority.UseFont = false; this.xrLabel7.Text = "Bankverbindung:\r\nBank für Kirche und Diakonie - KD-Bank\r\nIBAN: DE33 3506 0190 108" + "8 4070 20\r\nBIC: GENODED1DKD "; + // + // 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("Verdana", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(443.3168F, 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; + // + // xrLabel9 + // + this.xrLabel9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "BusinessPartnerId")}); + this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 9F); + this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(492.2917F, 155.2917F); + this.xrLabel9.Name = "xrLabel9"; + this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); + this.xrLabel9.SizeF = new System.Drawing.SizeF(210.7083F, 23F); + this.xrLabel9.StylePriority.UseFont = false; + this.xrLabel9.StylePriority.UsePadding = false; + this.xrLabel9.StylePriority.UseTextAlignment = false; + this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrLabel9.TextFormatString = "GP-Nummer: {0}"; // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // - // xrTableCell1 - // - this.xrTableCell1.BackColor = System.Drawing.Color.Gainsboro; - this.xrTableCell1.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell1.Multiline = true; - this.xrTableCell1.Name = "xrTableCell1"; - this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell1.StylePriority.UseBackColor = false; - this.xrTableCell1.StylePriority.UseBorderColor = false; - this.xrTableCell1.StylePriority.UseBorders = false; - this.xrTableCell1.StylePriority.UsePadding = false; - this.xrTableCell1.StylePriority.UseTextAlignment = false; - this.xrTableCell1.Text = "Faktor"; - this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell1.Weight = 0.35837475076287334D; - // - // xrTableCell2 - // - this.xrTableCell2.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.RateFactor")}); - this.xrTableCell2.Multiline = true; - this.xrTableCell2.Name = "xrTableCell2"; - this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell2.StylePriority.UseBorderColor = false; - this.xrTableCell2.StylePriority.UseBorders = false; - this.xrTableCell2.StylePriority.UsePadding = false; - this.xrTableCell2.StylePriority.UseTextAlignment = false; - this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell2.Weight = 0.40592866919868448D; - // // ServiceInvoiceReport // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -773,7 +750,6 @@ namespace DiakonischesWerkDinslakenBeWo private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; private DevExpress.XtraReports.UI.XRLabel xrLabel6; private DevExpress.XtraReports.UI.XRLabel xrLabel7; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; + private DevExpress.XtraReports.UI.XRLabel xrLabel9; } }