diff --git a/ReportImp/BeWoAuxilio/InvoiceCustomerReport.Designer.cs b/ReportImp/BeWoAuxilio/InvoiceCustomerReport.Designer.cs index 207abb1c5..f25868f54 100644 --- a/ReportImp/BeWoAuxilio/InvoiceCustomerReport.Designer.cs +++ b/ReportImp/BeWoAuxilio/InvoiceCustomerReport.Designer.cs @@ -29,7 +29,6 @@ namespace BeWoAuxilio /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InvoiceCustomerReport)); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); @@ -42,15 +41,6 @@ namespace BeWoAuxilio this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow13 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.lblAddress = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); @@ -68,10 +58,6 @@ namespace BeWoAuxilio this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); - this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); - this.lblNotice = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -79,11 +65,23 @@ namespace BeWoAuxilio this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(); + this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // @@ -208,8 +206,8 @@ namespace BeWoAuxilio // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable2, this.xrLabel9, - this.xrTable5, this.xrLabel1, this.lblAddress, this.xrTable3, @@ -243,87 +241,6 @@ namespace BeWoAuxilio this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; this.xrLabel9.WordWrap = false; // - // xrTable5 - // - this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(367.0001F, 120.5F); - this.xrTable5.Name = "xrTable5"; - this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow3, - this.xrTableRow7, - this.xrTableRow12, - this.xrTableRow13}); - this.xrTable5.SizeF = new System.Drawing.SizeF(283F, 77F); - // - // xrTableRow3 - // - this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell3}); - this.xrTableRow3.Name = "xrTableRow3"; - this.xrTableRow3.Weight = 0.13245033112582783D; - // - // xrTableCell3 - // - this.xrTableCell3.CanShrink = true; - this.xrTableCell3.Name = "xrTableCell3"; - this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell3.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell3.StylePriority.UseFont = false; - this.xrTableCell3.StylePriority.UseTextAlignment = false; - this.xrTableCell3.Text = "Ihre Ansprechpartnerin:"; - this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell3.Weight = 1D; - // - // xrTableRow7 - // - this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell8}); - this.xrTableRow7.Name = "xrTableRow7"; - this.xrTableRow7.Weight = 0.13245033112582783D; - // - // xrTableCell8 - // - this.xrTableCell8.CanShrink = true; - this.xrTableCell8.Name = "xrTableCell8"; - this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell8.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell8.StylePriority.UseFont = false; - this.xrTableCell8.StylePriority.UseTextAlignment = false; - this.xrTableCell8.Text = "Agnieszka Sujka-Link"; - this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell8.Weight = 1D; - // - // xrTableRow12 - // - this.xrTableRow12.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell21}); - this.xrTableRow12.Name = "xrTableRow12"; - this.xrTableRow12.Weight = 0.13245033112582783D; - // - // xrTableCell21 - // - this.xrTableCell21.CanShrink = true; - this.xrTableCell21.Name = "xrTableCell21"; - this.xrTableCell21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell21.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell21.StylePriority.UseFont = false; - this.xrTableCell21.StylePriority.UseTextAlignment = false; - this.xrTableCell21.Text = "E-Mail: agnieszka.link@bewo-auxilio.de"; - this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell21.Weight = 1D; - // - // xrTableRow13 - // - this.xrTableRow13.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell22}); - this.xrTableRow13.Name = "xrTableRow13"; - this.xrTableRow13.Weight = 0.11258278145695365D; - // - // xrTableCell22 - // - this.xrTableCell22.Name = "xrTableCell22"; - this.xrTableCell22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell22.Weight = 1D; - // // xrLabel1 // this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -524,57 +441,16 @@ namespace BeWoAuxilio // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel12, + this.xrLabel11, this.xrLabel7, - this.xrLabel8, - this.xrLabel10, - this.lblNotice, this.xrTable4}); this.ReportFooter.Font = new System.Drawing.Font("Verdana", 10F); - this.ReportFooter.HeightF = 247.5417F; + this.ReportFooter.HeightF = 306.9167F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // - // xrLabel7 - // - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(9.536743E-05F, 183.6667F); - this.xrLabel7.Name = "xrLabel7"; - this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(225F, 17F); - this.xrLabel7.StylePriority.UseFont = false; - this.xrLabel7.Text = "Agnieszka Sujka-Link"; - // - // xrLabel8 - // - this.xrLabel8.CanShrink = true; - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 75F); - this.xrLabel8.Multiline = true; - this.xrLabel8.Name = "xrLabel8"; - this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel8.SizeF = new System.Drawing.SizeF(677F, 18.04168F); - this.xrLabel8.StylePriority.UseFont = false; - this.xrLabel8.Text = "[Notice]"; - // - // xrLabel10 - // - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 108.6667F); - 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"; - // - // lblNotice - // - this.lblNotice.CanShrink = true; - this.lblNotice.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Italic); - this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 46.54166F); - this.lblNotice.Name = "lblNotice"; - this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblNotice.SizeF = new System.Drawing.SizeF(250F, 28.45834F); - this.lblNotice.StylePriority.UseFont = false; - this.lblNotice.Text = "Abschließende Bemerkungen:"; - // // xrTable4 // this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(570.5F, 0F); @@ -636,10 +512,122 @@ namespace BeWoAuxilio this.Detail1.Name = "Detail1"; this.Detail1.StylePriority.UseFont = false; // + // xrTable2 + // + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(367F, 120.5F); + this.xrTable2.Name = "xrTable2"; + this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow2, + this.xrTableRow5, + this.xrTableRow1, + this.xrTableRow8}); + this.xrTable2.SizeF = new System.Drawing.SizeF(283F, 77F); + // + // xrTableRow2 + // + this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell4}); + this.xrTableRow2.Name = "xrTableRow2"; + this.xrTableRow2.Weight = 0.13245033112582783D; + // + // xrTableCell4 + // + this.xrTableCell4.CanShrink = true; + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell4.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrTableCell4.StylePriority.UseFont = false; + this.xrTableCell4.StylePriority.UseTextAlignment = false; + this.xrTableCell4.Text = "Ihre Ansprechpartnerin:"; + this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell4.Weight = 1D; + // + // xrTableRow5 + // + this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell13}); + this.xrTableRow5.Name = "xrTableRow5"; + this.xrTableRow5.Weight = 0.13245033112582783D; + // + // xrTableCell13 + // + this.xrTableCell13.CanShrink = true; + this.xrTableCell13.Name = "xrTableCell13"; + this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell13.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrTableCell13.StylePriority.UseFont = false; + this.xrTableCell13.StylePriority.UseTextAlignment = false; + this.xrTableCell13.Text = "[SenderFirstName] [SenderLastName]"; + this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell13.Weight = 1D; + // + // xrTableRow1 + // + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell1}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Weight = 0.13245033112582783D; + // + // xrTableCell1 + // + this.xrTableCell1.CanShrink = true; + this.xrTableCell1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderMail")}); + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell1.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrTableCell1.StylePriority.UseFont = false; + this.xrTableCell1.StylePriority.UseTextAlignment = false; + this.xrTableCell1.Text = "[SenderContactPersonMail]"; + this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell1.Weight = 1D; + // + // xrTableRow8 + // + this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell5}); + this.xrTableRow8.Name = "xrTableRow8"; + this.xrTableRow8.Weight = 0.11258278145695365D; + // + // xrTableCell5 + // + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell5.Weight = 1D; + // + // xrLabel11 + // + this.xrLabel11.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 47.56253F); + this.xrLabel11.Multiline = true; + this.xrLabel11.Name = "xrLabel11"; + this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(645.4999F, 120.125F); + this.xrLabel11.StylePriority.UseFont = false; + this.xrLabel11.Text = resources.GetString("xrLabel11.Text"); + // + // xrLabel7 + // + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 188.1875F); + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(175F, 17F); + this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.Text = "Mit freundlichen Grüßen"; + // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.InvoiceCustomerRO); // + // xrLabel12 + // + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(9.536743E-05F, 262.2083F); + this.xrLabel12.Name = "xrLabel12"; + this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel12.SizeF = new System.Drawing.SizeF(292F, 17.00002F); + this.xrLabel12.StylePriority.UseFont = false; + this.xrLabel12.Text = "[CreatorFirstName] [CreatorLastName]"; + // // InvoiceCustomerReport // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -660,9 +648,9 @@ namespace BeWoAuxilio this.Version = "17.1"; this.Watermark.Image = ((System.Drawing.Image)(resources.GetObject("InvoiceCustomerReport.Watermark.Image"))); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); @@ -679,8 +667,6 @@ namespace BeWoAuxilio private DevExpress.XtraReports.UI.XRLabel xrLabel3; private DevExpress.XtraReports.UI.XRLabel xrLabel2; private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; - private DevExpress.XtraReports.UI.XRLabel lblNotice; - private DevExpress.XtraReports.UI.XRLabel xrLabel10; private DevExpress.XtraReports.UI.FormattingRule ruleRateFactorNull; private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; @@ -700,7 +686,6 @@ namespace BeWoAuxilio private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; - private DevExpress.XtraReports.UI.XRLabel xrLabel8; private DevExpress.XtraReports.UI.XRTable xrTable4; private DevExpress.XtraReports.UI.XRTableRow xrTableRow11; private DevExpress.XtraReports.UI.XRTableCell xrTableCell23; @@ -708,16 +693,18 @@ namespace BeWoAuxilio private DevExpress.XtraReports.UI.DetailBand Detail1; private DevExpress.XtraReports.UI.XRLabel lblAddress; private DevExpress.XtraReports.UI.XRLabel xrLabel1; - private DevExpress.XtraReports.UI.XRTable xrTable5; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow7; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow12; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell21; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow13; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell22; - private DevExpress.XtraReports.UI.XRLabel xrLabel7; private DevExpress.XtraReports.UI.XRLabel xrLabel9; + private DevExpress.XtraReports.UI.XRTable xrTable2; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow5; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow8; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; + private DevExpress.XtraReports.UI.XRLabel xrLabel11; + private DevExpress.XtraReports.UI.XRLabel xrLabel7; + private DevExpress.XtraReports.UI.XRLabel xrLabel12; } } diff --git a/ReportImp/BeWoAuxilio/InvoiceCustomerReport.cs b/ReportImp/BeWoAuxilio/InvoiceCustomerReport.cs index c2e455e26..ae9391c7f 100644 --- a/ReportImp/BeWoAuxilio/InvoiceCustomerReport.cs +++ b/ReportImp/BeWoAuxilio/InvoiceCustomerReport.cs @@ -14,11 +14,6 @@ namespace BeWoAuxilio public void SetReportDataSource(InvoiceCustomerRO pRO) { - if (String.IsNullOrEmpty(pRO.Notice)) - { - lblNotice.Visible = false; - } - StringBuilder sb = new StringBuilder(); if (!String.IsNullOrEmpty(pRO.RecipientOrganisation) && !String.IsNullOrEmpty(pRO.RecipientOrganisation.Trim())) { diff --git a/ReportImp/BeWoAuxilio/InvoiceCustomerReport.resx b/ReportImp/BeWoAuxilio/InvoiceCustomerReport.resx index bc608dd2b..a60c9251e 100644 --- a/ReportImp/BeWoAuxilio/InvoiceCustomerReport.resx +++ b/ReportImp/BeWoAuxilio/InvoiceCustomerReport.resx @@ -117,6 +117,14 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Wir bitten um Ãœberweisung des Rechnungsbetrags innerhalb von 14 Tagen ohne Abzug auf das folgende Konto: + +Bankverbindung: BeWo-Auxilio GbR +Bank: DKB +IBAN: DE42 1203 0000 1020 3193 88 +BIC: BYLADEM1001 + 17, 17 diff --git a/ReportImp/BeWoAuxilio/RechnungSelbstzahlerDue.Designer.cs b/ReportImp/BeWoAuxilio/RechnungSelbstzahlerDue.Designer.cs index 8e9eae9bd..c36800b10 100644 --- a/ReportImp/BeWoAuxilio/RechnungSelbstzahlerDue.Designer.cs +++ b/ReportImp/BeWoAuxilio/RechnungSelbstzahlerDue.Designer.cs @@ -36,6 +36,9 @@ namespace BeWoAuxilio this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel(); this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); @@ -59,26 +62,24 @@ namespace BeWoAuxilio this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -114,10 +115,10 @@ namespace BeWoAuxilio // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable2, this.xrLabel6, this.xrLabel5, this.xrLabel20, - this.xrTable1, this.lblAdresse, this.xrLabel3, this.xrLabel2, @@ -127,6 +128,48 @@ namespace BeWoAuxilio this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // + // xrLabel6 + // + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 362.0834F); + 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(666.9999F, 23.25F); + this.xrLabel6.StylePriority.UseFont = false; + this.xrLabel6.Text = "für den Betreuungszeitraum [AccountingPeriod] berechnen wir folgende Leistungen:\r" + + "\n"; + // + // xrLabel5 + // + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 329.0834F); + this.xrLabel5.Multiline = true; + this.xrLabel5.Name = "xrLabel5"; + this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel5.SizeF = new System.Drawing.SizeF(666.9999F, 33F); + this.xrLabel5.StylePriority.UseFont = false; + this.xrLabel5.Text = "[CustomerSalutation] [CustomerLastName],"; + // + // xrLabel20 + // + this.xrLabel20.BackColor = System.Drawing.Color.Transparent; + this.xrLabel20.CanShrink = true; + this.xrLabel20.Font = new System.Drawing.Font("Arial", 9F); + this.xrLabel20.ForeColor = System.Drawing.Color.Gray; + this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F); + this.xrLabel20.Multiline = true; + this.xrLabel20.Name = "xrLabel20"; + this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel20.SizeF = new System.Drawing.SizeF(291.9999F, 33.74999F); + this.xrLabel20.StylePriority.UseBackColor = false; + this.xrLabel20.StylePriority.UseBorderColor = false; + this.xrLabel20.StylePriority.UseFont = false; + this.xrLabel20.StylePriority.UseForeColor = false; + this.xrLabel20.StylePriority.UseTextAlignment = false; + this.xrLabel20.Text = "BeWo-Auxilio GbR - Standort Düsseldorf - \r\nMerowingerstr. 20b - 40223 Düsseldorf" + + "\r\n"; + this.xrLabel20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; + this.xrLabel20.WordWrap = false; + // // lblAdresse // this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 60.20835F); @@ -429,12 +472,22 @@ namespace BeWoAuxilio // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel4, + this.xrLabel14, this.xrLabel10, - this.xrLabel7, this.xrLabel1}); - this.GroupFooter1.HeightF = 206.5833F; + this.GroupFooter1.HeightF = 309.7083F; this.GroupFooter1.Name = "GroupFooter1"; // + // xrLabel10 + // + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 189.5833F); + 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"; + // // xrLabel1 // this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -450,151 +503,114 @@ namespace BeWoAuxilio this.xrLabel1.Text = "xrLabel1"; this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; // - // xrTable1 - // - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(367.0001F, 80.00002F); - this.xrTable1.Name = "xrTable1"; - this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow7, - this.xrTableRow9, - this.xrTableRow11, - this.xrTableRow12}); - this.xrTable1.SizeF = new System.Drawing.SizeF(283F, 77F); - // - // xrTableRow7 - // - this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell3}); - this.xrTableRow7.Name = "xrTableRow7"; - this.xrTableRow7.Weight = 0.13245033112582783D; - // - // xrTableCell3 - // - this.xrTableCell3.CanShrink = true; - this.xrTableCell3.Name = "xrTableCell3"; - this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell3.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell3.StylePriority.UseFont = false; - this.xrTableCell3.StylePriority.UseTextAlignment = false; - this.xrTableCell3.Text = "Ihre Ansprechpartnerin:"; - this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell3.Weight = 1D; - // - // xrTableRow9 - // - this.xrTableRow9.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell6}); - this.xrTableRow9.Name = "xrTableRow9"; - this.xrTableRow9.Weight = 0.13245033112582783D; - // - // xrTableCell6 - // - this.xrTableCell6.CanShrink = true; - this.xrTableCell6.Name = "xrTableCell6"; - this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell6.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell6.StylePriority.UseFont = false; - this.xrTableCell6.StylePriority.UseTextAlignment = false; - this.xrTableCell6.Text = "Agnieszka Sujka-Link"; - this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell6.Weight = 1D; - // - // xrTableRow11 - // - this.xrTableRow11.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell7}); - this.xrTableRow11.Name = "xrTableRow11"; - this.xrTableRow11.Weight = 0.13245033112582783D; - // - // xrTableCell7 - // - this.xrTableCell7.CanShrink = true; - this.xrTableCell7.Name = "xrTableCell7"; - this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell7.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell7.StylePriority.UseFont = false; - this.xrTableCell7.StylePriority.UseTextAlignment = false; - this.xrTableCell7.Text = "E-Mail: agnieszka.link@bewo-auxilio.de"; - this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell7.Weight = 1D; - // - // xrTableRow12 - // - this.xrTableRow12.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell10}); - this.xrTableRow12.Name = "xrTableRow12"; - this.xrTableRow12.Weight = 0.11258278145695365D; - // - // xrTableCell10 - // - this.xrTableCell10.Name = "xrTableCell10"; - this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell10.Weight = 1D; - // - // xrLabel20 - // - this.xrLabel20.BackColor = System.Drawing.Color.Transparent; - this.xrLabel20.CanShrink = true; - this.xrLabel20.Font = new System.Drawing.Font("Arial", 9F); - this.xrLabel20.ForeColor = System.Drawing.Color.Gray; - this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F); - this.xrLabel20.Multiline = true; - this.xrLabel20.Name = "xrLabel20"; - this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel20.SizeF = new System.Drawing.SizeF(291.9999F, 33.74999F); - this.xrLabel20.StylePriority.UseBackColor = false; - this.xrLabel20.StylePriority.UseBorderColor = false; - this.xrLabel20.StylePriority.UseFont = false; - this.xrLabel20.StylePriority.UseForeColor = false; - this.xrLabel20.StylePriority.UseTextAlignment = false; - this.xrLabel20.Text = "BeWo-Auxilio GbR - Standort Düsseldorf - \r\nMerowingerstr. 20b - 40223 Düsseldorf" + - "\r\n"; - this.xrLabel20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; - this.xrLabel20.WordWrap = false; - // - // xrLabel5 - // - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 329.0834F); - this.xrLabel5.Multiline = true; - this.xrLabel5.Name = "xrLabel5"; - this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel5.SizeF = new System.Drawing.SizeF(666.9999F, 33F); - this.xrLabel5.StylePriority.UseFont = false; - this.xrLabel5.Text = "[CustomerSalutation] [CustomerLastName],"; - // - // xrLabel6 - // - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 362.0834F); - 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(666.9999F, 23.25F); - this.xrLabel6.StylePriority.UseFont = false; - this.xrLabel6.Text = "für den Betreuungszeitraum [AccountingPeriod] berechnen wir folgende Leistungen:\r" + - "\n"; - // - // xrLabel10 - // - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 50F); - 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"; - // - // xrLabel7 - // - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(6.357829E-05F, 125F); - this.xrLabel7.Name = "xrLabel7"; - this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(225F, 17F); - this.xrLabel7.StylePriority.UseFont = false; - this.xrLabel7.Text = "Agnieszka Sujka-Link"; - // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // + // xrTable2 + // + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(367.0001F, 74.79169F); + this.xrTable2.Name = "xrTable2"; + this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow2, + this.xrTableRow5, + this.xrTableRow3, + this.xrTableRow8}); + this.xrTable2.SizeF = new System.Drawing.SizeF(283F, 77F); + // + // xrTableRow2 + // + this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell4}); + this.xrTableRow2.Name = "xrTableRow2"; + this.xrTableRow2.Weight = 0.13245033112582783D; + // + // xrTableCell4 + // + this.xrTableCell4.CanShrink = true; + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell4.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrTableCell4.StylePriority.UseFont = false; + this.xrTableCell4.StylePriority.UseTextAlignment = false; + this.xrTableCell4.Text = "Ihre Ansprechpartnerin:"; + this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell4.Weight = 1D; + // + // xrTableRow5 + // + this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell13}); + this.xrTableRow5.Name = "xrTableRow5"; + this.xrTableRow5.Weight = 0.13245033112582783D; + // + // xrTableCell13 + // + this.xrTableCell13.CanShrink = true; + this.xrTableCell13.Name = "xrTableCell13"; + this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell13.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrTableCell13.StylePriority.UseFont = false; + this.xrTableCell13.StylePriority.UseTextAlignment = false; + this.xrTableCell13.Text = "[SenderContactPerson]"; + this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell13.Weight = 1D; + // + // xrTableRow3 + // + this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell8}); + this.xrTableRow3.Name = "xrTableRow3"; + this.xrTableRow3.Weight = 0.13245033112582783D; + // + // xrTableCell8 + // + this.xrTableCell8.CanShrink = true; + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell8.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrTableCell8.StylePriority.UseFont = false; + this.xrTableCell8.StylePriority.UseTextAlignment = false; + this.xrTableCell8.Text = "[SenderContactPersonMail]"; + this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell8.Weight = 1D; + // + // xrTableRow8 + // + this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell5}); + this.xrTableRow8.Name = "xrTableRow8"; + this.xrTableRow8.Weight = 0.11258278145695365D; + // + // xrTableCell5 + // + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell5.Weight = 1D; + // + // xrLabel14 + // + this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "CreatorName")}); + this.xrLabel14.Font = new System.Drawing.Font("Verdana", 10F); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 262.5F); + 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); + this.xrLabel14.StylePriority.UseFont = false; + this.xrLabel14.Text = "[CreatorName]"; + // + // xrLabel4 + // + this.xrLabel4.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 48.95833F); + 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(645.4999F, 120.125F); + this.xrLabel4.StylePriority.UseFont = false; + this.xrLabel4.Text = resources.GetString("xrLabel4.Text"); + // // SelbstzahlerRechnungDue // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -617,8 +633,8 @@ namespace BeWoAuxilio this.Watermark.Image = ((System.Drawing.Image)(resources.GetObject("SelbstzahlerRechnungDue.Watermark.Image"))); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -655,19 +671,20 @@ namespace BeWoAuxilio private DevExpress.XtraReports.UI.XRLabel lblAdresse; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; private DevExpress.XtraReports.UI.XRLabel xrLabel1; - private DevExpress.XtraReports.UI.XRTable xrTable1; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow7; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow9; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow11; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow12; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; private DevExpress.XtraReports.UI.XRLabel xrLabel20; private DevExpress.XtraReports.UI.XRLabel xrLabel5; private DevExpress.XtraReports.UI.XRLabel xrLabel6; private DevExpress.XtraReports.UI.XRLabel xrLabel10; - private DevExpress.XtraReports.UI.XRLabel xrLabel7; + private DevExpress.XtraReports.UI.XRTable xrTable2; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow5; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow8; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; + private DevExpress.XtraReports.UI.XRLabel xrLabel4; + private DevExpress.XtraReports.UI.XRLabel xrLabel14; } } diff --git a/ReportImp/BeWoAuxilio/RechnungSelbstzahlerDue.resx b/ReportImp/BeWoAuxilio/RechnungSelbstzahlerDue.resx index 1dd4868ed..01d78c629 100644 --- a/ReportImp/BeWoAuxilio/RechnungSelbstzahlerDue.resx +++ b/ReportImp/BeWoAuxilio/RechnungSelbstzahlerDue.resx @@ -117,6 +117,14 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Wir bitten um Ãœberweisung des Rechnungsbetrags innerhalb von 14 Tagen ohne Abzug auf das folgende Konto: + +Bankverbindung: BeWo-Auxilio GbR +Bank: DKB +IBAN: DE63 1203 0000 1020 9436 90 +BIC: BYLADEM1001 + 17, 17 diff --git a/ReportImp/BeWoAuxilio/RechnungSelbstzahlerNe.Designer.cs b/ReportImp/BeWoAuxilio/RechnungSelbstzahlerNe.Designer.cs index fb4e3ce41..26a2ae59a 100644 --- a/ReportImp/BeWoAuxilio/RechnungSelbstzahlerNe.Designer.cs +++ b/ReportImp/BeWoAuxilio/RechnungSelbstzahlerNe.Designer.cs @@ -36,17 +36,9 @@ namespace BeWoAuxilio this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); @@ -70,15 +62,24 @@ namespace BeWoAuxilio this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -114,10 +115,10 @@ namespace BeWoAuxilio // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable2, this.xrLabel4, this.xrLabel6, this.xrLabel5, - this.xrTable1, this.lblAdresse, this.xrLabel3, this.xrLabel2, @@ -127,6 +128,26 @@ namespace BeWoAuxilio this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // + // xrLabel4 + // + this.xrLabel4.BackColor = System.Drawing.Color.Transparent; + this.xrLabel4.CanShrink = true; + this.xrLabel4.Font = new System.Drawing.Font("Arial", 9F); + this.xrLabel4.ForeColor = System.Drawing.Color.Gray; + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F); + 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(291.9999F, 33.74999F); + this.xrLabel4.StylePriority.UseBackColor = false; + this.xrLabel4.StylePriority.UseBorderColor = false; + this.xrLabel4.StylePriority.UseFont = false; + this.xrLabel4.StylePriority.UseForeColor = false; + this.xrLabel4.StylePriority.UseTextAlignment = false; + this.xrLabel4.Text = "BeWo-Auxilio GbR - Kanalstr.8 - 41460 Neuss\r\n"; + this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; + this.xrLabel4.WordWrap = false; + // // xrLabel6 // this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 362.0834F); @@ -148,87 +169,6 @@ namespace BeWoAuxilio this.xrLabel5.StylePriority.UseFont = false; this.xrLabel5.Text = "[CustomerSalutation] [CustomerLastName],"; // - // xrTable1 - // - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(367.0001F, 80.00002F); - this.xrTable1.Name = "xrTable1"; - this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow7, - this.xrTableRow9, - this.xrTableRow11, - this.xrTableRow12}); - this.xrTable1.SizeF = new System.Drawing.SizeF(283F, 77F); - // - // xrTableRow7 - // - this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell3}); - this.xrTableRow7.Name = "xrTableRow7"; - this.xrTableRow7.Weight = 0.13245033112582783D; - // - // xrTableCell3 - // - this.xrTableCell3.CanShrink = true; - this.xrTableCell3.Name = "xrTableCell3"; - this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell3.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell3.StylePriority.UseFont = false; - this.xrTableCell3.StylePriority.UseTextAlignment = false; - this.xrTableCell3.Text = "Ihre Ansprechpartnerin:"; - this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell3.Weight = 1D; - // - // xrTableRow9 - // - this.xrTableRow9.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell6}); - this.xrTableRow9.Name = "xrTableRow9"; - this.xrTableRow9.Weight = 0.13245033112582783D; - // - // xrTableCell6 - // - this.xrTableCell6.CanShrink = true; - this.xrTableCell6.Name = "xrTableCell6"; - this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell6.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell6.StylePriority.UseFont = false; - this.xrTableCell6.StylePriority.UseTextAlignment = false; - this.xrTableCell6.Text = "Agnieszka Sujka-Link"; - this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell6.Weight = 1D; - // - // xrTableRow11 - // - this.xrTableRow11.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell7}); - this.xrTableRow11.Name = "xrTableRow11"; - this.xrTableRow11.Weight = 0.13245033112582783D; - // - // xrTableCell7 - // - this.xrTableCell7.CanShrink = true; - this.xrTableCell7.Name = "xrTableCell7"; - this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell7.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell7.StylePriority.UseFont = false; - this.xrTableCell7.StylePriority.UseTextAlignment = false; - this.xrTableCell7.Text = "E-Mail: agnieszka.link@bewo-auxilio.de"; - this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell7.Weight = 1D; - // - // xrTableRow12 - // - this.xrTableRow12.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell10}); - this.xrTableRow12.Name = "xrTableRow12"; - this.xrTableRow12.Weight = 0.11258278145695365D; - // - // xrTableCell10 - // - this.xrTableCell10.Name = "xrTableCell10"; - this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell10.Weight = 1D; - // // lblAdresse // this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 60.20835F); @@ -531,30 +471,13 @@ namespace BeWoAuxilio // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel10, - this.xrLabel7, + this.xrLabel9, + this.xrLabel14, + this.xrLabel11, this.xrLabel1}); - this.GroupFooter1.HeightF = 206.5833F; + this.GroupFooter1.HeightF = 308.6666F; this.GroupFooter1.Name = "GroupFooter1"; // - // xrLabel10 - // - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 50F); - 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"; - // - // xrLabel7 - // - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(6.357829E-05F, 125F); - this.xrLabel7.Name = "xrLabel7"; - this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(225F, 17F); - this.xrLabel7.StylePriority.UseFont = false; - this.xrLabel7.Text = "Agnieszka Sujka-Link"; - // // xrLabel1 // this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -570,30 +493,123 @@ namespace BeWoAuxilio this.xrLabel1.Text = "xrLabel1"; this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; // - // xrLabel4 - // - this.xrLabel4.BackColor = System.Drawing.Color.Transparent; - this.xrLabel4.CanShrink = true; - this.xrLabel4.Font = new System.Drawing.Font("Arial", 9F); - this.xrLabel4.ForeColor = System.Drawing.Color.Gray; - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F); - 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(291.9999F, 33.74999F); - this.xrLabel4.StylePriority.UseBackColor = false; - this.xrLabel4.StylePriority.UseBorderColor = false; - this.xrLabel4.StylePriority.UseFont = false; - this.xrLabel4.StylePriority.UseForeColor = false; - this.xrLabel4.StylePriority.UseTextAlignment = false; - this.xrLabel4.Text = "BeWo-Auxilio GbR - Kanalstr.8 - 41460 Neuss\r\n"; - this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; - this.xrLabel4.WordWrap = false; - // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // + // xrTable2 + // + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(367.0002F, 77.91669F); + this.xrTable2.Name = "xrTable2"; + this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow2, + this.xrTableRow5, + this.xrTableRow3, + this.xrTableRow8}); + this.xrTable2.SizeF = new System.Drawing.SizeF(283F, 77F); + // + // xrTableRow2 + // + this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell4}); + this.xrTableRow2.Name = "xrTableRow2"; + this.xrTableRow2.Weight = 0.13245033112582783D; + // + // xrTableCell4 + // + this.xrTableCell4.CanShrink = true; + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell4.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrTableCell4.StylePriority.UseFont = false; + this.xrTableCell4.StylePriority.UseTextAlignment = false; + this.xrTableCell4.Text = "Ihre Ansprechpartnerin:"; + this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell4.Weight = 1D; + // + // xrTableRow5 + // + this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell13}); + this.xrTableRow5.Name = "xrTableRow5"; + this.xrTableRow5.Weight = 0.13245033112582783D; + // + // xrTableCell13 + // + this.xrTableCell13.CanShrink = true; + this.xrTableCell13.Name = "xrTableCell13"; + this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell13.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrTableCell13.StylePriority.UseFont = false; + this.xrTableCell13.StylePriority.UseTextAlignment = false; + this.xrTableCell13.Text = "[SenderContactPerson]"; + this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell13.Weight = 1D; + // + // xrTableRow3 + // + this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell8}); + this.xrTableRow3.Name = "xrTableRow3"; + this.xrTableRow3.Weight = 0.13245033112582783D; + // + // xrTableCell8 + // + this.xrTableCell8.CanShrink = true; + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell8.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrTableCell8.StylePriority.UseFont = false; + this.xrTableCell8.StylePriority.UseTextAlignment = false; + this.xrTableCell8.Text = "[SenderContactPersonMail]"; + this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell8.Weight = 1D; + // + // xrTableRow8 + // + this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell5}); + this.xrTableRow8.Name = "xrTableRow8"; + this.xrTableRow8.Weight = 0.11258278145695365D; + // + // xrTableCell5 + // + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell5.Weight = 1D; + // + // xrLabel9 + // + this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 189.0624F); + this.xrLabel9.Name = "xrLabel9"; + this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel9.SizeF = new System.Drawing.SizeF(175F, 17F); + this.xrLabel9.StylePriority.UseFont = false; + this.xrLabel9.Text = "Mit freundlichen Grüßen"; + // + // xrLabel14 + // + this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "CreatorName")}); + this.xrLabel14.Font = new System.Drawing.Font("Verdana", 10F); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 261.9792F); + 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); + this.xrLabel14.StylePriority.UseFont = false; + this.xrLabel14.Text = "[CreatorName]"; + // + // xrLabel11 + // + this.xrLabel11.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 48.4375F); + this.xrLabel11.Multiline = true; + this.xrLabel11.Name = "xrLabel11"; + this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(645.4999F, 120.125F); + this.xrLabel11.StylePriority.UseFont = false; + this.xrLabel11.Text = resources.GetString("xrLabel11.Text"); + // // SelbstzahlerRechnungNe // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -614,10 +630,10 @@ namespace BeWoAuxilio this.PaperKind = System.Drawing.Printing.PaperKind.A4; this.Version = "17.1"; this.Watermark.Image = ((System.Drawing.Image)(resources.GetObject("SelbstzahlerRechnungNe.Watermark.Image"))); - ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -654,19 +670,20 @@ namespace BeWoAuxilio private DevExpress.XtraReports.UI.XRLabel lblAdresse; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; private DevExpress.XtraReports.UI.XRLabel xrLabel1; - private DevExpress.XtraReports.UI.XRTable xrTable1; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow7; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow9; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow11; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow12; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; private DevExpress.XtraReports.UI.XRLabel xrLabel5; private DevExpress.XtraReports.UI.XRLabel xrLabel6; - private DevExpress.XtraReports.UI.XRLabel xrLabel10; - private DevExpress.XtraReports.UI.XRLabel xrLabel7; private DevExpress.XtraReports.UI.XRLabel xrLabel4; + private DevExpress.XtraReports.UI.XRTable xrTable2; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow5; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow8; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; + private DevExpress.XtraReports.UI.XRLabel xrLabel9; + private DevExpress.XtraReports.UI.XRLabel xrLabel14; + private DevExpress.XtraReports.UI.XRLabel xrLabel11; } } diff --git a/ReportImp/BeWoAuxilio/RechnungSelbstzahlerNe.resx b/ReportImp/BeWoAuxilio/RechnungSelbstzahlerNe.resx index dacbc5584..15c734f54 100644 --- a/ReportImp/BeWoAuxilio/RechnungSelbstzahlerNe.resx +++ b/ReportImp/BeWoAuxilio/RechnungSelbstzahlerNe.resx @@ -117,6 +117,14 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Wir bitten um Ãœberweisung des Rechnungsbetrags innerhalb von 14 Tagen ohne Abzug auf das folgende Konto: + +Bankverbindung: BeWo-Auxilio GbR +Bank: DKB +IBAN: DE42 1203 0000 1020 3193 88 +BIC: BYLADEM1001 + 17, 17 diff --git a/ReportImp/KomMitBewo/CustomReportCreator.cs b/ReportImp/KomMitBewo/CustomReportCreator.cs index 414ab924c..252c8a694 100644 --- a/ReportImp/KomMitBewo/CustomReportCreator.cs +++ b/ReportImp/KomMitBewo/CustomReportCreator.cs @@ -15,19 +15,7 @@ namespace KommMit public override XtraReport CreateQueryReport(long queryOid, string queryReportId) { if (queryOid == 100) - // { - // var report = new Jahresabgrenzung(); - // var ro = FinanceRO.Create(new DateTime(2021, 1, 1), new DateTime(2021, 12, 31)); - - // report.SetReportDataSource(ro); - // return report; - // } - - // return base.CreateQueryReport(queryOid, queryReportId); - //} - { return CreateJahresabgrenzung(queryOid, queryReportId); - } return base.CreateQueryReport(queryOid, queryReportId); } @@ -40,9 +28,7 @@ namespace KommMit return new XtraReport(); var path = Path.Combine(TempPath, queryReportId + ".xml"); - var table = Utils.XMLDeserialize(path); - var qro = QueryRO.Create(query, table); @@ -51,10 +37,6 @@ namespace KommMit DateTime monat = DateTime.Parse(qro.Rows[0].Field1.ToString()); DateTime start = new DateTime(monat.Year, 1, 1); DateTime end = monat.AddMonths(1).AddDays(-1); - //var ro = new FinanceRO(); - //ro.ReportStartDate = new DateTime(monat.Year, 1, 1); - //ro.ReportEndDate = new DateTime(monat.Year, 12, 31); // monat.AddMonths(1).AddSeconds(-1); - var ro = FinanceRO.Create(start, end); var druck = new Jahresabgrenzung(); @@ -62,7 +44,6 @@ namespace KommMit return druck; } - return new XtraReport(); } } diff --git a/ReportImp/KomMitBewo/Jahresabgrenzung.cs b/ReportImp/KomMitBewo/Jahresabgrenzung.cs index 14f0b021a..0a6ffe4e5 100644 --- a/ReportImp/KomMitBewo/Jahresabgrenzung.cs +++ b/ReportImp/KomMitBewo/Jahresabgrenzung.cs @@ -22,7 +22,9 @@ using DevExpress.XtraEditors.Controls; namespace KommMit { - public partial class Jahresabgrenzung : DevExpress.XtraReports.UI.XtraReport //, IBeWoReport + public partial class Jahresabgrenzung : DevExpress.XtraReports.UI.XtraReport + //Buchhaltärischer Stand aller aktiven HP und Klienten: Werte für fiktive Spitzabrechnung zum gewählten Monatsende über gesamte Laufzeit des HP + //-> HP aktiv, wenn Hilfeplan bis mind. zum Stichtag läuft und die Betreuung des Klient frühestens zum Stichtag beendet wurde { private Dictionary> customer2CostbearerSupportConcepts = new Dictionary>(); @@ -38,7 +40,7 @@ namespace KommMit DateTime start = pRO.ReportStartDate.Value; DateTime end = pRO.ReportEndDate.Value; - lblTitel.Text = String.Format("Jahresabgrenzung der laufenden Hilfepläne {0:yyyy}", start); + lblTitel.Text = String.Format("Abgrenzung der laufenden Hilfepläne zum {0:dd.MM.yyyy}", end); } else @@ -70,8 +72,8 @@ namespace KommMit { if (scRo.Costbearer2Supportconcept.SupportConcept.ActivationType == ActivationTypeId.Active && scRo.Costbearer2Supportconcept.SupportConcept.EndDate >= ro.ReportEndDate - && !scRo.Costbearer2Supportconcept.SupportConcept.Customer.TerminationDate.HasValue - || scRo.Costbearer2Supportconcept.SupportConcept.Customer.TerminationDate > ro.ReportEndDate) + && (!scRo.Costbearer2Supportconcept.SupportConcept.Customer.TerminationDate.HasValue + || scRo.Costbearer2Supportconcept.SupportConcept.Customer.TerminationDate >= ro.ReportEndDate)) { var entry = CreateEntry(ro, scRo); result.Entries.Add(entry); @@ -94,7 +96,6 @@ namespace KommMit BerechneStunden(fro, entry, c2s, scRo); SetzeHilfeplanInfos(entry, c2s); - //SetzeCustomerInfos(entry, c2s.SupportConcept.Customer); } return entry; diff --git a/ReportImp/KomMitBewo/Jahresabgrenzung.designer.cs b/ReportImp/KomMitBewo/Jahresabgrenzung.designer.cs index 1491d9e2d..2683631fb 100644 --- a/ReportImp/KomMitBewo/Jahresabgrenzung.designer.cs +++ b/ReportImp/KomMitBewo/Jahresabgrenzung.designer.cs @@ -283,7 +283,7 @@ namespace KommMit this.lblTitel.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.lblTitel.SizeF = new System.Drawing.SizeF(510F, 23F); this.lblTitel.StylePriority.UseFont = false; - this.lblTitel.Text = "Jahresabgrenzung"; + this.lblTitel.Text = "Abgrenzung der laufenden Hilfepläne"; // // DetailReport // @@ -359,7 +359,7 @@ namespace KommMit this.xrTableCell28.Multiline = true; this.xrTableCell28.Name = "xrTableCell28"; this.xrTableCell28.StylePriority.UseTextAlignment = false; - this.xrTableCell28.Text = "Kostentr�ger"; + this.xrTableCell28.Text = "Kostenträger"; this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell28.Weight = 0.62038404538544878D; // @@ -435,7 +435,7 @@ namespace KommMit this.xrTableCell25.Name = "xrTableCell25"; this.xrTableCell25.StylePriority.UseBackColor = false; this.xrTableCell25.StylePriority.UseTextAlignment = false; - this.xrTableCell25.Text = "Bis dato Abschl�ge Spitzabr."; + this.xrTableCell25.Text = "Bis dato Abschläge Spitzabr."; this.xrTableCell25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell25.Weight = 0.44313149614141517D; // @@ -554,7 +554,7 @@ namespace KommMit new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.SupportConceptFinance.ApprovedHours")}); this.xrTableCell20.Name = "xrTableCell20"; this.xrTableCell20.StylePriority.UseTextAlignment = false; - xrSummary2.FormatString = "{0:0.00}"; + xrSummary2.FormatString = "{0:n2}"; xrSummary2.IgnoreNullValues = true; xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; this.xrTableCell20.Summary = xrSummary2; @@ -568,7 +568,7 @@ namespace KommMit new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.SupportConceptFinance.BillableHours")}); this.xrTableCell23.Name = "xrTableCell23"; this.xrTableCell23.StylePriority.UseTextAlignment = false; - xrSummary3.FormatString = "{0:0.00}"; + xrSummary3.FormatString = "{0:n2}"; xrSummary3.IgnoreNullValues = true; xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; this.xrTableCell23.Summary = xrSummary3; @@ -582,7 +582,7 @@ namespace KommMit new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.SupportConceptFinance.BillableHoursInReportTimeSpanWithFactor")}); this.xrTableCell24.Name = "xrTableCell24"; this.xrTableCell24.StylePriority.UseTextAlignment = false; - xrSummary4.FormatString = "{0:0.00}"; + xrSummary4.FormatString = "{0:n2}"; xrSummary4.IgnoreNullValues = true; xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; this.xrTableCell24.Summary = xrSummary4; diff --git a/ReportImp/KomMitBewo/KomMitBewo.csproj b/ReportImp/KomMitBewo/KomMitBewo.csproj index 821012cc5..4b67ff2a6 100644 --- a/ReportImp/KomMitBewo/KomMitBewo.csproj +++ b/ReportImp/KomMitBewo/KomMitBewo.csproj @@ -75,6 +75,12 @@ Mitarbeiterstundenkonto.cs + + Component + + + RechnungSelbstzahlerDue.cs + Component @@ -111,6 +117,9 @@ Designer + + RechnungSelbstzahlerDue.cs + ServicesOverviewReport.cs