diff --git a/ReportImp/VereinZurIntegrationChemnitz/RechnungABW67.Designer.cs b/ReportImp/VereinZurIntegrationChemnitz/RechnungABW67.Designer.cs
index 45be9de8e..d0106f466 100644
--- a/ReportImp/VereinZurIntegrationChemnitz/RechnungABW67.Designer.cs
+++ b/ReportImp/VereinZurIntegrationChemnitz/RechnungABW67.Designer.cs
@@ -37,6 +37,7 @@ namespace VereinZurIntegrationChemnitz
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
@@ -49,7 +50,6 @@ namespace VereinZurIntegrationChemnitz
this.Detail3 = new DevExpress.XtraReports.UI.DetailBand();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -99,6 +99,16 @@ namespace VereinZurIntegrationChemnitz
this.Page1.Name = "Page1";
this.Page1.StylePriority.UseFont = false;
//
+ // xrRichText1
+ //
+ this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+ this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 350.7917F);
+ this.xrRichText1.Name = "xrRichText1";
+ this.xrRichText1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
+ this.xrRichText1.SizeF = new System.Drawing.SizeF(650F, 163.7084F);
+ this.xrRichText1.StylePriority.UseFont = false;
+ //
// lblAdresse
//
this.lblAdresse.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
@@ -224,16 +234,6 @@ namespace VereinZurIntegrationChemnitz
this.xrLabel15.StylePriority.UseFont = false;
this.xrLabel15.Text = "Mit freundlichen Grüßen";
//
- // xrRichText1
- //
- this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
- this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 350.7917F);
- this.xrRichText1.Name = "xrRichText1";
- this.xrRichText1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
- this.xrRichText1.SizeF = new System.Drawing.SizeF(650F, 163.7084F);
- this.xrRichText1.StylePriority.UseFont = false;
- //
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
diff --git a/ReportImp/VereinZurIntegrationChemnitz/RechnungEigenanteil.Designer.cs b/ReportImp/VereinZurIntegrationChemnitz/RechnungEigenanteil.Designer.cs
index aa9ee5f68..59f295a32 100644
--- a/ReportImp/VereinZurIntegrationChemnitz/RechnungEigenanteil.Designer.cs
+++ b/ReportImp/VereinZurIntegrationChemnitz/RechnungEigenanteil.Designer.cs
@@ -29,29 +29,33 @@ namespace VereinZurIntegrationChemnitz
///
private void InitializeComponent()
{
- this.components = new System.ComponentModel.Container();
DevExpress.XtraPrinting.Drawing.Watermark watermark1 = new DevExpress.XtraPrinting.Drawing.Watermark();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RechnungEigenanteil));
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.lblAddress = new DevExpress.XtraReports.UI.XRLabel();
- this.lblAbrechnungstext = new DevExpress.XtraReports.UI.XRLabel();
+ this.lblAbrechnungstext1 = new DevExpress.XtraReports.UI.XRLabel();
this.lblAnrede = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
- this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
- this.lblNotice = new DevExpress.XtraReports.UI.XRLabel();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
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.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.lblAbrechnungstext2 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
@@ -67,13 +71,10 @@ namespace VereinZurIntegrationChemnitz
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel1,
this.lblAddress,
- this.lblAbrechnungstext,
- this.lblAnrede,
- this.xrLabel4,
- this.xrLabel3,
- this.xrLabel2});
+ this.lblAbrechnungstext1,
+ this.lblAnrede});
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
- this.ReportHeader.HeightF = 518.875F;
+ this.ReportHeader.HeightF = 454.2917F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
@@ -82,7 +83,7 @@ namespace VereinZurIntegrationChemnitz
this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
- this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(424.9583F, 297.9167F);
+ this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(426F, 307.2917F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(201.0417F, 23.95834F);
@@ -93,6 +94,7 @@ namespace VereinZurIntegrationChemnitz
//
// lblAddress
//
+ this.lblAddress.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.lblAddress.LocationFloat = new DevExpress.Utils.PointFloat(0F, 77.79166F);
this.lblAddress.Multiline = true;
this.lblAddress.Name = "lblAddress";
@@ -102,18 +104,20 @@ namespace VereinZurIntegrationChemnitz
this.lblAddress.Text = "[RecipientOrganisation]\r\n[RecipientDivision]\r\n[RecipientFirstName] [RecipientLast" +
"Name]\r\n[RecipientStreet]\r\n[RecipientPostCode] [RecipientTown]";
//
- // lblAbrechnungstext
+ // lblAbrechnungstext1
//
- this.lblAbrechnungstext.LocationFloat = new DevExpress.Utils.PointFloat(0F, 444.7917F);
- this.lblAbrechnungstext.Multiline = true;
- this.lblAbrechnungstext.Name = "lblAbrechnungstext";
- this.lblAbrechnungstext.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.lblAbrechnungstext.SizeF = new System.Drawing.SizeF(666.9999F, 74.08334F);
- this.lblAbrechnungstext.StylePriority.UseFont = false;
+ this.lblAbrechnungstext1.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+ this.lblAbrechnungstext1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 380.2083F);
+ this.lblAbrechnungstext1.Multiline = true;
+ this.lblAbrechnungstext1.Name = "lblAbrechnungstext1";
+ this.lblAbrechnungstext1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.lblAbrechnungstext1.SizeF = new System.Drawing.SizeF(666.9999F, 74.08334F);
+ this.lblAbrechnungstext1.StylePriority.UseFont = false;
//
// lblAnrede
//
- this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 413.875F);
+ this.lblAnrede.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+ this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 349.2917F);
this.lblAnrede.Multiline = true;
this.lblAnrede.Name = "lblAnrede";
this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -121,52 +125,6 @@ namespace VereinZurIntegrationChemnitz
this.lblAnrede.StylePriority.UseFont = false;
this.lblAnrede.Text = "[RecipientSalutation]";
//
- // xrLabel4
- //
- this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
- this.xrLabel4.CanShrink = true;
- this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
- new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
- this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 363.875F);
- this.xrLabel4.Multiline = true;
- this.xrLabel4.Name = "xrLabel4";
- this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel4.SizeF = new System.Drawing.SizeF(650F, 17F);
- this.xrLabel4.StylePriority.UseBackColor = false;
- this.xrLabel4.StylePriority.UseFont = false;
- this.xrLabel4.Text = "[CustomerReferenceNumber]";
- this.xrLabel4.WordWrap = false;
- //
- // xrLabel3
- //
- this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
- this.xrLabel3.CanShrink = true;
- this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
- new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
- this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 346.875F);
- this.xrLabel3.Name = "xrLabel3";
- this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 16F);
- this.xrLabel3.StylePriority.UseBackColor = false;
- this.xrLabel3.StylePriority.UseFont = false;
- this.xrLabel3.Text = "Abrechnung über Betreuungsleistungen";
- this.xrLabel3.WordWrap = false;
- //
- // xrLabel2
- //
- this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
- this.xrLabel2.CanShrink = true;
- this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
- new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
- this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 321.875F);
- this.xrLabel2.Name = "xrLabel2";
- this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel2.SizeF = new System.Drawing.SizeF(650F, 17F);
- this.xrLabel2.StylePriority.UseBackColor = false;
- this.xrLabel2.StylePriority.UseFont = false;
- this.xrLabel2.Text = "Rechnung Nr. [InvoiceNumber]";
- this.xrLabel2.WordWrap = false;
- //
// ruleRateFactorNull
//
this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
@@ -176,56 +134,16 @@ namespace VereinZurIntegrationChemnitz
// ReportFooter
//
this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
- this.xrLabel8,
- this.xrLabel10,
- this.xrLabel12,
- this.lblNotice});
+ this.xrLabel15,
+ this.xrLabel14,
+ this.xrLabel5,
+ this.lblAbrechnungstext2});
this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
- this.ReportFooter.HeightF = 247.5417F;
+ this.ReportFooter.HeightF = 334.7917F;
this.ReportFooter.KeepTogether = true;
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
//
- // 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(671.4175F, 18.04168F);
- this.xrLabel8.StylePriority.UseFont = false;
- this.xrLabel8.Text = "[Notice]";
- //
- // xrLabel10
- //
- this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 155.5417F);
- 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";
- //
- // xrLabel12
- //
- this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 230.5417F);
- 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]";
- //
- // lblNotice
- //
- this.lblNotice.CanShrink = true;
- this.lblNotice.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.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:";
- //
// topMarginBand1
//
this.topMarginBand1.Name = "topMarginBand1";
@@ -245,11 +163,139 @@ namespace VereinZurIntegrationChemnitz
//
// Detail1
//
+ this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTable1});
this.Detail1.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F);
this.Detail1.HeightF = 25F;
this.Detail1.Name = "Detail1";
this.Detail1.StylePriority.UseFont = false;
//
+ // xrTable1
+ //
+ this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(163.0617F, 0F);
+ this.xrTable1.Name = "xrTable1";
+ this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F);
+ this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow1});
+ this.xrTable1.SizeF = new System.Drawing.SizeF(330.856F, 25F);
+ //
+ // xrTableRow1
+ //
+ this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell6,
+ this.xrTableCell1,
+ this.xrTableCell2,
+ this.xrTableCell3,
+ this.xrTableCell4});
+ this.xrTableRow1.Name = "xrTableRow1";
+ this.xrTableRow1.Weight = 1D;
+ //
+ // xrTableCell6
+ //
+ this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.UnitCount")});
+ this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+ this.xrTableCell6.Multiline = true;
+ this.xrTableCell6.Name = "xrTableCell6";
+ this.xrTableCell6.StylePriority.UseFont = false;
+ this.xrTableCell6.StylePriority.UseTextAlignment = false;
+ this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell6.TextFormatString = "{0:0.##} Monate";
+ this.xrTableCell6.Weight = 0.48384256795416708D;
+ //
+ // xrTableCell1
+ //
+ this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+ this.xrTableCell1.Multiline = true;
+ this.xrTableCell1.Name = "xrTableCell1";
+ this.xrTableCell1.StylePriority.UseFont = false;
+ this.xrTableCell1.StylePriority.UseTextAlignment = false;
+ this.xrTableCell1.Text = "á ";
+ this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell1.TextFormatString = "{0:0.##}";
+ this.xrTableCell1.Weight = 0.13790190681418824D;
+ //
+ // xrTableCell2
+ //
+ this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.UnitPrice")});
+ this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+ this.xrTableCell2.Multiline = true;
+ this.xrTableCell2.Name = "xrTableCell2";
+ this.xrTableCell2.StylePriority.UseFont = false;
+ this.xrTableCell2.StylePriority.UseTextAlignment = false;
+ this.xrTableCell2.Text = "x";
+ this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell2.TextFormatString = "{0:C}";
+ this.xrTableCell2.Weight = 0.4923275239630861D;
+ //
+ // xrTableCell4
+ //
+ this.xrTableCell4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.AmountTotal")});
+ this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+ this.xrTableCell4.Multiline = true;
+ this.xrTableCell4.Name = "xrTableCell4";
+ this.xrTableCell4.StylePriority.UseFont = false;
+ this.xrTableCell4.StylePriority.UseTextAlignment = false;
+ this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell4.TextFormatString = "{0:c}";
+ this.xrTableCell4.Weight = 0.4514655853698275D;
+ //
+ // xrTableCell3
+ //
+ this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+ this.xrTableCell3.Multiline = true;
+ this.xrTableCell3.Name = "xrTableCell3";
+ this.xrTableCell3.StylePriority.UseFont = false;
+ this.xrTableCell3.StylePriority.UseTextAlignment = false;
+ this.xrTableCell3.Text = "=";
+ this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell3.Weight = 0.23695461282494992D;
+ //
+ // lblAbrechnungstext2
+ //
+ this.lblAbrechnungstext2.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+ this.lblAbrechnungstext2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 129.7084F);
+ this.lblAbrechnungstext2.Multiline = true;
+ this.lblAbrechnungstext2.Name = "lblAbrechnungstext2";
+ this.lblAbrechnungstext2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.lblAbrechnungstext2.SizeF = new System.Drawing.SizeF(666.9999F, 74.08333F);
+ this.lblAbrechnungstext2.StylePriority.UseFont = false;
+ //
+ // xrLabel5
+ //
+ this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+ this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(1.589457E-05F, 9.999974F);
+ 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, 105.1251F);
+ this.xrLabel5.StylePriority.UseFont = false;
+ this.xrLabel5.Text = "Bitte überweisen Sie den Betrag auf folgende Bankverbindung:\r\n\r\nVIP Betreutes Woh" +
+ "nen\r\nIBAN: DE76 8705 0000 3502 0003 35\r\nSparkasse Chemnitz\r\n";
+ //
+ // xrLabel15
+ //
+ this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+ this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 246.5F);
+ this.xrLabel15.Name = "xrLabel15";
+ this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel15.SizeF = new System.Drawing.SizeF(175F, 17F);
+ this.xrLabel15.StylePriority.UseFont = false;
+ this.xrLabel15.Text = "Mit freundlichen Grüßen";
+ //
+ // xrLabel14
+ //
+ this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+ this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 297.7084F);
+ this.xrLabel14.Multiline = true;
+ this.xrLabel14.Name = "xrLabel14";
+ this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel14.SizeF = new System.Drawing.SizeF(225F, 36.16669F);
+ this.xrLabel14.StylePriority.UseFont = false;
+ this.xrLabel14.Text = "Vincenz\r\nGeschäftsführender Vorstand";
+ //
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.InvoiceCustomerRO);
@@ -277,6 +323,7 @@ namespace VereinZurIntegrationChemnitz
watermark1.ImageViewMode = DevExpress.XtraPrinting.Drawing.ImageViewMode.Zoom;
watermark1.PageRange = "1";
this.Watermarks.Add(watermark1);
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
@@ -287,22 +334,26 @@ namespace VereinZurIntegrationChemnitz
private DevExpress.XtraReports.UI.DetailBand Detail;
private System.Windows.Forms.BindingSource bindingSource1;
private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
- private DevExpress.XtraReports.UI.XRLabel lblAbrechnungstext;
+ private DevExpress.XtraReports.UI.XRLabel lblAbrechnungstext1;
private DevExpress.XtraReports.UI.XRLabel lblAnrede;
- private DevExpress.XtraReports.UI.XRLabel xrLabel4;
- 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 xrLabel12;
- private DevExpress.XtraReports.UI.XRLabel xrLabel10;
private DevExpress.XtraReports.UI.FormattingRule ruleRateFactorNull;
private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
- private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
private DevExpress.XtraReports.UI.DetailBand Detail1;
private DevExpress.XtraReports.UI.XRLabel lblAddress;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+ private DevExpress.XtraReports.UI.XRTable xrTable1;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
+ private DevExpress.XtraReports.UI.XRLabel lblAbrechnungstext2;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel5;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel15;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel14;
}
}
diff --git a/ReportImp/VereinZurIntegrationChemnitz/RechnungEigenanteil.cs b/ReportImp/VereinZurIntegrationChemnitz/RechnungEigenanteil.cs
index a567a1b11..f7fd2af24 100644
--- a/ReportImp/VereinZurIntegrationChemnitz/RechnungEigenanteil.cs
+++ b/ReportImp/VereinZurIntegrationChemnitz/RechnungEigenanteil.cs
@@ -14,11 +14,6 @@ namespace VereinZurIntegrationChemnitz
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()))
{
@@ -54,11 +49,18 @@ namespace VereinZurIntegrationChemnitz
if (pRO.InvoiceBase.Type == BS.Shared.InvoiceType.CustomerEquity)
{
- var abrechnungstext = string.Format("mit einem Schreiben vom Kommunalen Sozialverband Sachsen wurden wir in Kenntnis gesetzt, dass " +
- "für den Zeitraum vom {0} die Leistungen der sozialen Teilhabe für das Leistungsangebot \"weitere besondere Wohnform\" bewilligt sind. \n\n" +
- "Für den o.g. Zeitraum ist durch Sie ein Eigenbetrag zu den Fachleistungsstunden der Eingliederungshilfe in Höhe von {1:c} monatlich an " +
- "uns zu zahlen", pRO.Notice, pRO.InvoiceItems[0].AmountPerUnit);
+ var abrechnungstext1 = string.Format("mit einem Schreiben vom Kommunalen Sozialverband Sachsen wurden wir in Kenntnis gesetzt, dass " +
+ "für den Zeitraum vom {0} die Leistungen der Sozialen Teilhabe für das Leistungsangebot \"weitere besondere Wohnform\" bewilligt sind. \n\n" +
+ "Für den o.g. Zeitraum ist durch Sie ein Eigenbetrag zu den Fachleistungen der Eingliederungshilfe in Höhe von {1} monatlich an " +
+ "uns zu zahlen.\n\nFür die Monat {2:MMMM} bis {3:MMMM yyyy} stellen wir Ihnen hiermit eine Rechnung von ",
+ pRO.Notice, pRO.InvoiceItems[0].UnitPrice, pRO.AccountingPeriodStart, pRO.AccountingPeriodEnd);
+ var abrechnungstext2 = string.Format("Ab {0:MMMM yyyy} bitten wir Sie, den Eigenbetrag in Höhe von {1} bis Ende des Leistungszeitraums " +
+ "selbstständig monatlich an die oben genannte Kontoverbindung zu überweisen.\n\nDieses Schreiben gilt gleichzeitig als Nachweis " +
+ "zur Vorlage beim Finanzamt.", pRO.AccountingPeriodEnd.Value.AddMonths(1), pRO.InvoiceItems[0].UnitPrice);
+
+ lblAbrechnungstext1.Text = abrechnungstext1;
+ lblAbrechnungstext2.Text = abrechnungstext2;
}
diff --git a/ReportImp/VereinZurIntegrationChemnitz/VereinZurIntegrationChemnitz.csproj b/ReportImp/VereinZurIntegrationChemnitz/VereinZurIntegrationChemnitz.csproj
index 5d4de2c8a..19fbc6fe4 100644
--- a/ReportImp/VereinZurIntegrationChemnitz/VereinZurIntegrationChemnitz.csproj
+++ b/ReportImp/VereinZurIntegrationChemnitz/VereinZurIntegrationChemnitz.csproj
@@ -4,7 +4,7 @@
Debug
AnyCPU
- {C1FED668-ADB9-47E0-B589-1389618E1B6E}
+ {EA969934-60A6-459F-A07C-1CF537ED775E}
Library
Properties
VereinZurIntegrationChemnitz
@@ -31,6 +31,7 @@
4
+
@@ -39,6 +40,7 @@
+