diff --git a/ReportImp/HausTheresia/Budgetnachweis.Designer.cs b/ReportImp/HausTheresia/Budgetnachweis.Designer.cs
index cbe12a00b..d3dc31ef5 100644
--- a/ReportImp/HausTheresia/Budgetnachweis.Designer.cs
+++ b/ReportImp/HausTheresia/Budgetnachweis.Designer.cs
@@ -30,6 +30,7 @@ namespace HausTheresia
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Budgetnachweis));
+ DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText();
this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
@@ -51,7 +52,6 @@ namespace HausTheresia
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
- 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();
@@ -69,20 +69,20 @@ namespace HausTheresia
this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.lblDate = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow();
this.lblZAD = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLine2 = new DevExpress.XtraReports.UI.XRLine();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
- this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.PageHeader = new DevExpress.XtraReports.UI.PageHeaderBand();
this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
+ this.lblAbsender = new DevExpress.XtraReports.UI.XRLabel();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -336,7 +336,7 @@ namespace HausTheresia
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
- this.xrRichText2,
+ this.lblAbsender,
this.xrTable1,
this.xrLine2,
this.xrLabel8,
@@ -346,14 +346,6 @@ namespace HausTheresia
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
- // xrRichText2
- //
- this.xrRichText2.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
- this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
- this.xrRichText2.Name = "xrRichText2";
- this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
- this.xrRichText2.SizeF = new System.Drawing.SizeF(373.125F, 42.70834F);
- //
// xrTable1
//
this.xrTable1.Font = new DevExpress.Drawing.DXFont("Verdana", 8.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
@@ -478,18 +470,17 @@ namespace HausTheresia
// xrTableRow7
//
this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell10});
+ this.lblDate});
this.xrTableRow7.Name = "xrTableRow7";
this.xrTableRow7.Weight = 0.15000000000000002D;
//
- // xrTableCell10
+ // lblDate
//
- this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
- this.xrTableCell10.Multiline = true;
- this.xrTableCell10.Name = "xrTableCell10";
- this.xrTableCell10.TextFormatString = "Hattingen, {0}";
- this.xrTableCell10.Weight = 3D;
+ this.lblDate.Multiline = true;
+ this.lblDate.Name = "lblDate";
+ this.lblDate.Text = "Hattingen, ";
+ this.lblDate.TextFormatString = "Hattingen, {0}";
+ this.lblDate.Weight = 3D;
//
// xrTableRow8
//
@@ -527,10 +518,6 @@ namespace HausTheresia
"ederungshilfe";
this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
//
- // bindingSource1
- //
- this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
- //
// PageHeader
//
this.PageHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -550,6 +537,24 @@ namespace HausTheresia
//
this.ReportFooter.Name = "ReportFooter";
//
+ // lblAbsender
+ //
+ this.lblAbsender.Font = new DevExpress.Drawing.DXFont("verdana", 7F);
+ this.lblAbsender.LocationFloat = new DevExpress.Utils.PointFloat(0F, 2.708292F);
+ this.lblAbsender.Multiline = true;
+ this.lblAbsender.Name = "lblAbsender";
+ this.lblAbsender.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.lblAbsender.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+ this.lblAbsender.SizeF = new System.Drawing.SizeF(373.125F, 40.00003F);
+ this.lblAbsender.StylePriority.UseFont = false;
+ this.lblAbsender.StylePriority.UseTextAlignment = false;
+ this.lblAbsender.Text = "Theresia Albers gGmbH \r\nHaus Theresia, Hackstückstraße 37, 45527 Hattingen";
+ this.lblAbsender.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+ //
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
+ //
// Budgetnachweis
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -559,6 +564,8 @@ namespace HausTheresia
this.GroupHeader1,
this.PageHeader,
this.ReportFooter});
+ this.ComponentStorage.AddRange(new System.ComponentModel.IComponent[] {
+ this.bindingSource1});
this.DataSource = this.bindingSource1;
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
@@ -568,11 +575,12 @@ namespace HausTheresia
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "23.2";
+ xrWatermark1.Id = "Watermark1";
+ this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -602,7 +610,6 @@ namespace HausTheresia
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.XRRichText xrRichText3;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2;
- private DevExpress.XtraReports.UI.XRRichText xrRichText2;
private DevExpress.XtraReports.UI.XRTable xrTable1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
@@ -623,9 +630,10 @@ namespace HausTheresia
private DevExpress.XtraReports.UI.XRTableRow xrTableRow6;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow7;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
+ private DevExpress.XtraReports.UI.XRTableCell lblDate;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow8;
private DevExpress.XtraReports.UI.XRTableCell lblZAD;
private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter;
+ private DevExpress.XtraReports.UI.XRLabel lblAbsender;
}
}
diff --git a/ReportImp/HausTheresia/Budgetnachweis.cs b/ReportImp/HausTheresia/Budgetnachweis.cs
index b679444f5..593a2fe2d 100644
--- a/ReportImp/HausTheresia/Budgetnachweis.cs
+++ b/ReportImp/HausTheresia/Budgetnachweis.cs
@@ -45,12 +45,15 @@ namespace HausTheresia
xrCheckBox2.Checked = false;
xrCheckBox1.Checked = true;
}
+ lblDate.Text = String.Format("Hattingen, {0}", pRO.InvoiceDate);
// AB, 20.03.2026: ursprünglich nur Ennepetal, Team Bochum ist neu
var c = c2s.SupportConcept.Customer;
var team = c.Team2CustomerList.Select(x => x.Team.Name).FirstOrDefault();
if (team != null && team.Contains("Bochum"))
{
lblZAD.Text = "ZAD - Nr.LWL: 9029857";
+ lblDate.Text = String.Format("Bochum, {0}", pRO.InvoiceDate);
+ lblAbsender.Text = "Theresia Albers gGmbH \nCramerstr.10, 44793 Bochum";
}
}
bindingSource1.DataSource = pRO;
diff --git a/ReportImp/HausTheresia/Budgetnachweis.resx b/ReportImp/HausTheresia/Budgetnachweis.resx
index 3adbf78a0..f1ebed0b5 100644
--- a/ReportImp/HausTheresia/Budgetnachweis.resx
+++ b/ReportImp/HausTheresia/Budgetnachweis.resx
@@ -132,9 +132,6 @@ Kreditinstitut: Bank Bistum Essen eG IBAN: DE29 3606 0295 0083 8300 18
Hiermit wird erklärt, dass die Verpflichtungen aus den Vereinbarungen nach §§75 ff. SGB XII bzw. §§125 ff. SGB IX eingehalten wurden und alle hier gemachten Angaben je Betreuungskontakt anhand der Quittierungsbelege sowie der Betreuungsdokumentation jederzeit nachgewiesen werden können. Diese Unterlagen sind 5 Jahre aufzubewahren und auf Verlangen des Sozialhilfeträgers bzw. des Trägers der Eingliederungshilfe vorzulegen (§2 Abs.1 der Vergütungsvereinbarung).
-
- ewBcAHIAdABmADEAXABmAGIAaQBkAGkAcwBcAGEAbgBzAGkAXABhAG4AcwBpAGMAcABnADEAMgA1ADIAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMABcAGYAcwB3AGkAcwBzAFwAZgBwAHIAcQAyAFwAZgBjAGgAYQByAHMAZQB0ADAAIABWAGUAcgBkAGEAbgBhADsAfQB7AFwAZgAxAFwAZgBuAGkAbAAgAFQAaQBtAGUAcwAgAE4AZQB3ACAAUgBvAG0AYQBuADsAfQB9AA0ACgBcAHYAaQBlAHcAawBpAG4AZAA0AFwAdQBjADEAXABwAGEAcgBkAFwAbAB0AHIAcABhAHIAXAB0AHEAYwBcAHQAeAA0ADUAMwA2AFwAdABxAHIAXAB0AHgAOQAwADcAMgBcAGwAYQBuAGcAMgAwADUANwBcAGYAMABcAGYAcwAxADQAIABUAGgAZQByAGUAcwBpAGEAIABBAGwAYgBlAHIAcwAgAGcARwBtAGIASAAgAFwAcABhAHIADQAKAFwAcABhAHIAZABcAGwAdAByAHAAYQByAFwAbABhAG4AZwAxADAAMwAxACAASABhAHUAcwAgAFQAaABlAHIAZQBzAGkAYQAsACAASABhAGMAawBzAHQAXAAnAGYAYwBjAGsAcwB0AHIAYQBcACcAZABmAGUAIAAzADcALAAgADQANQA1ADIANwAgAEgAYQB0AHQAaQBuAGcAZQBuAFwAZgAxAFwAZgBzADIANABcAHAAYQByAA0ACgB9AA0ACgA=
-
ewBcAHIAdABmADEAXABhAG4AcwBpAFwAYQBuAHMAaQBjAHAAZwAxADIANQAyAFwAZABlAGYAZgAwAHsAXABmAG8AbgB0AHQAYgBsAHsAXABmADAAXABmAHMAdwBpAHMAcwBcAGYAcAByAHEAMgBcAGYAYwBoAGEAcgBzAGUAdAAwACAAVgBlAHIAZABhAG4AYQA7AH0AewBcAGYAMQBcAGYAbgBpAGwAXABmAGMAaABhAHIAcwBlAHQAMAAgAFYAZQByAGQAYQBuAGEAOwB9AHsAXABmADIAXABmAG4AaQBsACAAVABpAG0AZQBzACAATgBlAHcAIABSAG8AbQBhAG4AOwB9AH0ADQAKAFwAdgBpAGUAdwBrAGkAbgBkADQAXAB1AGMAMQBcAHAAYQByAGQAXABzAGEAMgAwADAAXABzAGwAMgA3ADYAXABzAGwAbQB1AGwAdAAxAFwAbABhAG4AZwAxADAAMwAxAFwAYgBcAHMAYwBhAHAAcwBcAGYAMABcAGYAcwA1ADIAIABUAFwAZgAxAFwAZgBzADQAMgAgAEgARQBSAEUAUwBJAEEAXABmADAAXABmAHMANQAyACAAIABBAFwAZgAxAFwAZgBzADQAMgAgAEwAQgBFAFIAUwBcAGYAMABcAGYAcwA1ADIAIAAgAFwAZgAxAFwAZgBzADQAMgAgAEcAXABmADAAXABmAHMANQAyACAARwBcAGYAMQBcAGYAcwA0ADIAIABNAEIAXABmADAAXABmAHMANQAyACAASABcAHAAYQByAA0ACgBcAHAAYQByAGQAXAB0AHEAYwBcAHQAeAA0ADUAMwA2AFwAdABxAHIAXAB0AHgAOQAwADcAMgBcAGYAcwAzADIAIABIAFwAZgBzADIANgAgAEEAVQBTAFwAZgBzADMAMgAgACAAVABcAGYAcwAyADYAIABIAEUAUgBFAFMASQBBAFwAYgAwAFwAcwBjAGEAcABzADAAXABmADIAXABmAHMAMgA0AFwAcABhAHIADQAKAH0ADQAKAA==
diff --git a/ReportImp/HausTheresia/Budgetnachweis2.Designer.cs b/ReportImp/HausTheresia/Budgetnachweis2.Designer.cs
index 4d5261139..01dd9b156 100644
--- a/ReportImp/HausTheresia/Budgetnachweis2.Designer.cs
+++ b/ReportImp/HausTheresia/Budgetnachweis2.Designer.cs
@@ -52,7 +52,6 @@ namespace HausTheresia.Neu
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
- this.lblAbsender = 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();
@@ -78,9 +77,9 @@ namespace HausTheresia.Neu
this.PageHeader = new DevExpress.XtraReports.UI.PageHeaderBand();
this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
+ this.lblAbsender = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.lblAbsender)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -347,14 +346,6 @@ namespace HausTheresia.Neu
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
- // lblAbsender
- //
- this.lblAbsender.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
- this.lblAbsender.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
- this.lblAbsender.Name = "lblAbsender";
- this.lblAbsender.SerializableRtfString = resources.GetString("lblAbsender.SerializableRtfString");
- this.lblAbsender.SizeF = new System.Drawing.SizeF(373.125F, 42.70834F);
- //
// xrTable1
//
this.xrTable1.Font = new DevExpress.Drawing.DXFont("Verdana", 8.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
@@ -485,11 +476,10 @@ namespace HausTheresia.Neu
//
// lblOrtDatum
//
- this.lblOrtDatum.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
this.lblOrtDatum.Multiline = true;
this.lblOrtDatum.Name = "lblOrtDatum";
- this.lblOrtDatum.TextFormatString = "Hattingen, {0:dd.MM.yyyy}";
+ this.lblOrtDatum.Text = "Hattingen, ";
+ this.lblOrtDatum.TextFormatString = "{0}";
this.lblOrtDatum.Weight = 3D;
//
// xrTableRow8
@@ -547,6 +537,20 @@ namespace HausTheresia.Neu
//
this.ReportFooter.Name = "ReportFooter";
//
+ // lblAbsender
+ //
+ this.lblAbsender.Font = new DevExpress.Drawing.DXFont("verdana", 7F);
+ this.lblAbsender.LocationFloat = new DevExpress.Utils.PointFloat(0F, 2.708292F);
+ this.lblAbsender.Multiline = true;
+ this.lblAbsender.Name = "lblAbsender";
+ this.lblAbsender.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.lblAbsender.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+ this.lblAbsender.SizeF = new System.Drawing.SizeF(373.125F, 40.00003F);
+ this.lblAbsender.StylePriority.UseFont = false;
+ this.lblAbsender.StylePriority.UseTextAlignment = false;
+ this.lblAbsender.Text = "Theresia Albers gGmbH \r\nHaus Theresia, Hackstückstraße 37, 45527 Hattingen";
+ this.lblAbsender.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+ //
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
@@ -574,7 +578,6 @@ namespace HausTheresia.Neu
xrWatermark1.Id = "Watermark1";
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.lblAbsender)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
@@ -607,7 +610,6 @@ namespace HausTheresia.Neu
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.XRRichText xrRichText3;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2;
- private DevExpress.XtraReports.UI.XRRichText lblAbsender;
private DevExpress.XtraReports.UI.XRTable xrTable1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
@@ -632,5 +634,6 @@ namespace HausTheresia.Neu
private DevExpress.XtraReports.UI.XRTableRow xrTableRow8;
private DevExpress.XtraReports.UI.XRTableCell lblZAD;
private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter;
+ private DevExpress.XtraReports.UI.XRLabel lblAbsender;
}
}
diff --git a/ReportImp/HausTheresia/Budgetnachweis2.cs b/ReportImp/HausTheresia/Budgetnachweis2.cs
index 221fa1762..dffec7b32 100644
--- a/ReportImp/HausTheresia/Budgetnachweis2.cs
+++ b/ReportImp/HausTheresia/Budgetnachweis2.cs
@@ -60,11 +60,14 @@ namespace HausTheresia.Neu
{
lblCustomer.Text = String.Format("{0}, {1}, {2} {3}", pRo.CustomerName, c.Person.Address.Street, c.Person.Address.PostalCode, c.Person.Address.Town);
}
+ lblOrtDatum.Text = String.Format("Hattingen, {0:dd.MM.yyyy}", pRo.InvoiceDate);
// AB, 20.03.2026: ursprünglich nur Ennepetal, Team Bochum ist neu
var team = c.Team2CustomerList.Select(x => x.Team.Name).FirstOrDefault();
if (team != null && team.Contains("Bochum"))
{
lblZAD.Text = "ZAD - Nr.LWL: 9029857 ";
+ lblOrtDatum.Text = String.Format("Bochum, {0:dd.MM.yyyy}", pRo.InvoiceDate);
+ lblAbsender.Text = "Theresia Albers gGmbH \nCramerstr.10, 44793 Bochum";
}
}
}
diff --git a/ReportImp/HausTheresia/Budgetnachweis2.resx b/ReportImp/HausTheresia/Budgetnachweis2.resx
index 553889c02..f1ebed0b5 100644
--- a/ReportImp/HausTheresia/Budgetnachweis2.resx
+++ b/ReportImp/HausTheresia/Budgetnachweis2.resx
@@ -132,9 +132,6 @@ Kreditinstitut: Bank Bistum Essen eG IBAN: DE29 3606 0295 0083 8300 18
Hiermit wird erklärt, dass die Verpflichtungen aus den Vereinbarungen nach §§75 ff. SGB XII bzw. §§125 ff. SGB IX eingehalten wurden und alle hier gemachten Angaben je Betreuungskontakt anhand der Quittierungsbelege sowie der Betreuungsdokumentation jederzeit nachgewiesen werden können. Diese Unterlagen sind 5 Jahre aufzubewahren und auf Verlangen des Sozialhilfeträgers bzw. des Trägers der Eingliederungshilfe vorzulegen (§2 Abs.1 der Vergütungsvereinbarung).
-
- ewBcAHIAdABmADEAXABmAGIAaQBkAGkAcwBcAGEAbgBzAGkAXABhAG4AcwBpAGMAcABnADEAMgA1ADIAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMABcAGYAcwB3AGkAcwBzAFwAZgBwAHIAcQAyAFwAZgBjAGgAYQByAHMAZQB0ADAAIABWAGUAcgBkAGEAbgBhADsAfQB7AFwAZgAxAFwAZgBuAGkAbAAgAFQAaQBtAGUAcwAgAE4AZQB3ACAAUgBvAG0AYQBuADsAfQB9AA0ACgBcAHYAaQBlAHcAawBpAG4AZAA0AFwAdQBjADEAXABwAGEAcgBkAFwAbAB0AHIAcABhAHIAXAB0AHEAYwBcAHQAeAA0ADUAMwA2AFwAdABxAHIAXAB0AHgAOQAwADcAMgBcAGwAYQBuAGcAMgAwADUANwBcAGYAMABcAGYAcwAxADQAIABUAGgAZQByAGUAcwBpAGEAIABBAGwAYgBlAHIAcwAgAGcARwBtAGIASAAgAFwAcABhAHIADQAKAFwAcABhAHIAZABcAGwAdAByAHAAYQByAFwAbABhAG4AZwAxADAAMwAxACAASABhAHUAcwAgAFQAaABlAHIAZQBzAGkAYQAsACAASABhAGMAawBzAHQAXAAnAGYAYwBjAGsAcwB0AHIAYQBcACcAZABmAGUAIAAzADcALAAgADQANQA1ADIANwAgAEgAYQB0AHQAaQBuAGcAZQBuAFwAZgAxAFwAZgBzADIANABcAHAAYQByAA0ACgB9AA0ACgA=
-
ewBcAHIAdABmADEAXABhAG4AcwBpAFwAYQBuAHMAaQBjAHAAZwAxADIANQAyAFwAZABlAGYAZgAwAHsAXABmAG8AbgB0AHQAYgBsAHsAXABmADAAXABmAHMAdwBpAHMAcwBcAGYAcAByAHEAMgBcAGYAYwBoAGEAcgBzAGUAdAAwACAAVgBlAHIAZABhAG4AYQA7AH0AewBcAGYAMQBcAGYAbgBpAGwAXABmAGMAaABhAHIAcwBlAHQAMAAgAFYAZQByAGQAYQBuAGEAOwB9AHsAXABmADIAXABmAG4AaQBsACAAVABpAG0AZQBzACAATgBlAHcAIABSAG8AbQBhAG4AOwB9AH0ADQAKAFwAdgBpAGUAdwBrAGkAbgBkADQAXAB1AGMAMQBcAHAAYQByAGQAXABzAGEAMgAwADAAXABzAGwAMgA3ADYAXABzAGwAbQB1AGwAdAAxAFwAbABhAG4AZwAxADAAMwAxAFwAYgBcAHMAYwBhAHAAcwBcAGYAMABcAGYAcwA1ADIAIABUAFwAZgAxAFwAZgBzADQAMgAgAEgARQBSAEUAUwBJAEEAXABmADAAXABmAHMANQAyACAAIABBAFwAZgAxAFwAZgBzADQAMgAgAEwAQgBFAFIAUwBcAGYAMABcAGYAcwA1ADIAIAAgAFwAZgAxAFwAZgBzADQAMgAgAEcAXABmADAAXABmAHMANQAyACAARwBcAGYAMQBcAGYAcwA0ADIAIABNAEIAXABmADAAXABmAHMANQAyACAASABcAHAAYQByAA0ACgBcAHAAYQByAGQAXAB0AHEAYwBcAHQAeAA0ADUAMwA2AFwAdABxAHIAXAB0AHgAOQAwADcAMgBcAGYAcwAzADIAIABIAFwAZgBzADIANgAgAEEAVQBTAFwAZgBzADMAMgAgACAAVABcAGYAcwAyADYAIABIAEUAUgBFAFMASQBBAFwAYgAwAFwAcwBjAGEAcABzADAAXABmADIAXABmAHMAMgA0AFwAcABhAHIADQAKAH0ADQAKAA==
diff --git a/ReportImp/HausTheresia/Finanzauswertung.cs b/ReportImp/HausTheresia/Finanzauswertung.cs
index 742b42747..9e2873f12 100644
--- a/ReportImp/HausTheresia/Finanzauswertung.cs
+++ b/ReportImp/HausTheresia/Finanzauswertung.cs
@@ -97,9 +97,7 @@ namespace HausTheresia
{
if (f.Costbearer2Supportconcept != null)
{
- var c =
- DAOFactory.GenericDAO.LoadByID(
- f.Costbearer2Supportconcept.SupportConcept.Customer.Oid.Value);
+ var c = DAOFactory.GenericDAO.LoadByID(f.Costbearer2Supportconcept.SupportConcept.Customer.Oid.Value);
if (c.RegionType != null)
{
return c.RegionType.Value;
@@ -118,7 +116,7 @@ namespace HausTheresia
Customer c = DAOFactory.GenericDAO.LoadByID(scRo.Costbearer2Supportconcept.SupportConcept.Customer.Oid ?? 0);
if (c.Team2CustomerList.Count > 0)
{
- team = c.Team2CustomerList[0].Team.Name;
+ team = "Team " + c.Team2CustomerList[0].Team.Name;
}
return team;
}
diff --git a/ReportImp/HausTheresia/Finanzauswertung.designer.cs b/ReportImp/HausTheresia/Finanzauswertung.designer.cs
index c5c817a2c..0aa4cc6b1 100644
--- a/ReportImp/HausTheresia/Finanzauswertung.designer.cs
+++ b/ReportImp/HausTheresia/Finanzauswertung.designer.cs
@@ -105,6 +105,8 @@ namespace HausTheresia
this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+ this.GroupHeader3 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
@@ -133,8 +135,6 @@ namespace HausTheresia
this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
- this.GroupHeader3 = new DevExpress.XtraReports.UI.GroupHeaderBand();
- this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -750,6 +750,28 @@ namespace HausTheresia
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.Text = "xrLabel1";
//
+ // GroupHeader3
+ //
+ this.GroupHeader3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrLabel2});
+ this.GroupHeader3.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] {
+ new DevExpress.XtraReports.UI.GroupField("Custom2", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)});
+ this.GroupHeader3.HeightF = 42.70833F;
+ this.GroupHeader3.Level = 2;
+ this.GroupHeader3.Name = "GroupHeader3";
+ //
+ // xrLabel2
+ //
+ this.xrLabel2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.Custom2")});
+ this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+ this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F);
+ this.xrLabel2.Name = "xrLabel2";
+ this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel2.SizeF = new System.Drawing.SizeF(1030F, 23F);
+ this.xrLabel2.StylePriority.UseFont = false;
+ this.xrLabel2.Text = "xrLabel1";
+ //
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FinanceRO);
@@ -1074,26 +1096,6 @@ namespace HausTheresia
this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell27.Weight = 0.32651820434991236D;
//
- // GroupHeader3
- //
- this.GroupHeader3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
- this.xrLabel2});
- this.GroupHeader3.HeightF = 42.70833F;
- this.GroupHeader3.Level = 2;
- this.GroupHeader3.Name = "GroupHeader3";
- //
- // xrLabel2
- //
- this.xrLabel2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.Custom2")});
- this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
- this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F);
- this.xrLabel2.Name = "xrLabel2";
- this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel2.SizeF = new System.Drawing.SizeF(1030F, 23F);
- this.xrLabel2.StylePriority.UseFont = false;
- this.xrLabel2.Text = "xrLabel1";
- //
// Finanzauswertung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
diff --git a/ReportImp/HausTheresia/HausTheresia.csproj b/ReportImp/HausTheresia/HausTheresia.csproj
index 33997e4a9..9b2a7a7fe 100644
--- a/ReportImp/HausTheresia/HausTheresia.csproj
+++ b/ReportImp/HausTheresia/HausTheresia.csproj
@@ -33,12 +33,14 @@
false
+
+