diff --git a/BeWo/View/Detail/SupportConceptView.xaml.cs b/BeWo/View/Detail/SupportConceptView.xaml.cs index 1e41d2e11..af686d029 100644 --- a/BeWo/View/Detail/SupportConceptView.xaml.cs +++ b/BeWo/View/Detail/SupportConceptView.xaml.cs @@ -2006,29 +2006,33 @@ namespace BeWo.View.Detail { foreach (var g in goals) { - if (!g.ValueListEntryOid.HasValue && g.ParentOid.HasValue) + if (!g.ValueListEntryOid.HasValue) { - var parent = FindGoalTreeItem(ViewModel.CombinedGoalTree, g.ParentOid.Value); - if (parent != null) + if (g.Parent != null) { - ViewModel.AddTreeItem(parent, g.Type, g.TypeDescription, "", "", null); + var parent = FindGoalTreeItem(ViewModel.CombinedGoalTree, g.Parent.TypeDescription); + if (parent != null) + { + ViewModel.AddTreeItem(parent, g.Type, g.TypeDescription, "", "", null); + } } + } } } - private SupportConceptGoalTreeItem FindGoalTreeItem(IList treeItems, long oid) + private SupportConceptGoalTreeItem FindGoalTreeItem(IList treeItems, String ziel) { if (treeItems != null) { foreach (var item in treeItems) { - if (item.GoalEntryVM.DataContract.ValueListEntryOid == oid) + if (item.GoalEntryVM.Description == ziel) { return item; } - var p = FindGoalTreeItem(item.Items, oid); + var p = FindGoalTreeItem(item.Items, ziel); if (p != null) { return p; diff --git a/Report/DefaultReportCreator.cs b/Report/DefaultReportCreator.cs index 45daf1072..6a99cf7b5 100644 --- a/Report/DefaultReportCreator.cs +++ b/Report/DefaultReportCreator.cs @@ -168,7 +168,12 @@ namespace BeWo.Report { var attrs = type.GetCustomAttributes(typeof(IDSpecificClassAttribute), true); if (attrs.Length == 0) - return Activator.CreateInstance(type) as IBeWoReport; + { + if (String.IsNullOrEmpty(typename) || type.FullName == typename) + { + return Activator.CreateInstance(type) as IBeWoReport; + } + } } if (!doNotUseReportsWithIdentifier) { diff --git a/Report/ReportObjects/FinanceRO.cs b/Report/ReportObjects/FinanceRO.cs index 60a7c04d1..27189813f 100644 --- a/Report/ReportObjects/FinanceRO.cs +++ b/Report/ReportObjects/FinanceRO.cs @@ -256,6 +256,11 @@ namespace BeWo.Report.ReportObjects } } + if (ro.Costbearer2Supportconcept.SupportConcept.Customer.LastName == "Akbulut") + { + int test = 0; + } + //Fehlkontakte if (end.HasValue && end < DateTime.MaxValue.AddDays(-1)) { @@ -329,10 +334,6 @@ namespace BeWo.Report.ReportObjects ro.AmountNichtFehlkontakteInReportTimeSpan = 0; ro.AmountFehlkontakteInReportTimeSpan = 0; - if (ro.Costbearer2Supportconcept.SupportConcept.Customer.LastName == "Atas") - { - int test = 0; - } foreach (var srDc in flsRecords) { if (srDc.Start >= start && srDc.Start.Value.Date <= end.Value.Date) diff --git a/ReportImp/BfpDus/Export/CustomCsvExporter.cs b/ReportImp/BfpDus/Export/CustomCsvExporter.cs index b0e36f339..653f686fa 100644 --- a/ReportImp/BfpDus/Export/CustomCsvExporter.cs +++ b/ReportImp/BfpDus/Export/CustomCsvExporter.cs @@ -6,6 +6,7 @@ using System.Linq; using System.Text; using BeWo.Data.Access; using BeWo.Data.Entities; +using BeWo.Report.ReportObjects; using BeWo.Service.ServiceImplementations; using BS.Shared.DataContracts; using DevExpress.Data.Helpers; @@ -249,70 +250,86 @@ KH Differenzen nicht berücksichtigen Bezeichnung Saldenliste - - * SELECT -sr.Oid, -sr.startdate, -sr.enddate, -sr.groupoid, -sr.customeroid, -sr.employeeOid, -sr.GroupPersonCount, -sd.Name, -sr.Notice -FROM servicerecord sr -inner join servicedescription sd on sd.oid = sr.servicedescriptionoid -where sr.startdate >= ':Von' and sr.startdate < ':Bis' */ StringBuilder sb = new StringBuilder(); - sb.Append("S_ID;Datum;Anfang;Ende;Gruppe;Gruppenleiter;Co_Leiter;Anzahl;Sitzungsart;Inhalt"); + sb.Append("ZG_ID;K_ID;KT;Bereits gezahlt;Bis dato geleistete FLS;Fehlkontakte;Betrag;Saldo"); - var sitzungen = CreateSitzungsdata(dt); + DateTime startdate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1); + DateTime enddate = startdate.AddMonths(1).AddDays(-1); - foreach (var data in sitzungen) + + foreach (DataRow row in dt.Rows) + { + var von = (String)row[0]; + var bis = (String)row[1]; + + if (DateTime.TryParse(von, out var s) && s < DateTime.MaxValue) + { + startdate = s; + } + if (DateTime.TryParse(bis, out var e) && e < DateTime.MaxValue) + { + enddate = e.AddDays(-1); + } + } + + var ro = FinanceRO.Create(startdate, enddate, false, false); + ro.CalculateBillableAmountInReportTimeSpan(); + var saldenliste = CreateSaldenliste(ro); + + foreach (var data in saldenliste) { sb.AppendLine(); - sb.Append(String.Format("{0}", data.SID)); // S_ID + sb.Append(String.Format("{0}", data.SupportConceptOid)); sb.Append(";"); - sb.Append(String.Format("{0:dd.MM.yyyy}", data.Datum)); // Datum + sb.Append(String.Format("{0}", data.CustomerOid)); sb.Append(";"); - - if (data.Anfang.HasValue) - { - sb.Append(String.Format("{0:HH:mm}", data.Anfang)); // Anfang - } - + sb.Append(String.Format("{0}", data.Organisation)); sb.Append(";"); - - if (data.Ende.HasValue) - { - sb.Append(String.Format("{0:HH:mm}", data.Ende)); // Anfang - } - + sb.Append(String.Format("{0:0.00}", data.BereitsGezahlt)); sb.Append(";"); - - if (data.Gruppe) - { - sb.Append("ja"); - } + sb.Append(String.Format("{0:0.00}", data.BisDatoGeleistet)); sb.Append(";"); - - sb.Append(data.GruppenLeiter); + sb.Append(String.Format("{0:0.00}", data.Fehlkontakte)); sb.Append(";"); - sb.Append(data.CoLeiter); + sb.Append(String.Format("{0:0.00}", data.Betrag)); sb.Append(";"); - sb.Append(String.Format("{0}", data.Anzahl)); // Anzahl - sb.Append(";"); - sb.Append(data.Sitzungsart); // Sitzungsart - sb.Append(";"); - sb.Append(String.Format("\"{0}\"", data.Inhalt)); // Inhalt + sb.Append(String.Format("{0:0.00}", data.Saldo)); } return sb.ToString(); } + private static List CreateSaldenliste(FinanceRO ro) + { + var liste = new List(); + + foreach (var item in ro.SupportConceptFinanceList) + { + var newEntry = new SaldolistenEintrag(); + + newEntry.SupportConceptOid = item.Costbearer2Supportconcept.SupportConcept.SupportConceptOid; + newEntry.CustomerOid = item.Costbearer2Supportconcept.SupportConcept.Customer.Oid.Value; + newEntry.CustomerName = item.Costbearer2Supportconcept.SupportConcept.Customer.LastNameFirstName; + newEntry.Organisation = item.CostBearerName; + newEntry.BereitsGezahlt = item.AmountPaid; + newEntry.BisDatoGeleistet = item.BillableHours; + newEntry.Fehlkontakte = item.StundenFehlkontakteInReportTimeSpan; + newEntry.Betrag = item.BillableAmountInReportTimeSpan; + newEntry.Saldo = item.AmountPaid - item.BillableAmountInReportTimeSpan; + + + if (newEntry.Saldo != 0 && item.Costbearer2Supportconcept.StartDate >= ro.ReportStartDate) + { + liste.Add(newEntry); + } + } + + return liste.OrderBy(a => a.CustomerName).ToList(); + } + private static String CreateCsvFromDataTable(DataTable dt) { StringBuilder sb = new StringBuilder(); @@ -366,4 +383,18 @@ where sr.startdate >= ':Von' and sr.startdate < ':Bis' public List EmployeeListe { get; set; } public List KlientenListe { get; set; } } + + public class SaldolistenEintrag + { + //"ZG_ID,K_ID;Kostenträger;Bereits gezahlt;Bis dato geleistete FLS;Fehlkontakte;Betrag;Saldo" + public long SupportConceptOid { get; set; } + public long CustomerOid { get; set; } + public String CustomerName { get; set; } + public String Organisation { get; set; } + public decimal BereitsGezahlt { get; set; } + public decimal BisDatoGeleistet { get; set; } + public decimal Fehlkontakte { get; set; } + public decimal Betrag { get; set; } + public decimal Saldo { get; set; } + } } \ No newline at end of file diff --git a/ReportImp/LebenshilfeFrankfurtOder/AllgemeineRechnung.Designer.cs b/ReportImp/LebenshilfeFrankfurtOder/AllgemeineRechnung.Designer.cs index aa8b42fa2..d4044672e 100644 --- a/ReportImp/LebenshilfeFrankfurtOder/AllgemeineRechnung.Designer.cs +++ b/ReportImp/LebenshilfeFrankfurtOder/AllgemeineRechnung.Designer.cs @@ -30,7 +30,7 @@ namespace LebenshilfeFrankfurtOder { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AllgemeineRechnung)); - DevExpress.XtraPrinting.Drawing.Watermark watermark1 = new DevExpress.XtraPrinting.Drawing.Watermark(); + DevExpress.XtraReports.UI.XRWatermark watermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel33 = new DevExpress.XtraReports.UI.XRLabel(); diff --git a/ReportImp/LebenshilfeFrankfurtOder/Invoicing/TagesstrukturInvoiceCreation.cs b/ReportImp/LebenshilfeFrankfurtOder/Invoicing/TagesstrukturInvoiceCreation.cs index 3b6dd1f2e..8fd0b958d 100644 --- a/ReportImp/LebenshilfeFrankfurtOder/Invoicing/TagesstrukturInvoiceCreation.cs +++ b/ReportImp/LebenshilfeFrankfurtOder/Invoicing/TagesstrukturInvoiceCreation.cs @@ -152,7 +152,7 @@ namespace LebenshilfeFrankfurtOder.Invoicing SetServiceInvoicePeriods(invoice, sc, invoicePeriod); decimal verpflegungspauschale = VERPFLEGUNGSPAUSCHALE_ABJan2023; - + if (invoicePeriod.StartDate < new DateTime(2023, 1, 1)) { verpflegungspauschale = VERPFLEGUNGSPAUSCHALE_ABJan2022; @@ -165,20 +165,10 @@ namespace LebenshilfeFrankfurtOder.Invoicing { verpflegungspauschale = VERPFLEGUNGSPAUSCHALE_BISDez2020; } - + if (invoicePeriod.StartDate >= new DateTime(2024, 1, 1)) { - var sd = DAOFactory.GenericDAO.GetAllActive().FirstOrDefault(s => s.Name == "Mittagsverpflegung Tagesstruktur"); - - if (sd != null) - { - var crList = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(sd.CostRatePeriods); - var crp = crList.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, invoicePeriod.StartDate); - if (crp != null && crp.CostRateValue.HasValue && crp.CostRateValue.Value > 0) - { - verpflegungspauschale = crp.CostRateValue.Value; - } - } + verpflegungspauschale = GetVerpflegungsPauschale(invoicePeriod.StartDate) ?? 0; } @@ -214,6 +204,31 @@ namespace LebenshilfeFrankfurtOder.Invoicing } + public static decimal? GetVerpflegungsPauschale(DateTime dt) + { + var cat = DAOFactory.SearchDAO.FindServiceCategoryByName("Tagesstruktur Mittagsverpflegung"); + + if (cat != null) + { + var descList = DAOFactory.SearchDAO.FindServiceDescriptionForCategory(cat.Oid.Value); + + foreach (var sd in descList) + { + var crps = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(sd.CostRatePeriods); + + decimal ts = 0; + var cr = crps.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, dt); + if (cr != null && cr.CostRateValue.HasValue) + { + return cr.CostRateValue.Value; + } + } + + } + + return null; + } + private void SetCustomerRecipientInformation(ServiceInvoice serviceInvoice, TagesstrukturSupportConcept sc) { diff --git a/ReportImp/LebenshilfeFrankfurtOder/RechnungTagesstrukturVerpflegung.Designer.cs b/ReportImp/LebenshilfeFrankfurtOder/RechnungTagesstrukturVerpflegung.Designer.cs index c2b82db94..bfaae85e8 100644 --- a/ReportImp/LebenshilfeFrankfurtOder/RechnungTagesstrukturVerpflegung.Designer.cs +++ b/ReportImp/LebenshilfeFrankfurtOder/RechnungTagesstrukturVerpflegung.Designer.cs @@ -30,7 +30,7 @@ namespace LebenshilfeFrankfurtOder { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RechnungTagesstrukturVerpflegung)); - DevExpress.XtraPrinting.Drawing.Watermark watermark1 = new DevExpress.XtraPrinting.Drawing.Watermark(); + DevExpress.XtraReports.UI.XRWatermark watermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel38 = new DevExpress.XtraReports.UI.XRLabel(); diff --git a/ReportImp/MuenchenerAidsHilfeEV/ServiceRecordListReport.cs b/ReportImp/MuenchenerAidsHilfeEV/ServiceRecordListReport.cs index 0b7d859db..053daf3db 100644 --- a/ReportImp/MuenchenerAidsHilfeEV/ServiceRecordListReport.cs +++ b/ReportImp/MuenchenerAidsHilfeEV/ServiceRecordListReport.cs @@ -34,7 +34,10 @@ namespace MuenchenerAidsHilfeEV for (int i = 0; i < pRO.ServiceRecordDetailList.Count; i++) { var sr = pRO.ServiceRecordDetailList[i]; - + if (sr.ServiceRecord.Notice2 == null) + { + sr.ServiceRecord.Notice2 = ""; //CB Sonst gibt es eine null pointer exception unten beim Zusammenführen + } var kwString = sr.Start.Value.Year.ToString() + calendar.GetWeekOfYear(sr.Start.Value, CalendarWeekRule.FirstDay, System.DayOfWeek.Monday).ToString(); if (!kwZuWochenstunden.ContainsKey(kwString)) kwZuWochenstunden.Add(kwString, 0m); diff --git a/ReportImp/ProfEggersStiftung/Invoicing/PflegeInvoiceCreation.cs b/ReportImp/ProfEggersStiftung/Invoicing/PflegeInvoiceCreation.cs index e38ba2091..984e55a83 100644 --- a/ReportImp/ProfEggersStiftung/Invoicing/PflegeInvoiceCreation.cs +++ b/ReportImp/ProfEggersStiftung/Invoicing/PflegeInvoiceCreation.cs @@ -84,7 +84,7 @@ namespace ProfEggersStiftung.Invoicing decimal? sumCustomerMonth = 0; foreach (var at in customer.AbsenceTimes) { - if (at.Start.HasValue && at.Start.Value < abrechnungEnde && + if (at.Start.HasValue && at.Start.Value.Date <= abrechnungEnde && (!at.End.HasValue || at.End.Value >= abrechnungStart)) { DateTime dt = at.Start.Value; @@ -92,7 +92,7 @@ namespace ProfEggersStiftung.Invoicing { dt = abrechnungStart; } - DateTime dtEnde = abrechnungEnde.AddDays(-1); + DateTime dtEnde = abrechnungEnde; if (at.End.HasValue && at.End.Value < dtEnde) { @@ -146,7 +146,7 @@ namespace ProfEggersStiftung.Invoicing ii.SupportConceptApprovalPeriodOid = scap.Oid; if (istTA) { - ii.ItemDescription += " TA"; + //ii.ItemDescription += " TA"; ii.Notice = "4"; } if (!istTA || abrechnungStart.Day == 1 || tageAbwesendImMonat > 0) @@ -219,15 +219,15 @@ namespace ProfEggersStiftung.Invoicing { preisBezeichnung = "Taschengeld mit 17"; } - else if (alter >= 16) + else if (alter >= 16 && alter < 17) { preisBezeichnung = "Taschengeld mit 16"; } - else if (alter >= 15) + else if (alter >= 15 && alter < 16) { preisBezeichnung = "Taschengeld mit 15"; } - else if (alter >= 14) + else if (alter >= 14 && alter < 15) { preisBezeichnung = "Taschengeld mit 14"; } diff --git a/ReportImp/TRIAS Ambulante Sozialarbeit/Rechnung.cs b/ReportImp/TRIAS Ambulante Sozialarbeit/Rechnung.cs index 1040f7429..9dada8760 100644 --- a/ReportImp/TRIAS Ambulante Sozialarbeit/Rechnung.cs +++ b/ReportImp/TRIAS Ambulante Sozialarbeit/Rechnung.cs @@ -152,38 +152,62 @@ namespace BeWo.TRIASAmbulanteSozialarbeit //1:9 601,95 //1:10 547,92 //1:12 466,90 - if (betrag == 1277.12m || betrag == 1366.21m) + + //CB: Ab 01.01.2025: + //Schlüssel 4 + //Schlüssel 5 + //Schlüssel 6 + //Schlüssel 7 + //Schlüssel 8 + //Schlüssel I + //Schlüssel 10 + //Schlüssel 12 + //1:4 1.803,06 € + //1:5 1.455,62 € + //1:6 1.223,98 € + //1:7 1.058,53 € + //1:8 934,44 € + //1:9 837,93 € + //1:10 760,71€ + //1:12 644,89 € + //1:13 600,35 + + if (betrag == 1277.12m || betrag == 1366.21m || betrag == 1803.06m) { return "1:4"; } - if (betrag == 1034.06m || betrag == 1106.13m) + if (betrag == 1034.06m || betrag == 1366.21m || betrag == 1455.62m) { return "1:5"; } - if (betrag == 872.02m || betrag == 932.75m) + if (betrag == 872.02m || betrag == 932.75m || betrag == 1223.98m) { return "1:6"; } - if (betrag == 756.27m || betrag == 808.90m) + if (betrag == 756.27m || betrag == 808.90m || betrag == 1058.53m) { return "1:7"; } - if (betrag == 669.47m || betrag == 716.01m) + if (betrag == 669.47m || betrag == 716.01m || betrag == 934.44m) { return "1:8"; } - if (betrag == 601.95m || betrag == 643.77m) + if (betrag == 601.95m || betrag == 643.77m || betrag == 837.93m) { return "1:9"; } - if (betrag == 547.92m || betrag == 585.98m) + if (betrag == 547.92m || betrag == 585.98m || betrag == 760.71m) { return "1:10"; } - if (betrag == 466.90m || betrag == 499.28m) + if (betrag == 466.90m || betrag == 499.28m || betrag == 644.89m) { return "1:12"; } + if (betrag == 600.35m) + { + return "1:13"; + } } } diff --git a/ReportImp/TRIAS Ambulante Sozialarbeit/RechnungHaushaltsnaheDienstleistung.Designer.cs b/ReportImp/TRIAS Ambulante Sozialarbeit/RechnungHaushaltsnaheDienstleistung.Designer.cs index a60e90069..5c61309a0 100644 --- a/ReportImp/TRIAS Ambulante Sozialarbeit/RechnungHaushaltsnaheDienstleistung.Designer.cs +++ b/ReportImp/TRIAS Ambulante Sozialarbeit/RechnungHaushaltsnaheDienstleistung.Designer.cs @@ -63,15 +63,16 @@ namespace BeWo.TRIASAmbulanteSozialarbeit this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + 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.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail2 = new DevExpress.XtraReports.UI.DetailBand(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - 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.lblIK = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -89,6 +90,7 @@ namespace BeWo.TRIASAmbulanteSozialarbeit // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.lblIK, this.lblAbrechnungszeitraum, this.lblAnrede, this.lblAdresse, @@ -141,18 +143,19 @@ namespace BeWo.TRIASAmbulanteSozialarbeit this.RechnungsNR.SizeF = new System.Drawing.SizeF(489.8335F, 20F); this.RechnungsNR.StylePriority.UseBackColor = false; this.RechnungsNR.StylePriority.UseFont = false; - this.RechnungsNR.Text = "Rechnung-Nr. [InvoiceNumber], haushaltsnahe Dienstleistung"; + this.RechnungsNR.Text = "Rechnung-Nr. [InvoiceNumber], haushaltsnahe Dienstleistung Grundlage § 45b SGB XI" + + " "; this.RechnungsNR.WordWrap = false; // // DatumsAnzeige // - this.DatumsAnzeige.LocationFloat = new DevExpress.Utils.PointFloat(498.2497F, 231.7917F); + this.DatumsAnzeige.LocationFloat = new DevExpress.Utils.PointFloat(311.0834F, 220.1251F); this.DatumsAnzeige.Name = "DatumsAnzeige"; this.DatumsAnzeige.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.DatumsAnzeige.SizeF = new System.Drawing.SizeF(176.7499F, 23F); this.DatumsAnzeige.StylePriority.UseTextAlignment = false; this.DatumsAnzeige.Text = "Itzgrund, den [InvoiceDate]"; - this.DatumsAnzeige.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.DatumsAnzeige.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; // // xrTable2 // @@ -411,41 +414,6 @@ namespace BeWo.TRIASAmbulanteSozialarbeit this.xrTableCell10.TextFormatString = "{0:c}"; this.xrTableCell10.Weight = 1.1121721663555195D; // - // DetailReport - // - this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { - this.Detail1, - this.DetailReport1}); - this.DetailReport.DataMember = "ServiceInvoicePeriods"; - this.DetailReport.DataSource = this.bindingSource1; - this.DetailReport.Level = 0; - this.DetailReport.Name = "DetailReport"; - // - // Detail1 - // - this.Detail1.HeightF = 0F; - this.Detail1.Name = "Detail1"; - // - // DetailReport1 - // - this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { - this.Detail2}); - this.DetailReport1.DataMember = "ServiceInvoicePeriods.ServiceInvoiceItems"; - this.DetailReport1.DataSource = this.bindingSource1; - this.DetailReport1.Level = 0; - this.DetailReport1.Name = "DetailReport1"; - // - // Detail2 - // - this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrTable3}); - this.Detail2.HeightF = 60F; - this.Detail2.Name = "Detail2"; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); - // // xrTableRow1 // this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { @@ -491,6 +459,53 @@ namespace BeWo.TRIASAmbulanteSozialarbeit this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell3.Weight = 1.1121721663555195D; // + // DetailReport + // + this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail1, + this.DetailReport1}); + this.DetailReport.DataMember = "ServiceInvoicePeriods"; + this.DetailReport.DataSource = this.bindingSource1; + this.DetailReport.Level = 0; + this.DetailReport.Name = "DetailReport"; + // + // Detail1 + // + this.Detail1.HeightF = 0F; + this.Detail1.Name = "Detail1"; + // + // DetailReport1 + // + this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail2}); + this.DetailReport1.DataMember = "ServiceInvoicePeriods.ServiceInvoiceItems"; + this.DetailReport1.DataSource = this.bindingSource1; + this.DetailReport1.Level = 0; + this.DetailReport1.Name = "DetailReport1"; + // + // Detail2 + // + this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable3}); + this.Detail2.HeightF = 60F; + this.Detail2.Name = "Detail2"; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); + // + // lblIK + // + this.lblIK.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.lblIK.LocationFloat = new DevExpress.Utils.PointFloat(508.2501F, 282.2917F); + this.lblIK.Name = "lblIK"; + this.lblIK.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblIK.SizeF = new System.Drawing.SizeF(176.7499F, 21.33337F); + this.lblIK.StylePriority.UseFont = false; + this.lblIK.StylePriority.UseTextAlignment = false; + this.lblIK.Text = "Institutskennzeichen: 460948378"; + this.lblIK.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // // RechnungHaushaltsnaheDienstleistung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -564,5 +579,6 @@ namespace BeWo.TRIASAmbulanteSozialarbeit private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; + private DevExpress.XtraReports.UI.XRLabel lblIK; } } diff --git a/ReportImp/TRIAS Ambulante Sozialarbeit/RechnungHaushaltsnaheDienstleistung.cs b/ReportImp/TRIAS Ambulante Sozialarbeit/RechnungHaushaltsnaheDienstleistung.cs index 36a3b5010..20615d5ed 100644 --- a/ReportImp/TRIAS Ambulante Sozialarbeit/RechnungHaushaltsnaheDienstleistung.cs +++ b/ReportImp/TRIAS Ambulante Sozialarbeit/RechnungHaushaltsnaheDienstleistung.cs @@ -38,7 +38,12 @@ namespace BeWo.TRIASAmbulanteSozialarbeit sb.AppendLine(pRO.RecipientPostCodeAndTown); } lblAdresse.Text = sb.ToString(); + lblIK.Text = "Institutskennzeichen: 460948378"; + //if (!String.IsNullOrEmpty(pRO.BusinessPartnerId)) + //{ + + //} SetzeAnrede(pRO); decimal stundensatz = 0; diff --git a/ReportImp/WendepunktVelbert/SettlementReport2.Designer.cs b/ReportImp/WendepunktVelbert/SettlementReport2.Designer.cs index 4b82f7192..4a0958130 100644 --- a/ReportImp/WendepunktVelbert/SettlementReport2.Designer.cs +++ b/ReportImp/WendepunktVelbert/SettlementReport2.Designer.cs @@ -32,7 +32,7 @@ namespace WendepunktVelbert this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung)); DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); - DevExpress.XtraPrinting.Drawing.Watermark watermark1 = new DevExpress.XtraPrinting.Drawing.Watermark(); + DevExpress.XtraReports.UI.XRWatermark watermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); diff --git a/Service/Core/Utils.cs b/Service/Core/Utils.cs index 8b70fcef4..c13ff289a 100644 --- a/Service/Core/Utils.cs +++ b/Service/Core/Utils.cs @@ -121,6 +121,7 @@ namespace BeWo.Service.Core else { body2 = "Kunde: " + MultitenancyOperationContextExt.Current.Tenant; + body2 += "\nE-Mail: " + senderEMail; //body2 += "\r\nIP: " + GetClientIP(); } @@ -167,6 +168,7 @@ namespace BeWo.Service.Core } if (senderEMail != from) { + //Das hier rausnehmen wenn Mike OK gibt message.ReplyToList.Add(new MailAddress(senderEMail, senderName)); }