diff --git a/ReportImp/DieDueneReports/SettlementReport.resx b/ReportImp/DieDueneReports/SettlementReport.resx index 3b9821114..7c5ab36d5 100644 --- a/ReportImp/DieDueneReports/SettlementReport.resx +++ b/ReportImp/DieDueneReports/SettlementReport.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - anbei sende ich Ihnen die unterschriebenen Nachweise über die im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerName] erbrachten Leistungen zu. Nach unserer Berechnung ergeben sich für den Betreuungszeitraum [AccountingPeriod] hieraus: + anbei sende ich Ihnen die Spitzabrechnung über die im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerName] erbrachten Leistungen zu. Nach unserer Berechnung ergeben sich für den Betreuungszeitraum [AccountingPeriod] hieraus: diff --git a/ReportImp/DieDueneReports/SettlementReport2.resx b/ReportImp/DieDueneReports/SettlementReport2.resx index dac8c7ff8..6f596b5da 100644 --- a/ReportImp/DieDueneReports/SettlementReport2.resx +++ b/ReportImp/DieDueneReports/SettlementReport2.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - anbei sende ich Ihnen die unterschriebenen Nachweise über die im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerFirstName] [CustomerLastName] erbrachten Leistungen zu. Nach unserer Berechnung ergeben sich für den Betreuungszeitraum [AccountingPeriod] hieraus: + anbei sende ich Ihnen die Spitzabrechnung über die im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerFirstName] [CustomerLastName] erbrachten Leistungen zu. Nach unserer Berechnung ergeben sich für den Betreuungszeitraum [AccountingPeriod] hieraus: diff --git a/ReportImp/LebenshilfeDuisburgAtz6860475645/Invoicing/LHDuisburgAtzInvoiceCreation.cs b/ReportImp/LebenshilfeDuisburgAtz6860475645/Invoicing/LHDuisburgAtzInvoiceCreation.cs index 7048cd7a8..50c0dc23a 100644 --- a/ReportImp/LebenshilfeDuisburgAtz6860475645/Invoicing/LHDuisburgAtzInvoiceCreation.cs +++ b/ReportImp/LebenshilfeDuisburgAtz6860475645/Invoicing/LHDuisburgAtzInvoiceCreation.cs @@ -12,7 +12,7 @@ namespace LebenshilfeDuisburgAtz.Invoicing protected override void CreateItemTextForCategory(InvoiceItem ii, string cat, string catOriginal) { - ii.ItemDescription = "Eingliederungshilfe nach den Bestimmungen des Sozialgesetzbuch Achtes Buch (SGB VIII) (Autismusspezifische Therapie)"; + ii.ItemDescription = "Eingliederungshilfe nach den Bestimmungen des Sozialgesetzbuch Achtes Buch (§ 35a SGB VIII) / Sozialgesetzbuch Zwölftes Buch(§ 53 SGB XII) (Autismusspezifische Therapie)"; } } diff --git a/ReportImp/LebenshilfeDuisburgAtz6860475645/RechnungAtz.Designer.cs b/ReportImp/LebenshilfeDuisburgAtz6860475645/RechnungAtz.Designer.cs index 10c0b92bc..0bcd68efa 100644 --- a/ReportImp/LebenshilfeDuisburgAtz6860475645/RechnungAtz.Designer.cs +++ b/ReportImp/LebenshilfeDuisburgAtz6860475645/RechnungAtz.Designer.cs @@ -33,7 +33,6 @@ namespace LebenshilfeDuisburgAtz this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); - this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel(); this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); @@ -82,12 +81,16 @@ namespace LebenshilfeDuisburgAtz this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow15 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel17 = 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.xrTable3)).BeginInit(); @@ -95,12 +98,13 @@ namespace LebenshilfeDuisburgAtz ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail // + this.Detail.Expanded = false; this.Detail.HeightF = 0F; this.Detail.Name = "Detail"; this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); @@ -109,8 +113,11 @@ namespace LebenshilfeDuisburgAtz // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel1, + this.xrLabel14, + this.xrLabel16, + this.xrLabel17, this.xrRichText1, - this.lblAdresse, this.xrRichText2}); this.ReportHeader.HeightF = 240F; this.ReportHeader.Name = "ReportHeader"; @@ -124,15 +131,6 @@ namespace LebenshilfeDuisburgAtz this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); this.xrRichText1.SizeF = new System.Drawing.SizeF(371.875F, 32.2917F); // - // lblAdresse - // - this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 32.2917F); - this.lblAdresse.Multiline = true; - this.lblAdresse.Name = "lblAdresse"; - this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblAdresse.SizeF = new System.Drawing.SizeF(454.5F, 153.1667F); - this.lblAdresse.StylePriority.UseFont = false; - // // xrRichText2 // this.xrRichText2.Font = new System.Drawing.Font("Verdana", 10F); @@ -289,7 +287,8 @@ namespace LebenshilfeDuisburgAtz this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel2.SizeF = new System.Drawing.SizeF(235.755F, 81.08164F); this.xrLabel2.StylePriority.UseFont = false; - this.xrLabel2.Text = "[CustomerName]\r\n\r\n[CustomerStreet]\r\n[CustomerPostalCode] [CustomerTown]"; + this.xrLabel2.Text = "[CustomerName]\r\n[CustomerBirthdate]\r\n[CustomerStreet]\r\n[CustomerPostalCode] [Cust" + + "omerTown]"; // // xrTable2 // @@ -497,6 +496,7 @@ namespace LebenshilfeDuisburgAtz // // Detail1 // + this.Detail1.Expanded = false; this.Detail1.HeightF = 0F; this.Detail1.Name = "Detail1"; // @@ -599,10 +599,6 @@ namespace LebenshilfeDuisburgAtz this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; this.xrTableCell20.Weight = 0.2069230769230769D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); - // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -656,6 +652,66 @@ namespace LebenshilfeDuisburgAtz this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; this.xrTableCell32.Weight = 0.206923076923077D; // + // xrLabel1 + // + this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecipientOrganisation")}); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 46.41666F); + this.xrLabel1.Multiline = true; + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel1.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrLabel1.SizeF = new System.Drawing.SizeF(329.9999F, 20.12498F); + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.Text = "Landschaftsverband Westfalen- Lippe\r\nLWL- Inklusionsamt Soziale Teilhabe\r\n48133 M" + + "ünster\r\n"; + // + // xrLabel14 + // + this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecipientDivision")}); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 66.54167F); + this.xrLabel14.Multiline = true; + this.xrLabel14.Name = "xrLabel14"; + this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel14.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrLabel14.SizeF = new System.Drawing.SizeF(329.9999F, 20.12498F); + this.xrLabel14.StylePriority.UseFont = false; + this.xrLabel14.Text = "Landschaftsverband Westfalen- Lippe\r\nLWL- Inklusionsamt Soziale Teilhabe\r\n48133 M" + + "ünster\r\n"; + // + // xrLabel16 + // + this.xrLabel16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecipientStreet")}); + this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 86.66668F); + this.xrLabel16.Multiline = true; + this.xrLabel16.Name = "xrLabel16"; + this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel16.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrLabel16.SizeF = new System.Drawing.SizeF(329.9999F, 20.12498F); + this.xrLabel16.StylePriority.UseFont = false; + this.xrLabel16.Text = "Landschaftsverband Westfalen- Lippe\r\nLWL- Inklusionsamt Soziale Teilhabe\r\n48133 M" + + "ünster\r\n"; + // + // xrLabel17 + // + this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecipientPostCodeAndTown")}); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 106.7917F); + this.xrLabel17.Multiline = true; + this.xrLabel17.Name = "xrLabel17"; + this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel17.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrLabel17.SizeF = new System.Drawing.SizeF(329.9999F, 20.12498F); + this.xrLabel17.StylePriority.UseFont = false; + this.xrLabel17.Text = "Landschaftsverband Westfalen- Lippe\r\nLWL- Inklusionsamt Soziale Teilhabe\r\n48133 M" + + "ünster\r\n"; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); + // // RechnungAtz // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -685,8 +741,8 @@ namespace LebenshilfeDuisburgAtz ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -700,7 +756,6 @@ namespace LebenshilfeDuisburgAtz private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; private DevExpress.XtraReports.UI.GroupHeaderBand Page1; private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; - private DevExpress.XtraReports.UI.XRLabel lblAdresse; private DevExpress.XtraReports.UI.XRRichText xrRichText2; private DevExpress.XtraReports.UI.XRTable xrTable2; private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; @@ -750,5 +805,9 @@ namespace LebenshilfeDuisburgAtz private DevExpress.XtraReports.UI.XRTableRow xrTableRow5; private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; private DevExpress.XtraReports.UI.XRTableCell txtMittelbindungsnr; + private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRLabel xrLabel14; + private DevExpress.XtraReports.UI.XRLabel xrLabel16; + private DevExpress.XtraReports.UI.XRLabel xrLabel17; } } diff --git a/ReportImp/LebenshilfeDuisburgAtz6860475645/RechnungAtz.cs b/ReportImp/LebenshilfeDuisburgAtz6860475645/RechnungAtz.cs index fabd016e1..0a568e441 100644 --- a/ReportImp/LebenshilfeDuisburgAtz6860475645/RechnungAtz.cs +++ b/ReportImp/LebenshilfeDuisburgAtz6860475645/RechnungAtz.cs @@ -22,23 +22,23 @@ namespace LebenshilfeDuisburgAtz { StringBuilder sb = new StringBuilder(); - if (!String.IsNullOrEmpty(pRO.RecipientOrganisation)) - { - sb.AppendLine(pRO.RecipientOrganisation); - } - if (!String.IsNullOrEmpty(pRO.RecipientDivision)) - { - sb.AppendLine(pRO.RecipientDivision); - } - if (!String.IsNullOrEmpty(pRO.RecipientStreet)) - { - sb.AppendLine(pRO.RecipientStreet); - } - if (!String.IsNullOrEmpty(pRO.RecipientPostCodeAndTown)) - { - sb.AppendLine(pRO.RecipientPostCodeAndTown); - } - lblAdresse.Text = sb.ToString(); + //if (!String.IsNullOrEmpty(pRO.RecipientOrganisation)) + // { + // sb.AppendLine(pRO.RecipientOrganisation); + // } + //if (!String.IsNullOrEmpty(pRO.RecipientDivision)) + // { + // sb.AppendLine(pRO.RecipientDivision); + // } + //if (!String.IsNullOrEmpty(pRO.RecipientStreet)) + // { + // sb.AppendLine(pRO.RecipientStreet); + // } + //if (!String.IsNullOrEmpty(pRO.RecipientPostCodeAndTown)) + // { + // sb.AppendLine(pRO.RecipientPostCodeAndTown); + // } + // lblAdresse.Text = sb.ToString(); pRO.Notice = ""; diff --git a/ReportImp/VaroSozialagentur/Quittierungsbeleg.Designer.cs b/ReportImp/VaroSozialagentur/Quittierungsbeleg.Designer.cs index ebd4b0f3b..bc636f479 100644 --- a/ReportImp/VaroSozialagentur/Quittierungsbeleg.Designer.cs +++ b/ReportImp/VaroSozialagentur/Quittierungsbeleg.Designer.cs @@ -62,7 +62,6 @@ namespace VaroSozialagentur this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); @@ -80,7 +79,6 @@ namespace VaroSozialagentur this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.lblUnterschriftMitarbeiter = new DevExpress.XtraReports.UI.XRLabel(); this.xrTableAbwesenheiten = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -113,13 +111,14 @@ namespace VaroSozialagentur this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); - this.lblUnterschriftKlient = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -223,7 +222,7 @@ namespace VaroSozialagentur // xrTableCell2 // this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldKontaktArt")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice5")}); this.xrTableCell2.Name = "xrTableCell2"; this.xrTableCell2.StylePriority.UseFont = false; this.xrTableCell2.StylePriority.UsePadding = false; @@ -511,10 +510,6 @@ namespace VaroSozialagentur this.xrTableCell49.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; this.xrTableCell49.Weight = 0.44692737430167606D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); - // // formattingRuleStartDate // this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]"; @@ -719,8 +714,7 @@ namespace VaroSozialagentur // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.lblUnterschriftKlient, - this.lblUnterschriftMitarbeiter, + this.xrLabel11, this.xrTableAbwesenheiten, this.lblHatAbwesenheiten, this.lblHatGruppen, @@ -736,28 +730,13 @@ namespace VaroSozialagentur this.GroupFooter1.KeepTogether = true; this.GroupFooter1.Name = "GroupFooter1"; // - // lblUnterschriftMitarbeiter - // - this.lblUnterschriftMitarbeiter.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.lblUnterschriftMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(398.31F, 250F); - this.lblUnterschriftMitarbeiter.Name = "lblUnterschriftMitarbeiter"; - this.lblUnterschriftMitarbeiter.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.lblUnterschriftMitarbeiter.SizeF = new System.Drawing.SizeF(336.6944F, 19.99998F); - this.lblUnterschriftMitarbeiter.StylePriority.UseBackColor = false; - this.lblUnterschriftMitarbeiter.StylePriority.UseBorders = false; - this.lblUnterschriftMitarbeiter.StylePriority.UseFont = false; - this.lblUnterschriftMitarbeiter.StylePriority.UsePadding = false; - this.lblUnterschriftMitarbeiter.StylePriority.UseTextAlignment = false; - this.lblUnterschriftMitarbeiter.Text = "Datum, verantwortliche/r Mitarbeiter/in"; - this.lblUnterschriftMitarbeiter.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - // // xrTableAbwesenheiten // this.xrTableAbwesenheiten.BorderColor = System.Drawing.Color.Black; this.xrTableAbwesenheiten.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(170F, 79.99997F); + this.xrTableAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(170F, 98.74998F); this.xrTableAbwesenheiten.Name = "xrTableAbwesenheiten"; this.xrTableAbwesenheiten.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTableAbwesenheiten.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { @@ -953,7 +932,7 @@ namespace VaroSozialagentur | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.lblHatAbwesenheiten.Font = new System.Drawing.Font("Arial", 10F); - this.lblHatAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 130F); + this.lblHatAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(432.6945F, 148.75F); this.lblHatAbwesenheiten.Name = "lblHatAbwesenheiten"; this.lblHatAbwesenheiten.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.lblHatAbwesenheiten.SizeF = new System.Drawing.SizeF(30F, 30F); @@ -970,7 +949,7 @@ namespace VaroSozialagentur | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.lblHatGruppen.Font = new System.Drawing.Font("Arial", 10F); - this.lblHatGruppen.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 79.99997F); + this.lblHatGruppen.LocationFloat = new DevExpress.Utils.PointFloat(432.6945F, 98.74998F); this.lblHatGruppen.Name = "lblHatGruppen"; this.lblHatGruppen.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.lblHatGruppen.SizeF = new System.Drawing.SizeF(30F, 30F); @@ -984,7 +963,7 @@ namespace VaroSozialagentur // xrRichText2 // this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F); - this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(474.4723F, 130F); + this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(472.028F, 148.75F); this.xrRichText2.Name = "xrRichText2"; this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString"); this.xrRichText2.SizeF = new System.Drawing.SizeF(264.972F, 90.97221F); @@ -993,7 +972,7 @@ namespace VaroSozialagentur // xrRichText1 // this.xrRichText1.Font = new System.Drawing.Font("Arial", 8F); - this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(474.4723F, 79.99997F); + this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(472.028F, 98.74998F); this.xrRichText1.Name = "xrRichText1"; this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); this.xrRichText1.SizeF = new System.Drawing.SizeF(264.9721F, 50F); @@ -1002,7 +981,7 @@ namespace VaroSozialagentur // xrLabel15 // this.xrLabel15.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Underline); - this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 79.99997F); + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 98.74998F); this.xrLabel15.Multiline = true; this.xrLabel15.Name = "xrLabel15"; this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -1017,7 +996,7 @@ namespace VaroSozialagentur // // xrLabel13 // - this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 39.99998F); + this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 59.99997F); this.xrLabel13.Name = "xrLabel13"; this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.xrLabel13.SizeF = new System.Drawing.SizeF(320F, 20F); @@ -1026,12 +1005,13 @@ namespace VaroSozialagentur this.xrLabel13.StylePriority.UseFont = false; this.xrLabel13.StylePriority.UsePadding = false; this.xrLabel13.StylePriority.UseTextAlignment = false; - this.xrLabel13.Text = "GR = Gruppenangebot"; + this.xrLabel13.Text = "GR = Gruppenangebot"; this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; // // xrLabel12 // this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 19.99999F); + this.xrLabel12.Multiline = true; this.xrLabel12.Name = "xrLabel12"; this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.xrLabel12.SizeF = new System.Drawing.SizeF(320F, 20F); @@ -1040,7 +1020,7 @@ namespace VaroSozialagentur this.xrLabel12.StylePriority.UseFont = false; this.xrLabel12.StylePriority.UsePadding = false; this.xrLabel12.StylePriority.UseTextAlignment = false; - this.xrLabel12.Text = "E = ear to ear, face to face"; + this.xrLabel12.Text = "E = ear to ear"; this.xrLabel12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; // // xrLabel10 @@ -1098,20 +1078,23 @@ namespace VaroSozialagentur this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldKontaktArt.Name = "fieldKontaktArt"; // - // lblUnterschriftKlient + // xrLabel11 // - this.lblUnterschriftKlient.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(94.99999F, 250F); - this.lblUnterschriftKlient.Name = "lblUnterschriftKlient"; - this.lblUnterschriftKlient.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.lblUnterschriftKlient.SizeF = new System.Drawing.SizeF(271.8472F, 20F); - this.lblUnterschriftKlient.StylePriority.UseBackColor = false; - this.lblUnterschriftKlient.StylePriority.UseBorders = false; - this.lblUnterschriftKlient.StylePriority.UseFont = false; - this.lblUnterschriftKlient.StylePriority.UsePadding = false; - this.lblUnterschriftKlient.StylePriority.UseTextAlignment = false; - this.lblUnterschriftKlient.Text = "Datum, Unterschrift Klient/in"; - this.lblUnterschriftKlient.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 39.99996F); + this.xrLabel11.Name = "xrLabel11"; + this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(320F, 20F); + this.xrLabel11.StylePriority.UseBackColor = false; + this.xrLabel11.StylePriority.UseBorders = false; + this.xrLabel11.StylePriority.UseFont = false; + this.xrLabel11.StylePriority.UsePadding = false; + this.xrLabel11.StylePriority.UseTextAlignment = false; + this.xrLabel11.Text = "F = face to face"; + this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); // // Quittierungsbeleg // @@ -1138,10 +1121,10 @@ namespace VaroSozialagentur this.Version = "17.1"; ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1210,7 +1193,6 @@ namespace VaroSozialagentur private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; private DevExpress.XtraReports.UI.XRTableCell xrTableCell17; private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; - private DevExpress.XtraReports.UI.XRLabel lblUnterschriftMitarbeiter; private DevExpress.XtraReports.UI.XRTableRow xrTableRow4; private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; @@ -1230,6 +1212,6 @@ namespace VaroSozialagentur private DevExpress.XtraReports.UI.XRLabel xrLabel14; private DevExpress.XtraReports.UI.XRLabel xrLabel16; private DevExpress.XtraReports.UI.XRPictureBox picSignature; - private DevExpress.XtraReports.UI.XRLabel lblUnterschriftKlient; + private DevExpress.XtraReports.UI.XRLabel xrLabel11; } } diff --git a/ReportImp/VaroSozialagentur/Quittierungsbeleg.cs b/ReportImp/VaroSozialagentur/Quittierungsbeleg.cs index de6e8011d..71a2a0e30 100644 --- a/ReportImp/VaroSozialagentur/Quittierungsbeleg.cs +++ b/ReportImp/VaroSozialagentur/Quittierungsbeleg.cs @@ -36,14 +36,18 @@ namespace VaroSozialagentur foreach (var sd in pRO.Services) { - if (sd.IsBillable && !sd.ServiceCategory.Contains("Fahrt")) + if (sd.IsBillable && !sd.ServiceCategory.Contains("Fahrt")) // AB: ich bin mir nicht sicher ob die "Fahrt" hier noch maßgeblich ist... { minuten += sd.Minutes; ServicesOverviewRO.CreateSignatureString(sd); - if (sd.IsGroup) + sd.Notice5 = "F"; + if (sd.ServiceDescription.Contains("ear")) + sd.Notice5 = "E"; + else if (sd.IsGroup) { //sd.Notice5 = String.Format("{0} Teilnehmer", sd.CustomerCount); hatGruppen = true; + sd.Notice5 = "GR"; } servicesBillable.Add(sd); } @@ -105,12 +109,6 @@ namespace VaroSozialagentur index++; } - - if (newRows > 0) - { - lblUnterschriftKlient.Top += newRows * 20; - lblUnterschriftMitarbeiter.Top += newRows * 20; - } } } diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index e8ff5cc1d..5e17a348d 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -223,7 +223,7 @@ namespace BeWo.Service.Plugins //t = "7817461089"; // FAB e.V. (Familienarbeit und Beratung e.V.) //t = "5207911843"; // Pro Balance //t = "8619663355"; // HSH Cologne - t = "1652658918"; // LH Frankfurt Oder + //t = "1652658918"; // LH Frankfurt Oder //t = "7696927868"; // Kuhring Betreuung //t = "6251348980"; // BeWo Gün //t = "6782533512"; // LH Dorsten @@ -274,6 +274,7 @@ namespace BeWo.Service.Plugins //t = "7951718431"; // Ambulant Betreutes Wohnen Astrid Pulm //t = "5850903700"; // Alzey Teilhabe //t = "5929601293"; // Lebenshilfe Duisburg Frühförderung (Projekt heißt LebenshilfeDuisburgAtz) + t = "6860475645"; // Lebenshilfe Duisburg Atz (Projekt heißt LebenshilfeDuisburgAtz6860475645) //t = "4823067940"; // Die Kette 2 //t = "8283849714"; // Forum e.V. (proviel GmbH) //t = "3915346496"; // Sprungbrett 2. DB (Haus Theresia) @@ -284,7 +285,7 @@ namespace BeWo.Service.Plugins //t = "1078667960"; // FAM Rhein-Sieg Gbr //t = "9388871209"; // Sozialwerk Aachener Christen e.V. //t = "1566251835"; // Sicherleben Michael Voß - t = "4947061147"; // Diakonisches Werk Passau + //t = "4947061147"; // Diakonisches Werk Passau //t = "9064234785"; // BeWo Rimbach //t = "9433783300"; // Wichernhaus gGmbH //t = "6282665941"; // Diakonisches Werk Regensburg