diff --git a/ReportImp/BeWoRimbach/ServiceInvoiceReport.Designer.cs b/ReportImp/BeWoRimbach/ServiceInvoiceReport.Designer.cs
index a7b7411d9..ebebe593d 100644
--- a/ReportImp/BeWoRimbach/ServiceInvoiceReport.Designer.cs
+++ b/ReportImp/BeWoRimbach/ServiceInvoiceReport.Designer.cs
@@ -32,10 +32,21 @@ namespace BeWoRimbach
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.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
+ this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
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.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.RecipientPostCodeAndTown = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel_RecipientStreet = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel_RecipientDivision = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel_RecipientContactPerson = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.lblAbrechnungszeitraum = new DevExpress.XtraReports.UI.XRLabel();
@@ -58,32 +69,22 @@ namespace BeWoRimbach
this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
- this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
- this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
- this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
- this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
- this.RecipientPostCodeAndTown = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel_RecipientStreet = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel_RecipientDivision = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel_RecipientContactPerson = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
- this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
- ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+ this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
+ this.lblZahlziel = new DevExpress.XtraReports.UI.XRLabel();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
+ ((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)).BeginInit();
//
// Detail
@@ -103,6 +104,27 @@ namespace BeWoRimbach
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
+ // xrPictureBox1
+ //
+ this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
+ this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(472.1251F, 18.83332F);
+ this.xrPictureBox1.Name = "xrPictureBox1";
+ this.xrPictureBox1.SizeF = new System.Drawing.SizeF(204.375F, 117.9584F);
+ this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+ //
+ // xrLabel6
+ //
+ this.xrLabel6.BackColor = System.Drawing.Color.Gainsboro;
+ this.xrLabel6.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrLabel6.Name = "xrLabel6";
+ this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel6.SizeF = new System.Drawing.SizeF(676.5001F, 18.83334F);
+ this.xrLabel6.StylePriority.UseBackColor = false;
+ this.xrLabel6.StylePriority.UseBorders = false;
+ //
// ruleRateFactorNull
//
this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
@@ -122,6 +144,24 @@ namespace BeWoRimbach
this.bottomMarginBand1.HeightF = 153.8334F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
+ // xrRichText1
+ //
+ this.xrRichText1.Font = new System.Drawing.Font("Verdana", 9F);
+ this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 29.16673F);
+ this.xrRichText1.Name = "xrRichText1";
+ this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
+ this.xrRichText1.SizeF = new System.Drawing.SizeF(365.9583F, 114.6667F);
+ this.xrRichText1.StylePriority.UseFont = false;
+ //
+ // xrRichText2
+ //
+ this.xrRichText2.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(417.4168F, 29.16673F);
+ this.xrRichText2.Name = "xrRichText2";
+ this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
+ this.xrRichText2.SizeF = new System.Drawing.SizeF(259.5833F, 114.6667F);
+ this.xrRichText2.StylePriority.UseFont = false;
+ //
// Page1
//
this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -140,6 +180,84 @@ namespace BeWoRimbach
this.Page1.Name = "Page1";
this.Page1.StylePriority.UseFont = false;
//
+ // RecipientPostCodeAndTown
+ //
+ this.RecipientPostCodeAndTown.CanShrink = true;
+ this.RecipientPostCodeAndTown.Font = new System.Drawing.Font("Verdana", 11F, System.Drawing.FontStyle.Bold);
+ this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0F, 102.5417F);
+ 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_RecipientStreet
+ //
+ this.xrLabel_RecipientStreet.CanShrink = true;
+ this.xrLabel_RecipientStreet.Font = new System.Drawing.Font("Verdana", 11F, System.Drawing.FontStyle.Bold);
+ this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0F, 85.54166F);
+ 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]";
+ //
+ // xrLabel_RecipientDivision
+ //
+ this.xrLabel_RecipientDivision.CanShrink = true;
+ this.xrLabel_RecipientDivision.Font = new System.Drawing.Font("Verdana", 11F, System.Drawing.FontStyle.Bold);
+ this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 68.54166F);
+ 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_RecipientContactPerson
+ //
+ this.xrLabel_RecipientContactPerson.CanShrink = true;
+ this.xrLabel_RecipientContactPerson.Font = new System.Drawing.Font("Verdana", 11F, System.Drawing.FontStyle.Bold);
+ this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0F, 51.54165F);
+ 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]";
+ //
+ // xrLabel7
+ //
+ this.xrLabel7.CanShrink = true;
+ this.xrLabel7.Font = new System.Drawing.Font("Verdana", 11F, System.Drawing.FontStyle.Bold);
+ this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 34.54164F);
+ this.xrLabel7.Name = "xrLabel7";
+ this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel7.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+ this.xrLabel7.SizeF = new System.Drawing.SizeF(292F, 17F);
+ this.xrLabel7.StylePriority.UseFont = false;
+ this.xrLabel7.Text = "[RecipientOrganisation]";
+ //
+ // xrLabel10
+ //
+ this.xrLabel10.Font = new System.Drawing.Font("Verdana", 8F, System.Drawing.FontStyle.Bold);
+ this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrLabel10.Name = "xrLabel10";
+ this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel10.SizeF = new System.Drawing.SizeF(365.9583F, 23F);
+ this.xrLabel10.StylePriority.UseFont = false;
+ this.xrLabel10.Text = "BeWo Rimbach – Postfach 11 06 – 64666 Rimbach ";
+ //
+ // xrPictureBox2
+ //
+ this.xrPictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox2.Image")));
+ this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(450.7083F, 10.00001F);
+ this.xrPictureBox2.Name = "xrPictureBox2";
+ this.xrPictureBox2.SizeF = new System.Drawing.SizeF(226.25F, 135F);
+ this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+ //
// xrLabel2
//
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
@@ -172,8 +290,7 @@ namespace BeWoRimbach
this.lblAbrechnungszeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblAbrechnungszeitraum.SizeF = new System.Drawing.SizeF(642F, 39.91669F);
this.lblAbrechnungszeitraum.StylePriority.UseFont = false;
- this.lblAbrechnungszeitraum.Text = "Für die laut beigefügter Auflistung erbrachten Fachleistungsstunden im Betreuten " +
- "Wohnen, erlauben wir uns wie folgt zu berechnen:";
+ this.lblAbrechnungszeitraum.Text = "hiermit berechnen wir für den Monat ... folgende erbrachte Tätigkeiten:";
//
// DetailReport
//
@@ -427,143 +544,12 @@ namespace BeWoRimbach
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
- this.xrTable1,
- this.xrLabel3});
+ this.xrLabel3,
+ this.lblZahlziel,
+ this.xrTable1});
this.GroupFooter1.HeightF = 157.625F;
this.GroupFooter1.Name = "GroupFooter1";
//
- // bindingSource1
- //
- this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
- //
- // xrPictureBox1
- //
- this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
- this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(472.1251F, 18.83332F);
- this.xrPictureBox1.Name = "xrPictureBox1";
- this.xrPictureBox1.SizeF = new System.Drawing.SizeF(204.375F, 117.9584F);
- this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
- //
- // xrLabel6
- //
- this.xrLabel6.BackColor = System.Drawing.Color.Gainsboro;
- this.xrLabel6.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
- | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
- this.xrLabel6.Name = "xrLabel6";
- this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel6.SizeF = new System.Drawing.SizeF(676.5001F, 18.83334F);
- this.xrLabel6.StylePriority.UseBackColor = false;
- this.xrLabel6.StylePriority.UseBorders = false;
- //
- // xrPictureBox2
- //
- this.xrPictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox2.Image")));
- this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(450.7083F, 10.00001F);
- this.xrPictureBox2.Name = "xrPictureBox2";
- this.xrPictureBox2.SizeF = new System.Drawing.SizeF(226.25F, 135F);
- this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
- //
- // xrLabel10
- //
- this.xrLabel10.Font = new System.Drawing.Font("Verdana", 8F, System.Drawing.FontStyle.Bold);
- this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
- this.xrLabel10.Name = "xrLabel10";
- this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel10.SizeF = new System.Drawing.SizeF(365.9583F, 23F);
- this.xrLabel10.StylePriority.UseFont = false;
- this.xrLabel10.Text = "BeWo Rimbach – Postfach 11 06 – 64666 Rimbach ";
- //
- // RecipientPostCodeAndTown
- //
- this.RecipientPostCodeAndTown.CanShrink = true;
- this.RecipientPostCodeAndTown.Font = new System.Drawing.Font("Verdana", 11F, System.Drawing.FontStyle.Bold);
- this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0F, 102.5417F);
- 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_RecipientStreet
- //
- this.xrLabel_RecipientStreet.CanShrink = true;
- this.xrLabel_RecipientStreet.Font = new System.Drawing.Font("Verdana", 11F, System.Drawing.FontStyle.Bold);
- this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0F, 85.54166F);
- 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]";
- //
- // xrLabel_RecipientDivision
- //
- this.xrLabel_RecipientDivision.CanShrink = true;
- this.xrLabel_RecipientDivision.Font = new System.Drawing.Font("Verdana", 11F, System.Drawing.FontStyle.Bold);
- this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 68.54166F);
- 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_RecipientContactPerson
- //
- this.xrLabel_RecipientContactPerson.CanShrink = true;
- this.xrLabel_RecipientContactPerson.Font = new System.Drawing.Font("Verdana", 11F, System.Drawing.FontStyle.Bold);
- this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0F, 51.54165F);
- 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]";
- //
- // xrLabel7
- //
- this.xrLabel7.CanShrink = true;
- this.xrLabel7.Font = new System.Drawing.Font("Verdana", 11F, System.Drawing.FontStyle.Bold);
- this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 34.54164F);
- this.xrLabel7.Name = "xrLabel7";
- this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel7.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
- this.xrLabel7.SizeF = new System.Drawing.SizeF(292F, 17F);
- this.xrLabel7.StylePriority.UseFont = false;
- this.xrLabel7.Text = "[RecipientOrganisation]";
- //
- // xrLabel3
- //
- this.xrLabel3.Font = new System.Drawing.Font("Verdana", 10F);
- this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0.4999796F, 68.04161F);
- this.xrLabel3.Multiline = true;
- this.xrLabel3.Name = "xrLabel3";
- this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel3.SizeF = new System.Drawing.SizeF(676.5001F, 89.58334F);
- this.xrLabel3.StylePriority.UseFont = false;
- this.xrLabel3.Text = resources.GetString("xrLabel3.Text");
- //
- // xrRichText1
- //
- this.xrRichText1.Font = new System.Drawing.Font("Verdana", 9F);
- this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 29.16673F);
- this.xrRichText1.Name = "xrRichText1";
- this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
- this.xrRichText1.SizeF = new System.Drawing.SizeF(365.9583F, 114.6667F);
- this.xrRichText1.StylePriority.UseFont = false;
- //
- // xrRichText2
- //
- this.xrRichText2.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(417.4168F, 29.16673F);
- this.xrRichText2.Name = "xrRichText2";
- this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
- this.xrRichText2.SizeF = new System.Drawing.SizeF(259.5833F, 114.6667F);
- this.xrRichText2.StylePriority.UseFont = false;
- //
// xrTable1
//
this.xrTable1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -627,6 +613,23 @@ namespace BeWoRimbach
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell3.Weight = 0.23245943032832414D;
//
+ // xrTableCell4
+ //
+ this.xrTableCell4.BorderColor = System.Drawing.Color.DarkGray;
+ this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold);
+ this.xrTableCell4.Name = "xrTableCell4";
+ this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+ this.xrTableCell4.StylePriority.UseBorderColor = false;
+ this.xrTableCell4.StylePriority.UseBorders = false;
+ this.xrTableCell4.StylePriority.UseFont = false;
+ this.xrTableCell4.StylePriority.UsePadding = false;
+ this.xrTableCell4.StylePriority.UseTextAlignment = false;
+ this.xrTableCell4.Text = "Summe";
+ this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell4.Weight = 0.2893277257020575D;
+ //
// xrTableCell5
//
this.xrTableCell5.BorderColor = System.Drawing.Color.DarkGray;
@@ -644,22 +647,32 @@ namespace BeWoRimbach
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell5.Weight = 0.31923915575667006D;
//
- // xrTableCell4
+ // xrLabel3
//
- this.xrTableCell4.BorderColor = System.Drawing.Color.DarkGray;
- this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableCell4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold);
- this.xrTableCell4.Name = "xrTableCell4";
- this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
- this.xrTableCell4.StylePriority.UseBorderColor = false;
- this.xrTableCell4.StylePriority.UseBorders = false;
- this.xrTableCell4.StylePriority.UseFont = false;
- this.xrTableCell4.StylePriority.UsePadding = false;
- this.xrTableCell4.StylePriority.UseTextAlignment = false;
- this.xrTableCell4.Text = "Summe";
- this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
- this.xrTableCell4.Weight = 0.2893277257020575D;
+ this.xrLabel3.Font = new System.Drawing.Font("Verdana", 10F);
+ this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 123.6043F);
+ this.xrLabel3.Multiline = true;
+ this.xrLabel3.Name = "xrLabel3";
+ this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel3.SizeF = new System.Drawing.SizeF(676.5001F, 34.02074F);
+ this.xrLabel3.StylePriority.UseFont = false;
+ this.xrLabel3.Text = "Die abgerechneten Leistungen sind gemäß § 4, Nr. 16 h UStG umsatzsteuerbefreit.";
+ //
+ // lblZahlziel
+ //
+ this.lblZahlziel.Font = new System.Drawing.Font("Verdana", 10F);
+ this.lblZahlziel.LocationFloat = new DevExpress.Utils.PointFloat(0F, 68.39594F);
+ this.lblZahlziel.Multiline = true;
+ this.lblZahlziel.Name = "lblZahlziel";
+ this.lblZahlziel.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.lblZahlziel.SizeF = new System.Drawing.SizeF(676.5001F, 55.20834F);
+ this.lblZahlziel.StylePriority.UseFont = false;
+ this.lblZahlziel.Text = "Bitte überweisen Sie den Betrag in Höhe von [GrossClaim] unter Angabe der Rechnun" +
+ "gsnummer\r\nbis zum Zahlungsziel auf das unten angeführte Konto.";
+ //
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// ServiceInvoiceReport
//
@@ -680,12 +693,12 @@ namespace BeWoRimbach
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.Version = "17.1";
- ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
+ ((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)).EndInit();
}
@@ -739,5 +752,6 @@ namespace BeWoRimbach
private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
+ private DevExpress.XtraReports.UI.XRLabel lblZahlziel;
}
}
diff --git a/ReportImp/BeWoRimbach/ServiceInvoiceReport.cs b/ReportImp/BeWoRimbach/ServiceInvoiceReport.cs
index 4f211fc51..80085eff8 100644
--- a/ReportImp/BeWoRimbach/ServiceInvoiceReport.cs
+++ b/ReportImp/BeWoRimbach/ServiceInvoiceReport.cs
@@ -26,7 +26,15 @@ namespace BeWoRimbach
lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Zeitraum {0:MMMM yyyy} - {1:MMMM yyyy} folgende erbrachte Tätigkeiten:", start, end);
}
- this.bindingSource1.DataSource = pRO;
+ DateTime zahlziel;
+ if (pRO.InvoiceDateTime != null)
+ {
+ zahlziel = (pRO.InvoiceDateTime ?? DateTime.Now).AddDays(14);
+ lblZahlziel.Text = String.Format("Bitte überweisen Sie den Betrag in Höhe von {0:0.00} unter Angabe der Rechnungsnummer bis zum {1:dd.MM.yyyy} auf das unten angeführte Konto.", pRO.GrossClaim, zahlziel);
+ }
+
+
+ this.bindingSource1.DataSource = pRO;
}
}
}
\ No newline at end of file
diff --git a/ReportImp/BeWoRimbach/ServiceInvoiceReport.resx b/ReportImp/BeWoRimbach/ServiceInvoiceReport.resx
index dddfa7465..745599540 100644
--- a/ReportImp/BeWoRimbach/ServiceInvoiceReport.resx
+++ b/ReportImp/BeWoRimbach/ServiceInvoiceReport.resx
@@ -1783,12 +1783,6 @@
l6O3Rwqf+JU8bFtI5AhtPCm9uobM4bNjQkbRwBeVXRHw+LZMbBxXj46VibrSSVsyAFYc72TCpfb3h1GU
v2dMWC50RsnGF0wpoyhTOBNp4pd72LaQyBeAiwnDxYThYkKxrv8D8l1ABgCIhA0AAAAASUVORK5CYII=
-
-
- Bitte überweisen Sie den Betrag in Höhe von [GrossClaim] unter Angabe der Rechnungsnummer
-bis zum 14.08.2021 auf das unten angeführte Konto.
-
-Die abgerechneten Leistungen sind gemäß § 4, Nr. 16 h UStG umsatzsteuerbefreit.
17, 17