From 8184426879231eb7076b5da761bd9dd21d742843 Mon Sep 17 00:00:00 2001 From: Christian Date: Tue, 22 Feb 2022 11:58:42 +0100 Subject: [PATCH] cb --- BeWo/BeWoApp.xaml.cs | 4 +- BeWo/MainControl.xaml | 2 +- BeWo/View/BargeldkassenView.xaml | 16 +- BeWo/View/BargeldkassenView.xaml.cs | 1 + BeWo/View/Detail/CustomerView.xaml | 2 +- BeWo/View/Detail/EmployeeView.xaml | 8 + BeWo/View/Detail/EmployeeView.xaml.cs | 17 +- BeWo/View/Master/FinanceView.xaml.cs | 35 +- BeWo/View/Master/ReportView.xaml.cs | 2 +- .../KilometerauslastungsView.xaml.cs | 20 +- BeWo/ViewModel/BargeldtransaktionsVM.cs | 54 +- Data/Entities/Bargeldtransaktion.cs | 5 +- Data/Mappings/Bargeldtransaktion.hbm.xml | 2 +- Host/ReportView.aspx.cs | 15 + Model/Changes_2022_02_11_ContractHistory.txt | 2 +- Model/Changes_2022_02_21_Bargeldkasse.txt | 1 + Report/AbstractReportCreator.cs | 6 +- Report/DefaultReportCreator.cs | 9 + .../EmployeeCustomerListReport.Designer.cs | 335 +++++++++ .../EmployeeCustomerListReport.cs | 23 + .../EmployeeCustomerListReport.resx | 123 ++++ Report/Report.csproj | 11 + .../ReportObjects/EmployeeCustomerListRO.cs | 65 ++ .../MitarbeiterstundenkontoBerechnung.cs | 30 +- .../MitarbeiterstundenkontoRO.cs | 8 +- ...CustomMitarbeiterstundenkontoBerechnung.cs | 34 +- .../ServicesOverviewReportALS.designer.cs | 28 +- .../ServicesOverviewReportFLS.designer.cs | 2 +- .../DomizielAnsbach/CustomReportCreator.cs | 74 ++ .../DomizielAnsbach/DomizielAnsbach.csproj | 1 + .../Invoicing/CollectiveInvoiceCreation.cs | 8 + .../Invoicing/InvoiceHelper.cs | 17 + .../Invoicing/StationaerInvoiceCreation.cs | 12 +- .../QuittierungsbelegAbw.Designer.cs | 279 ++++++-- .../DomizielAnsbach/QuittierungsbelegAbw.cs | 48 +- .../QuittierungsbelegPB.Designer.cs | 44 +- .../Invoicing/TagesstrukturInvoiceCreation.cs | 8 +- .../CollectiveBillingReport.Designer.cs | 34 +- .../Invoicing/CustomInvoiceFactory.cs | 56 +- .../ServiceInvoiceReport.Designer.cs | 657 +++++++++--------- .../ServiceInvoiceReport.cs | 6 +- .../ServiceInvoiceReport.resx | 12 + ...BargeldtransaktionDC_Bargeldtransaktion.cs | 2 + Service/Plugins/PluginLoader.cs | 4 +- Shared/BeWoEntityEnums.cs | 3 + Shared/Core/EnumTranslations.cs | 11 +- Shared/DataContracts/BargeldtransaktionDC.cs | 5 +- .../ClientPartials/CompactCustomerDC.cs | 2 +- .../ClientPartials/CompactEmployeeDC.cs | 2 +- Shared/DataContracts/ReportTypes.cs | 3 +- 50 files changed, 1553 insertions(+), 595 deletions(-) create mode 100644 Model/Changes_2022_02_21_Bargeldkasse.txt create mode 100644 Report/DefaultReports/EmployeeCustomerListReport.Designer.cs create mode 100644 Report/DefaultReports/EmployeeCustomerListReport.cs create mode 100644 Report/DefaultReports/EmployeeCustomerListReport.resx create mode 100644 Report/ReportObjects/EmployeeCustomerListRO.cs create mode 100644 ReportImp/DomizielAnsbach/Invoicing/InvoiceHelper.cs diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs index 241f99335..2ed50a705 100644 --- a/BeWo/BeWoApp.xaml.cs +++ b/BeWo/BeWoApp.xaml.cs @@ -48,8 +48,8 @@ namespace BeWo public static LoginControl LoginControl; public static MainControl MainControl; - public static string ShortVersion = "3.6"; - public static string Version = "Version 3.6"; + public static string ShortVersion = "3.7"; + public static string Version = "Version 3.7"; public static int RenderTier = 0; diff --git a/BeWo/MainControl.xaml b/BeWo/MainControl.xaml index a06ca2665..0022248d9 100644 --- a/BeWo/MainControl.xaml +++ b/BeWo/MainControl.xaml @@ -246,7 +246,7 @@ - @@ -110,6 +111,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + \ No newline at end of file diff --git a/Report/Report.csproj b/Report/Report.csproj index 4c87f5ee7..6125f64f6 100644 --- a/Report/Report.csproj +++ b/Report/Report.csproj @@ -133,6 +133,12 @@ AbwesenheitsPrintReport.cs + + Component + + + EmployeeCustomerListReport.cs + Component @@ -410,6 +416,7 @@ + @@ -465,6 +472,10 @@ AbwesenheitsPrintReport.cs Designer + + EmployeeCustomerListReport.cs + Designer + RosterIstReport.cs diff --git a/Report/ReportObjects/EmployeeCustomerListRO.cs b/Report/ReportObjects/EmployeeCustomerListRO.cs new file mode 100644 index 000000000..1b4320110 --- /dev/null +++ b/Report/ReportObjects/EmployeeCustomerListRO.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BeWo.Data.ICD10; +using BeWo.Service.DCEntityMapper; +using BS.Shared; +using BS.Shared.DataContracts; +using BS.Shared.DataContracts.Compact; + +namespace BeWo.Report.ReportObjects +{ + public class EmployeeCustomerListRO : AbstractBeWoReportObject + { + + public EmployeeDC Employee { get; set; } + + public IList CustomerList { get; set; } + + public static EmployeeCustomerListRO Create(long? employeeOid) + { + var emp = DAOFactory.GenericDAO.LoadByID(employeeOid.Value); + var empDc = MapperFactory.EmployeeDC_Employee.MapToNewDC(emp); + + var result = new EmployeeCustomerListRO(); + result.Employee = empDc; + result.CustomerList = new List(); + + foreach (var e2c in emp.Employee2CustomerList) + { + if (e2c.Customer.IsActive == ActivationTypeId.Active) + { + Employee2CustomerDetail e2cDetail = new Employee2CustomerDetail(); + e2cDetail.Notiz = e2c.Notice; + + foreach (var v2o in e2c.ValueList) + { + if (v2o.Entry.Type == ValueListEntryType.StaffRoleType) + { + e2cDetail.Rolle = v2o.Entry.Value; + } + + } + + e2cDetail.Customer = MapperFactory.CompactCustomerDC_Customer.MapToNewDC(e2c.Customer); + result.CustomerList.Add(e2cDetail); + } + } + + //result.Notice = pDC.Notice; + result.CustomerList = result.CustomerList.OrderBy(c => c.Customer.LastNameFirstName).ToList(); + return result; + } + } + + public class Employee2CustomerDetail + { + public String Rolle { get; set; } + + public String Notiz { get; set; } + + public CompactCustomerDC Customer { get; set; } + } +} \ No newline at end of file diff --git a/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs b/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs index 283cf3e6f..b5cb61270 100644 --- a/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs +++ b/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs @@ -23,6 +23,8 @@ namespace BeWo.Report.ReportObjects public MitarbeiterstundenkontoRO.EmployeeDetail AktuellBearbeitetesEmployeeDetail { get; set; } + + public MitarbeiterstundenkontoBerechnung() { appSettings = AppSettings.CreateSettings(); @@ -135,25 +137,31 @@ namespace BeWo.Report.ReportObjects decimal stundenSollGesamt = 0; decimal tatSollStdGesamt = 0; - IList recordsAll = DAOFactory.SearchDAO.FindServiceRecords(emp.Oid, null); - recordsAll = AnalysisServiceImp.FilterActiveServiceRecords(recordsAll); + IList groupFilteredRecords = empDetail.AllServiceRecords; - // - IList groupFilteredRecords = new List(); - Dictionary groupBookingDict = new Dictionary(); - foreach (var item in recordsAll) + if (groupFilteredRecords == null) { + IList recordsAll = DAOFactory.SearchDAO.FindServiceRecords(emp.Oid, null); + recordsAll = AnalysisServiceImp.FilterActiveServiceRecords(recordsAll); - if (!item.GroupOid.HasValue || !groupBookingDict.ContainsKey(item.GroupOid.Value)) + // + groupFilteredRecords = new List(); + Dictionary groupBookingDict = new Dictionary(); + foreach (var item in recordsAll) { - groupFilteredRecords.Add(item); - if (item.GroupOid.HasValue) + + if (!item.GroupOid.HasValue || !groupBookingDict.ContainsKey(item.GroupOid.Value)) { - groupBookingDict.Add(item.GroupOid.Value, true); + groupFilteredRecords.Add(item); + if (item.GroupOid.HasValue) + { + groupBookingDict.Add(item.GroupOid.Value, true); + } } } - } + empDetail.AllServiceRecords = groupFilteredRecords; + } while (berichtsAnfang < berichtsEnde) { StarteBerechnung(berichtsAnfang, berichtsEnde, empDetail); diff --git a/Report/ReportObjects/MitarbeiterstundenkontoRO.cs b/Report/ReportObjects/MitarbeiterstundenkontoRO.cs index 1c860bc30..e78644176 100644 --- a/Report/ReportObjects/MitarbeiterstundenkontoRO.cs +++ b/Report/ReportObjects/MitarbeiterstundenkontoRO.cs @@ -234,7 +234,9 @@ namespace BeWo.Report.ReportObjects public IList Days { get; set; } - public IList ServiceRecordsInSelectedTimeSpan { get; set; } + public IList AllServiceRecords { get; set; } + + public IList ServiceRecordsInSelectedTimeSpan { get; set; } public Employee Employee { get; set; } @@ -330,8 +332,8 @@ namespace BeWo.Report.ReportObjects public String Regelarbeitszeit { get; set; } public int ArbeitstageProWoche { get; set; } - - public decimal ArbeitstageImBerichtszeitraum { get; set; } + + public decimal ArbeitstageImBerichtszeitraum { get; set; } public AbsenceTimeDays AbsenceTimeDays { get; set; } public decimal? HourlyRate { get; set; } diff --git a/ReportImp/AlphaEv/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/AlphaEv/CustomMitarbeiterstundenkontoBerechnung.cs index edc0721e3..2440eb1f5 100644 --- a/ReportImp/AlphaEv/CustomMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/AlphaEv/CustomMitarbeiterstundenkontoBerechnung.cs @@ -402,25 +402,27 @@ namespace AlphaEv return sum; } - protected override decimal? BerechneUeberstunden(MitarbeiterstundenkontoRO.EmployeeDetail ed, decimal? ueberstundenStd, Contract contract, DateTime start, - DateTime ende) - { - var flsSoll = BerechneFlsSoll(ed.Employee, contract, start, ende, ed.StundenSollOhneUrlaubKrankheit, ed.StundenSollOhneUrlaubKrankheit); + //protected override decimal? BerechneUeberstunden(MitarbeiterstundenkontoRO.EmployeeDetail ed, decimal? ueberstundenStd, Contract contract, DateTime start, + // DateTime ende) + //{ + // var flsSoll = BerechneFlsSoll(ed.Employee, contract, start, ende, ed.StundenSollOhneUrlaubKrankheit, ed.StundenSollOhneUrlaubKrankheit); - var diff = ed.FlsIst - flsSoll; + // var diff = ed.FlsIst - flsSoll; - var std = Math.Round(Math.Round(diff, 2, MidpointRounding.AwayFromZero) * (4m / 3m), 2, MidpointRounding.AwayFromZero); - //std *= (4 / 3); - //if (ed.UeberstundenVormonat.HasValue && ed.UeberstundenVormonat.Value > 0) - //{ - // int test = 0; - //} - decimal stunden = 0; - BerechneExtraUeberstunden(ed.Employee, start, ende, out stunden); + // var std = Math.Round(Math.Round(diff, 2, MidpointRounding.AwayFromZero) * (4m / 3m), 2, MidpointRounding.AwayFromZero); + // //std *= (4 / 3); + // //if (ed.UeberstundenVormonat.HasValue && ed.UeberstundenVormonat.Value > 0) + // //{ + // // int test = 0; + // //} + // decimal stunden = 0; + // BerechneExtraUeberstunden(ed.Employee, start, ende, out stunden); - std += stunden; + // std += stunden; - return std + (ed.UeberstundenVormonat ?? 0); - } + // std += 100000; + + // return std + (ed.UeberstundenVormonat ?? 0); + //} } } diff --git a/ReportImp/BetreuWoReports/ServicesOverviewReportALS.designer.cs b/ReportImp/BetreuWoReports/ServicesOverviewReportALS.designer.cs index 0651a3018..35a91a28b 100644 --- a/ReportImp/BetreuWoReports/ServicesOverviewReportALS.designer.cs +++ b/ReportImp/BetreuWoReports/ServicesOverviewReportALS.designer.cs @@ -54,6 +54,7 @@ namespace BeWo.BetreuWoReports this.lblTotalMinutes = new DevExpress.XtraReports.UI.XRLabel(); this.lblHoursMinutesString = new DevExpress.XtraReports.UI.XRLabel(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo(); this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText(); this.lblApprovedMinutes = new DevExpress.XtraReports.UI.XRLabel(); @@ -78,7 +79,6 @@ namespace BeWo.BetreuWoReports this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.GroupFooter3 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); - this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -337,6 +337,18 @@ namespace BeWo.BetreuWoReports this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; // + // xrLabel2 + // + this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 60.99998F); + this.xrLabel2.Name = "xrLabel2"; + this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(433.33F, 20F); + this.xrLabel2.StylePriority.UseFont = false; + this.xrLabel2.StylePriority.UseTextAlignment = false; + this.xrLabel2.Text = "Az.: [ReferenceNumber]"; + this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // // xrPageInfo1 // this.xrPageInfo1.Format = "{0:dd.MM.yyyy}"; @@ -527,7 +539,7 @@ namespace BeWo.BetreuWoReports this.xrLabel8.SizeF = new System.Drawing.SizeF(140F, 20F); this.xrLabel8.StylePriority.UseFont = false; this.xrLabel8.StylePriority.UseTextAlignment = false; - this.xrLabel8.Text = "Fallmanager/in:"; + this.xrLabel8.Text = "Mitarbeiter:in"; this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; // // xrLabel1 @@ -557,18 +569,6 @@ namespace BeWo.BetreuWoReports this.GroupHeader2.Name = "GroupHeader2"; this.GroupHeader2.RepeatEveryPage = true; // - // xrLabel2 - // - this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 60.99998F); - this.xrLabel2.Name = "xrLabel2"; - this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel2.SizeF = new System.Drawing.SizeF(433.33F, 20F); - this.xrLabel2.StylePriority.UseFont = false; - this.xrLabel2.StylePriority.UseTextAlignment = false; - this.xrLabel2.Text = "Az.: [ReferenceNumber]"; - this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // // StundenzettelALS // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { diff --git a/ReportImp/BetreuWoReports/ServicesOverviewReportFLS.designer.cs b/ReportImp/BetreuWoReports/ServicesOverviewReportFLS.designer.cs index c71a4a388..f8656bf8b 100644 --- a/ReportImp/BetreuWoReports/ServicesOverviewReportFLS.designer.cs +++ b/ReportImp/BetreuWoReports/ServicesOverviewReportFLS.designer.cs @@ -575,7 +575,7 @@ namespace BeWo.BetreuWoReports this.xrLabel8.SizeF = new System.Drawing.SizeF(140F, 20F); this.xrLabel8.StylePriority.UseFont = false; this.xrLabel8.StylePriority.UseTextAlignment = false; - this.xrLabel8.Text = "Fallmanager/in:"; + this.xrLabel8.Text = "Mitarbeiter:in"; this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; // // xrLabel6 diff --git a/ReportImp/DomizielAnsbach/CustomReportCreator.cs b/ReportImp/DomizielAnsbach/CustomReportCreator.cs index 66abc3ddc..04eac9a89 100644 --- a/ReportImp/DomizielAnsbach/CustomReportCreator.cs +++ b/ReportImp/DomizielAnsbach/CustomReportCreator.cs @@ -100,6 +100,80 @@ namespace DomizielAnsbach return new XtraReport(); } + public override XtraReport CreateServiceOverviewAllCustomersReport(int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay) + { + List lROs = ServicesOverviewRO.Create(month, year, orgaOid, empOid, startDay, endDay, serviceCategoryOid); + + if (lROs.Count > 0) + { + + var rootReport = CreateServicesOverviewReportForRo(lROs[0], serviceCategoryOid); + rootReport.CreateDocument(); + + for (int i = 1; i < lROs.Count; i++) + { + var lNext = CreateServicesOverviewReportForRo(lROs[i], serviceCategoryOid); + + if (lNext.Pages.Count == 0) + { + lNext.CreateDocument(); + } + + rootReport.Pages.AddRange(lNext.Pages); + } + + return rootReport; + } + return new XtraReport(); + } + + public override XtraReport CreateServiceOverviewSingleCustomerReport(long customerOid, int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay) + { + var ro = ServicesOverviewRO.Create(customerOid, month, year, false, orgaOid, empOid, startDay, endDay, serviceCategoryOid); + + return CreateServicesOverviewReportForRo(ro, serviceCategoryOid); + + } + + private XtraReport CreateServicesOverviewReportForRo(ServicesOverviewRO ro, long? serviceCategoryOid) + { + XtraReport report = null; + + + ServicesOverviewRO bewoRo = ServicesOverviewRO.CopyFromRO(ro); + ServicesOverviewRO pbRo = ServicesOverviewRO.CopyFromRO(ro); + + + + if (ro.Services != null) + { + foreach (ServicesOverviewRO.ServiceDetail s in ro.Services) + { + //if (!s.ServiceCategory.StartsWith("Dienstleistung")) + //{ + if (s.ServiceCategory.Contains("Ambulant Betreutes ")) + { + bewoRo.Services.Add(s); + } + else + { + pbRo.Services.Add(s); + } + + } + + } + + report = AddSubServicesOverviewReportToReport(report, new QuittierungsbelegAbw(), bewoRo); + report = AddSubServicesOverviewReportToReport(report, new QuittierungsbelegPB(), pbRo); + + + if (report == null) + report = new XtraReport(); + + return report as XtraReport; + } + } } diff --git a/ReportImp/DomizielAnsbach/DomizielAnsbach.csproj b/ReportImp/DomizielAnsbach/DomizielAnsbach.csproj index cf7210839..4f4b67901 100644 --- a/ReportImp/DomizielAnsbach/DomizielAnsbach.csproj +++ b/ReportImp/DomizielAnsbach/DomizielAnsbach.csproj @@ -49,6 +49,7 @@ + diff --git a/ReportImp/DomizielAnsbach/Invoicing/CollectiveInvoiceCreation.cs b/ReportImp/DomizielAnsbach/Invoicing/CollectiveInvoiceCreation.cs index de92a0fb8..5c53821ac 100644 --- a/ReportImp/DomizielAnsbach/Invoicing/CollectiveInvoiceCreation.cs +++ b/ReportImp/DomizielAnsbach/Invoicing/CollectiveInvoiceCreation.cs @@ -93,6 +93,12 @@ namespace DomizielAnsbach.Invoicing { cat = scap.ServiceCategory.Name; } + + if (cat.Contains("stationär")) + { + + } + foreach (var billingData in data) { serviceInvoicePeriod.InvoiceItemList.Add(new InvoiceItem @@ -107,6 +113,8 @@ namespace DomizielAnsbach.Invoicing ItemDescription = cat }); } + + } } } diff --git a/ReportImp/DomizielAnsbach/Invoicing/InvoiceHelper.cs b/ReportImp/DomizielAnsbach/Invoicing/InvoiceHelper.cs new file mode 100644 index 000000000..0a1f4a1f5 --- /dev/null +++ b/ReportImp/DomizielAnsbach/Invoicing/InvoiceHelper.cs @@ -0,0 +1,17 @@ +using BeWo.Data.Entities; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DomizielAnsbach.Invoicing +{ + public class InvoiceHelper + { + public IList BerechneRechnungsPositionenFuerStationaer() + { + + } + } +} diff --git a/ReportImp/DomizielAnsbach/Invoicing/StationaerInvoiceCreation.cs b/ReportImp/DomizielAnsbach/Invoicing/StationaerInvoiceCreation.cs index 513a31758..155a93a0d 100644 --- a/ReportImp/DomizielAnsbach/Invoicing/StationaerInvoiceCreation.cs +++ b/ReportImp/DomizielAnsbach/Invoicing/StationaerInvoiceCreation.cs @@ -138,7 +138,13 @@ namespace DomizielAnsbach.Invoicing foreach (var at in customer.AbsenceTimes) { - if (at.Start.HasValue && at.Start.Value < monatEnde && (!at.End.HasValue || at.End.Value >= monatStart)) + DateTime? startAbw = at.Start; + DateTime? endMinusEinTag = at.End; + if (at.Start.HasValue && at.End.HasValue && at.End.Value.Date.Subtract(at.Start.Value.Date).TotalDays > 0) + { + endMinusEinTag = at.End.Value.AddDays(-1); + } + if (startAbw.HasValue && startAbw.Value < monatEnde && (!endMinusEinTag.HasValue || endMinusEinTag.Value >= monatStart)) { DateTime abwStart = at.Start.Value; if (start > abwStart) @@ -147,9 +153,9 @@ namespace DomizielAnsbach.Invoicing } DateTime abwEnd = monatEnde.AddDays(-1); - if (at.End.HasValue && at.End < monatEnde) + if (endMinusEinTag.HasValue && endMinusEinTag < monatEnde) { - abwEnd = at.End.Value; + abwEnd = endMinusEinTag.Value; } DateTime dt = abwStart; diff --git a/ReportImp/DomizielAnsbach/QuittierungsbelegAbw.Designer.cs b/ReportImp/DomizielAnsbach/QuittierungsbelegAbw.Designer.cs index 42eaabe62..1e686b3d5 100644 --- a/ReportImp/DomizielAnsbach/QuittierungsbelegAbw.Designer.cs +++ b/ReportImp/DomizielAnsbach/QuittierungsbelegAbw.Designer.cs @@ -31,10 +31,13 @@ namespace DomizielAnsbach { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(QuittierungsbelegAbw)); + DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.xrTableServiceRecords1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -44,11 +47,10 @@ namespace DomizielAnsbach this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); - this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); @@ -76,9 +78,20 @@ namespace DomizielAnsbach this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -92,15 +105,15 @@ namespace DomizielAnsbach // // xrTableServiceRecords1 // - this.xrTableServiceRecords1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableServiceRecords1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTableServiceRecords1.Name = "xrTableServiceRecords1"; this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTableServiceRecords1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow2}); - this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(670F, 60F); + this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(670F, 110F); this.xrTableServiceRecords1.StylePriority.UseBackColor = false; this.xrTableServiceRecords1.StylePriority.UseBorders = false; this.xrTableServiceRecords1.StylePriority.UseFont = false; @@ -109,39 +122,46 @@ namespace DomizielAnsbach // // xrTableRow2 // + this.xrTableRow2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(197)))), ((int)(((byte)(217)))), ((int)(((byte)(241))))); this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { this.xrTableCell3, + this.xrTableCell6, this.xrTableCell1, this.xrTableCell4, this.xrTableCell11}); this.xrTableRow2.Name = "xrTableRow2"; this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.xrTableRow2.StylePriority.UseBackColor = false; this.xrTableRow2.StylePriority.UseTextAlignment = false; - this.xrTableRow2.Weight = 1.875D; + this.xrTableRow2.Weight = 3.4375D; // // xrTableCell3 // - this.xrTableCell3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(219)))), ((int)(((byte)(238)))), ((int)(((byte)(243))))); this.xrTableCell3.Name = "xrTableCell3"; this.xrTableCell3.StylePriority.UseBackColor = false; this.xrTableCell3.StylePriority.UseFont = false; this.xrTableCell3.StylePriority.UsePadding = false; this.xrTableCell3.StylePriority.UseTextAlignment = false; this.xrTableCell3.Text = "Datum"; - this.xrTableCell3.Weight = 0.26824509954648823D; + this.xrTableCell3.Weight = 0.2194732635305279D; + // + // xrTableCell6 + // + this.xrTableCell6.Multiline = true; + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.Text = "Dauer\r\nder\r\nindirekten\r\nklienten-\r\nbezogenen\r\nTätigkeiten\r\n"; + this.xrTableCell6.Weight = 0.20728030270315478D; // // xrTableCell1 // - this.xrTableCell1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(219)))), ((int)(((byte)(238)))), ((int)(((byte)(243))))); this.xrTableCell1.Multiline = true; this.xrTableCell1.Name = "xrTableCell1"; this.xrTableCell1.StylePriority.UseBackColor = false; - this.xrTableCell1.Text = "Dauer des Kontaktes"; - this.xrTableCell1.Weight = 0.26824509735842855D; + this.xrTableCell1.Text = "Dauer\r\nder\r\ndirekten\r\nKlienten-\r\nkontakte"; + this.xrTableCell1.Weight = 0.2072803027031547D; // // xrTableCell4 // - this.xrTableCell4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(219)))), ((int)(((byte)(238)))), ((int)(((byte)(243))))); this.xrTableCell4.Name = "xrTableCell4"; this.xrTableCell4.StylePriority.UseBackColor = false; this.xrTableCell4.StylePriority.UsePadding = false; @@ -150,21 +170,21 @@ namespace DomizielAnsbach // // xrTableCell11 // - this.xrTableCell11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(219)))), ((int)(((byte)(238)))), ((int)(((byte)(243))))); this.xrTableCell11.Multiline = true; this.xrTableCell11.Name = "xrTableCell11"; this.xrTableCell11.StylePriority.UseBackColor = false; this.xrTableCell11.StylePriority.UseFont = false; this.xrTableCell11.StylePriority.UsePadding = false; this.xrTableCell11.StylePriority.UseTextAlignment = false; - this.xrTableCell11.Text = "Unterschrift Budgetnehmer"; - this.xrTableCell11.Weight = 0.31701693373906548D; + this.xrTableCell11.Text = "Berufs-\r\ngruppe"; + this.xrTableCell11.Weight = 0.21947326170714482D; // // DetailReport // this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { this.Detail1, - this.GroupHeader1}); + this.GroupHeader1, + this.GroupFooter1}); this.DetailReport.DataMember = "Services"; this.DetailReport.DataSource = this.bindingSource1; this.DetailReport.Level = 0; @@ -176,7 +196,6 @@ namespace DomizielAnsbach // this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable3}); - this.Detail1.Font = new System.Drawing.Font("Arial", 11F); this.Detail1.HeightF = 25F; this.Detail1.Name = "Detail1"; this.Detail1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); @@ -186,7 +205,7 @@ namespace DomizielAnsbach // xrTable3 // this.xrTable3.BorderColor = System.Drawing.Color.Black; - this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable3.Name = "xrTable3"; @@ -202,6 +221,7 @@ namespace DomizielAnsbach this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { this.xrTableCell13, this.xrTableCell2, + this.xrTableCell7, this.xrTableCell15, this.xrTableCell5}); this.xrTableRow6.Name = "xrTableRow6"; @@ -220,18 +240,30 @@ namespace DomizielAnsbach this.xrTableCell13.StylePriority.UseTextAlignment = false; this.xrTableCell13.Text = "xrTableCell13"; this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell13.Weight = 0.13888887377323028D; + this.xrTableCell13.Weight = 0.11363635923509893D; // // xrTableCell2 // this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Minutes", "{0:0.##} Min.")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.MinutesUnqualified", "{0:0.##} Min.")}); this.xrTableCell2.Name = "xrTableCell2"; this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 3, 0, 100F); this.xrTableCell2.StylePriority.UsePadding = false; this.xrTableCell2.StylePriority.UseTextAlignment = false; this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell2.Weight = 0.13888887698574931D; + this.xrTableCell2.Weight = 0.10732323140481673D; + // + // xrTableCell7 + // + this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.MinutesQualified")}); + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 3, 0, 100F); + this.xrTableCell7.StylePriority.UsePadding = false; + this.xrTableCell7.StylePriority.UseTextAlignment = false; + this.xrTableCell7.Text = "xrTableCell7"; + this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell7.Weight = 0.10732322845341978D; // // xrTableCell15 // @@ -244,44 +276,27 @@ namespace DomizielAnsbach this.xrTableCell15.StylePriority.UseTextAlignment = false; this.xrTableCell15.Text = "xrTableCell15"; this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell15.Weight = 0.40404036892472889D; + this.xrTableCell15.Weight = 0.40404038746507664D; // // xrTableCell5 // - this.xrTableCell5.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.picSignature}); this.xrTableCell5.Name = "xrTableCell5"; this.xrTableCell5.StylePriority.UsePadding = false; this.xrTableCell5.StylePriority.UseTextAlignment = false; + this.xrTableCell5.Text = "SP"; this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell5.Weight = 0.16414128592247781D; - // - // picSignature - // - this.picSignature.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.picSignature.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")}); - this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.picSignature.Name = "picSignature"; - this.picSignature.SizeF = new System.Drawing.SizeF(130F, 25F); - this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - this.picSignature.StylePriority.UseBorders = false; - this.picSignature.BeforePrint += new System.Drawing.Printing.PrintEventHandler(this.picSignature_BeforePrint); + this.xrTableCell5.Weight = 0.11363619904777417D; // // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTableServiceRecords1}); - this.GroupHeader1.Font = new System.Drawing.Font("Arial", 11F); - this.GroupHeader1.HeightF = 60F; + this.GroupHeader1.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.GroupHeader1.HeightF = 110F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.RepeatEveryPage = true; this.GroupHeader1.StylePriority.UseFont = false; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); - // // formattingRuleStartDate // this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]"; @@ -305,7 +320,7 @@ namespace DomizielAnsbach this.xrLabel12, this.xrLabel1}); this.ReportHeader.Font = new System.Drawing.Font("Arial", 11F); - this.ReportHeader.HeightF = 250F; + this.ReportHeader.HeightF = 320F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; // @@ -320,23 +335,21 @@ namespace DomizielAnsbach // xrLabel29 // this.xrLabel29.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold); - this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(269.9134F, 200F); + this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(270.6077F, 265F); this.xrLabel29.Name = "xrLabel29"; this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel29.SizeF = new System.Drawing.SizeF(220.5033F, 29.99998F); + this.xrLabel29.SizeF = new System.Drawing.SizeF(363.8367F, 29.99997F); this.xrLabel29.StylePriority.UseBorders = false; this.xrLabel29.StylePriority.UseFont = false; this.xrLabel29.Text = "[Month] [Year]"; // // lblBewilligteStunden // - this.lblBewilligteStunden.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSPerWeek", "{0:0.0} h/Woche")}); this.lblBewilligteStunden.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold); - this.lblBewilligteStunden.LocationFloat = new DevExpress.Utils.PointFloat(269.9134F, 170F); + this.lblBewilligteStunden.LocationFloat = new DevExpress.Utils.PointFloat(270.6077F, 235F); this.lblBewilligteStunden.Name = "lblBewilligteStunden"; this.lblBewilligteStunden.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblBewilligteStunden.SizeF = new System.Drawing.SizeF(220.5033F, 29.99998F); + this.lblBewilligteStunden.SizeF = new System.Drawing.SizeF(363.8367F, 29.99997F); this.lblBewilligteStunden.StylePriority.UseBorders = false; this.lblBewilligteStunden.StylePriority.UseFont = false; // @@ -345,10 +358,10 @@ namespace DomizielAnsbach this.xrLabel25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedStartDate")}); this.xrLabel25.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold); - this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(269.9134F, 140F); + this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(270.6077F, 205F); this.xrLabel25.Name = "xrLabel25"; this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel25.SizeF = new System.Drawing.SizeF(220.5033F, 30.00002F); + this.xrLabel25.SizeF = new System.Drawing.SizeF(363.8367F, 30.00003F); this.xrLabel25.StylePriority.UseBorders = false; this.xrLabel25.StylePriority.UseFont = false; // @@ -357,10 +370,10 @@ namespace DomizielAnsbach this.xrLabel24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerBirthday", "{0:dd.MM.yyyy}")}); this.xrLabel24.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold); - this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(269.9134F, 110F); + this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(270.6077F, 175F); this.xrLabel24.Name = "xrLabel24"; this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel24.SizeF = new System.Drawing.SizeF(220.5033F, 30.00002F); + this.xrLabel24.SizeF = new System.Drawing.SizeF(363.8367F, 30.00002F); this.xrLabel24.StylePriority.UseBorders = false; this.xrLabel24.StylePriority.UseFont = false; // @@ -369,17 +382,17 @@ namespace DomizielAnsbach this.xrLabel23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerName")}); this.xrLabel23.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold); - this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(269.9134F, 80.00002F); + this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(270.6077F, 145F); this.xrLabel23.Name = "xrLabel23"; this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel23.SizeF = new System.Drawing.SizeF(220.5033F, 29.99999F); + this.xrLabel23.SizeF = new System.Drawing.SizeF(363.8367F, 29.99998F); this.xrLabel23.StylePriority.UseBorders = false; this.xrLabel23.StylePriority.UseFont = false; // // xrLabel18 // this.xrLabel18.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(0F, 200F); + this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(0.6943766F, 265F); this.xrLabel18.Name = "xrLabel18"; this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel18.SizeF = new System.Drawing.SizeF(269.9133F, 30F); @@ -389,7 +402,7 @@ namespace DomizielAnsbach // xrLabel15 // this.xrLabel15.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 170F); + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0.6943766F, 235F); this.xrLabel15.Name = "xrLabel15"; this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel15.SizeF = new System.Drawing.SizeF(269.9133F, 30F); @@ -399,7 +412,7 @@ namespace DomizielAnsbach // xrLabel14 // this.xrLabel14.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 140F); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0.6943766F, 205F); this.xrLabel14.Name = "xrLabel14"; this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel14.SizeF = new System.Drawing.SizeF(269.9133F, 30F); @@ -409,7 +422,7 @@ namespace DomizielAnsbach // xrLabel13 // this.xrLabel13.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 110F); + this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0.6943766F, 175F); this.xrLabel13.Name = "xrLabel13"; this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel13.SizeF = new System.Drawing.SizeF(269.9133F, 29.99999F); @@ -419,7 +432,7 @@ namespace DomizielAnsbach // xrLabel12 // this.xrLabel12.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 80.00002F); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0.6943766F, 145F); this.xrLabel12.Name = "xrLabel12"; this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel12.SizeF = new System.Drawing.SizeF(269.9133F, 30F); @@ -429,14 +442,14 @@ namespace DomizielAnsbach // xrLabel1 // this.xrLabel1.Font = new System.Drawing.Font("Calibri", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0.6943766F, 65F); this.xrLabel1.Multiline = true; this.xrLabel1.Name = "xrLabel1"; this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel1.SizeF = new System.Drawing.SizeF(480F, 36.45833F); this.xrLabel1.StylePriority.UseFont = false; this.xrLabel1.StylePriority.UseTextAlignment = false; - this.xrLabel1.Text = "Monatsübersicht für Persönliches Budget"; + this.xrLabel1.Text = "Monatsübersicht für Betreutes Wohnen"; this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // // formattingRuleServiceDesc @@ -475,19 +488,20 @@ namespace DomizielAnsbach // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel4, this.xrLabel3, this.xrLabel2, this.xrLabel6, this.xrLabel5}); this.ReportFooter.Font = new System.Drawing.Font("Arial", 11F); - this.ReportFooter.HeightF = 80.08324F; + this.ReportFooter.HeightF = 102.5832F; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // // xrLabel3 // this.xrLabel3.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(540F, 62.08327F); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(536.6738F, 84.58323F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel3.SizeF = new System.Drawing.SizeF(137F, 17.99997F); @@ -498,7 +512,7 @@ namespace DomizielAnsbach // xrLabel2 // this.xrLabel2.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(178.3263F, 62.08327F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(175F, 84.58323F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel2.SizeF = new System.Drawing.SizeF(281.5348F, 17.99997F); @@ -509,7 +523,7 @@ namespace DomizielAnsbach // xrLabel6 // this.xrLabel6.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0.6944444F, 62.08327F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 84.58323F); this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel6.SizeF = new System.Drawing.SizeF(121.7362F, 17.99997F); @@ -520,7 +534,7 @@ namespace DomizielAnsbach // xrLabel5 // this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 51.72221F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 74.22221F); this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel5.SizeF = new System.Drawing.SizeF(670.0001F, 10.36106F); @@ -546,7 +560,120 @@ namespace DomizielAnsbach this.fieldAbrechenbareFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldAbrechenbareFLS.Name = "fieldAbrechenbareFLS"; // - // QuittierungsbelegPB + // xrLabel4 + // + this.xrLabel4.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + 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(666.9999F, 51.72221F); + this.xrLabel4.StylePriority.UseBorders = false; + this.xrLabel4.StylePriority.UseFont = false; + this.xrLabel4.Text = "Erläuterung: Eventuelle Gruppenzeiten sind berechnet nach der Formel Gruppendauer" + + " : 3 x Anzahl\r\nder Mitarbeiter/innen"; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + // + // GroupFooter1 + // + this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable1}); + this.GroupFooter1.HeightF = 25F; + this.GroupFooter1.Name = "GroupFooter1"; + // + // xrTable1 + // + this.xrTable1.BorderColor = System.Drawing.Color.Black; + this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0.0002034505F, 0F); + this.xrTable1.Name = "xrTable1"; + this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow1}); + this.xrTable1.SizeF = new System.Drawing.SizeF(669.9999F, 25F); + this.xrTable1.StylePriority.UseFont = false; + this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrTableRow1 + // + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell8, + this.xrTableCell9, + this.xrTableCell10, + this.xrTableCell12, + this.xrTableCell14}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.xrTableRow1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableRow1.Weight = 1.25D; + // + // xrTableCell8 + // + this.xrTableCell8.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 3, 0, 100F); + this.xrTableCell8.StylePriority.UseFont = false; + this.xrTableCell8.StylePriority.UsePadding = false; + this.xrTableCell8.StylePriority.UseTextAlignment = false; + this.xrTableCell8.Text = "Summe"; + this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell8.Weight = 0.11363635923509893D; + // + // xrTableCell9 + // + this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.MinutesUnqualified")}); + this.xrTableCell9.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 3, 0, 100F); + this.xrTableCell9.StylePriority.UseFont = false; + this.xrTableCell9.StylePriority.UsePadding = false; + this.xrTableCell9.StylePriority.UseTextAlignment = false; + xrSummary1.FormatString = "{0:0.##}"; + xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell9.Summary = xrSummary1; + this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell9.Weight = 0.10732323140481673D; + // + // xrTableCell10 + // + this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.MinutesQualified")}); + this.xrTableCell10.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell10.Name = "xrTableCell10"; + this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 3, 0, 100F); + this.xrTableCell10.StylePriority.UseFont = false; + this.xrTableCell10.StylePriority.UsePadding = false; + this.xrTableCell10.StylePriority.UseTextAlignment = false; + xrSummary2.FormatString = "{0:0.##}"; + xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell10.Summary = xrSummary2; + this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell10.Weight = 0.10732322845341978D; + // + // xrTableCell12 + // + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 3, 0, 100F); + this.xrTableCell12.StylePriority.UseFont = false; + this.xrTableCell12.StylePriority.UsePadding = false; + this.xrTableCell12.StylePriority.UseTextAlignment = false; + this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell12.Weight = 0.40404038746507664D; + // + // xrTableCell14 + // + this.xrTableCell14.Name = "xrTableCell14"; + this.xrTableCell14.StylePriority.UsePadding = false; + this.xrTableCell14.StylePriority.UseTextAlignment = false; + this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell14.Weight = 0.11363619904777417D; + // + // QuittierungsbelegAbw // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { this.Detail, @@ -560,6 +687,7 @@ namespace DomizielAnsbach this.fieldBillableFLS, this.fieldAbrechenbareFLS}); this.DataSource = this.bindingSource1; + this.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.formattingRuleStartDate, this.formattingRuleServiceDesc, @@ -574,6 +702,7 @@ namespace DomizielAnsbach ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -624,6 +753,16 @@ namespace DomizielAnsbach private DevExpress.XtraReports.UI.XRLabel xrLabel3; private DevExpress.XtraReports.UI.XRLabel xrLabel2; private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1; - private DevExpress.XtraReports.UI.XRPictureBox picSignature; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; + private DevExpress.XtraReports.UI.XRLabel xrLabel4; + private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; + private DevExpress.XtraReports.UI.XRTable xrTable1; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; } } diff --git a/ReportImp/DomizielAnsbach/QuittierungsbelegAbw.cs b/ReportImp/DomizielAnsbach/QuittierungsbelegAbw.cs index a339f9173..de8940b0c 100644 --- a/ReportImp/DomizielAnsbach/QuittierungsbelegAbw.cs +++ b/ReportImp/DomizielAnsbach/QuittierungsbelegAbw.cs @@ -23,40 +23,32 @@ namespace DomizielAnsbach public void SetReportDataSource(ServicesOverviewRO pRO) { - if (pRO.Services != null) + String betreuungsschluessel = ""; + double minuten = 0; + foreach (ServicesOverviewRO.ServiceDetail s in pRO.Services) { - List servicesBillable = new List(); - - double minuten = 0; - foreach (ServicesOverviewRO.ServiceDetail s in pRO.Services) + minuten += s.Minutes; + if (s.ServiceCategory.Contains("Indirekt")) { - if (s.IsBillable) - { - ServicesOverviewRO.CreateSignatureString(s); - if (s.ServiceCategory.ToLower().IndexOf("assistenz") < 0) - { - servicesBillable.Add(s); - minuten += s.Minutes; - } - } + s.MinutesUnqualified = s.Minutes; + s.MinutesQualified = 0; + } + else + { + s.MinutesQualified = s.Minutes; + s.MinutesUnqualified = 0; + } + if (String.IsNullOrEmpty(betreuungsschluessel) && s.ServiceCategory.Contains("Ambulant Betreutes ")) + { + betreuungsschluessel = s.ServiceCategory.Replace("Ambulant Betreutes Einzelwohnen", "").Trim(); } - - pRO.TotalFLMBillable = minuten; - pRO.Services = servicesBillable; } - var approved = pRO.ApprovedFLSPerWeek; - - SupportConceptPeriodStatisticsDC stats = GetFlsStatistics(pRO, "assistenz"); ; - - - if (stats != null) - { - approved = stats.MinutesApprovedPerWeek / 60; - } - - lblBewilligteStunden.Text = string.Format("{0:0.##}", approved); + lblBewilligteStunden.Text = betreuungsschluessel; + pRO.TotalFLMBillable = minuten; + + this.bindingSource1.DataSource = pRO; } diff --git a/ReportImp/DomizielAnsbach/QuittierungsbelegPB.Designer.cs b/ReportImp/DomizielAnsbach/QuittierungsbelegPB.Designer.cs index eed4ef9e2..94ab1b4b6 100644 --- a/ReportImp/DomizielAnsbach/QuittierungsbelegPB.Designer.cs +++ b/ReportImp/DomizielAnsbach/QuittierungsbelegPB.Designer.cs @@ -109,6 +109,7 @@ namespace DomizielAnsbach // // xrTableRow2 // + this.xrTableRow2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(197)))), ((int)(((byte)(217)))), ((int)(((byte)(241))))); this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { this.xrTableCell3, this.xrTableCell1, @@ -116,12 +117,12 @@ namespace DomizielAnsbach this.xrTableCell11}); this.xrTableRow2.Name = "xrTableRow2"; this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.xrTableRow2.StylePriority.UseBackColor = false; this.xrTableRow2.StylePriority.UseTextAlignment = false; this.xrTableRow2.Weight = 1.875D; // // xrTableCell3 // - this.xrTableCell3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(219)))), ((int)(((byte)(238)))), ((int)(((byte)(243))))); this.xrTableCell3.Name = "xrTableCell3"; this.xrTableCell3.StylePriority.UseBackColor = false; this.xrTableCell3.StylePriority.UseFont = false; @@ -132,7 +133,6 @@ namespace DomizielAnsbach // // xrTableCell1 // - this.xrTableCell1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(219)))), ((int)(((byte)(238)))), ((int)(((byte)(243))))); this.xrTableCell1.Multiline = true; this.xrTableCell1.Name = "xrTableCell1"; this.xrTableCell1.StylePriority.UseBackColor = false; @@ -141,7 +141,6 @@ namespace DomizielAnsbach // // xrTableCell4 // - this.xrTableCell4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(219)))), ((int)(((byte)(238)))), ((int)(((byte)(243))))); this.xrTableCell4.Name = "xrTableCell4"; this.xrTableCell4.StylePriority.UseBackColor = false; this.xrTableCell4.StylePriority.UsePadding = false; @@ -150,7 +149,6 @@ namespace DomizielAnsbach // // xrTableCell11 // - this.xrTableCell11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(219)))), ((int)(((byte)(238)))), ((int)(((byte)(243))))); this.xrTableCell11.Multiline = true; this.xrTableCell11.Name = "xrTableCell11"; this.xrTableCell11.StylePriority.UseBackColor = false; @@ -176,7 +174,6 @@ namespace DomizielAnsbach // this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable3}); - this.Detail1.Font = new System.Drawing.Font("Arial", 11F); this.Detail1.HeightF = 25F; this.Detail1.Name = "Detail1"; this.Detail1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); @@ -272,7 +269,7 @@ namespace DomizielAnsbach // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTableServiceRecords1}); - this.GroupHeader1.Font = new System.Drawing.Font("Arial", 11F); + this.GroupHeader1.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold); this.GroupHeader1.HeightF = 60F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.RepeatEveryPage = true; @@ -305,7 +302,7 @@ namespace DomizielAnsbach this.xrLabel12, this.xrLabel1}); this.ReportHeader.Font = new System.Drawing.Font("Arial", 11F); - this.ReportHeader.HeightF = 250F; + this.ReportHeader.HeightF = 320F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; // @@ -320,10 +317,10 @@ namespace DomizielAnsbach // xrLabel29 // this.xrLabel29.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold); - this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(269.9134F, 200F); + this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(269.9133F, 265F); this.xrLabel29.Name = "xrLabel29"; this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel29.SizeF = new System.Drawing.SizeF(220.5033F, 29.99998F); + this.xrLabel29.SizeF = new System.Drawing.SizeF(362.17F, 29.99997F); this.xrLabel29.StylePriority.UseBorders = false; this.xrLabel29.StylePriority.UseFont = false; this.xrLabel29.Text = "[Month] [Year]"; @@ -333,10 +330,10 @@ namespace DomizielAnsbach this.lblBewilligteStunden.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSPerWeek", "{0:0.0} h/Woche")}); this.lblBewilligteStunden.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold); - this.lblBewilligteStunden.LocationFloat = new DevExpress.Utils.PointFloat(269.9134F, 170F); + this.lblBewilligteStunden.LocationFloat = new DevExpress.Utils.PointFloat(269.9133F, 235F); this.lblBewilligteStunden.Name = "lblBewilligteStunden"; this.lblBewilligteStunden.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblBewilligteStunden.SizeF = new System.Drawing.SizeF(220.5033F, 29.99998F); + this.lblBewilligteStunden.SizeF = new System.Drawing.SizeF(362.17F, 29.99998F); this.lblBewilligteStunden.StylePriority.UseBorders = false; this.lblBewilligteStunden.StylePriority.UseFont = false; // @@ -345,10 +342,10 @@ namespace DomizielAnsbach this.xrLabel25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedStartDate")}); this.xrLabel25.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold); - this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(269.9134F, 140F); + this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(269.9133F, 205F); this.xrLabel25.Name = "xrLabel25"; this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel25.SizeF = new System.Drawing.SizeF(220.5033F, 30.00002F); + this.xrLabel25.SizeF = new System.Drawing.SizeF(362.17F, 30.00002F); this.xrLabel25.StylePriority.UseBorders = false; this.xrLabel25.StylePriority.UseFont = false; // @@ -357,10 +354,10 @@ namespace DomizielAnsbach this.xrLabel24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerBirthday", "{0:dd.MM.yyyy}")}); this.xrLabel24.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold); - this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(269.9134F, 110F); + this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(269.9133F, 175F); this.xrLabel24.Name = "xrLabel24"; this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel24.SizeF = new System.Drawing.SizeF(220.5033F, 30.00002F); + this.xrLabel24.SizeF = new System.Drawing.SizeF(362.17F, 30.00002F); this.xrLabel24.StylePriority.UseBorders = false; this.xrLabel24.StylePriority.UseFont = false; // @@ -369,17 +366,17 @@ namespace DomizielAnsbach this.xrLabel23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerName")}); this.xrLabel23.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold); - this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(269.9134F, 80.00002F); + this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(269.9133F, 145F); this.xrLabel23.Name = "xrLabel23"; this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel23.SizeF = new System.Drawing.SizeF(220.5033F, 29.99999F); + this.xrLabel23.SizeF = new System.Drawing.SizeF(362.17F, 29.99998F); this.xrLabel23.StylePriority.UseBorders = false; this.xrLabel23.StylePriority.UseFont = false; // // xrLabel18 // this.xrLabel18.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(0F, 200F); + this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(0F, 265F); this.xrLabel18.Name = "xrLabel18"; this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel18.SizeF = new System.Drawing.SizeF(269.9133F, 30F); @@ -389,7 +386,7 @@ namespace DomizielAnsbach // xrLabel15 // this.xrLabel15.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 170F); + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 235F); this.xrLabel15.Name = "xrLabel15"; this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel15.SizeF = new System.Drawing.SizeF(269.9133F, 30F); @@ -399,7 +396,7 @@ namespace DomizielAnsbach // xrLabel14 // this.xrLabel14.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 140F); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 205F); this.xrLabel14.Name = "xrLabel14"; this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel14.SizeF = new System.Drawing.SizeF(269.9133F, 30F); @@ -409,7 +406,7 @@ namespace DomizielAnsbach // xrLabel13 // this.xrLabel13.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 110F); + this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 175F); this.xrLabel13.Name = "xrLabel13"; this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel13.SizeF = new System.Drawing.SizeF(269.9133F, 29.99999F); @@ -419,7 +416,7 @@ namespace DomizielAnsbach // xrLabel12 // this.xrLabel12.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 80.00002F); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 145F); this.xrLabel12.Name = "xrLabel12"; this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel12.SizeF = new System.Drawing.SizeF(269.9133F, 30F); @@ -429,7 +426,7 @@ namespace DomizielAnsbach // xrLabel1 // this.xrLabel1.Font = new System.Drawing.Font("Calibri", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 65F); this.xrLabel1.Multiline = true; this.xrLabel1.Name = "xrLabel1"; this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -560,6 +557,7 @@ namespace DomizielAnsbach this.fieldBillableFLS, this.fieldAbrechenbareFLS}); this.DataSource = this.bindingSource1; + this.Font = new System.Drawing.Font("Calibri", 11F); this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.formattingRuleStartDate, this.formattingRuleServiceDesc, diff --git a/ReportImp/LebenshilfeFrankfurtOder/Invoicing/TagesstrukturInvoiceCreation.cs b/ReportImp/LebenshilfeFrankfurtOder/Invoicing/TagesstrukturInvoiceCreation.cs index 2ab99be0f..3a614b9d8 100644 --- a/ReportImp/LebenshilfeFrankfurtOder/Invoicing/TagesstrukturInvoiceCreation.cs +++ b/ReportImp/LebenshilfeFrankfurtOder/Invoicing/TagesstrukturInvoiceCreation.cs @@ -22,6 +22,7 @@ namespace LebenshilfeFrankfurtOder.Invoicing { private const decimal VERPFLEGUNGSPAUSCHALE_BISDez2020 = 3.40m; private const decimal VERPFLEGUNGSPAUSCHALE_ABJan2021 = 3.50m; + private const decimal VERPFLEGUNGSPAUSCHALE_ABJan2022 = 3.60m; public override void SetInvoiceId(ServiceInvoice invoice) @@ -149,8 +150,11 @@ namespace LebenshilfeFrankfurtOder.Invoicing SetServiceInvoicePeriods(invoice, sc, invoicePeriod); - decimal verpflegungspauschale = VERPFLEGUNGSPAUSCHALE_ABJan2021; - + decimal verpflegungspauschale = VERPFLEGUNGSPAUSCHALE_ABJan2022; + if (invoicePeriod.StartDate < new DateTime(2022, 1, 1)) + { + verpflegungspauschale = VERPFLEGUNGSPAUSCHALE_ABJan2021; + } if (invoicePeriod.StartDate < new DateTime(2021, 1, 1)) { verpflegungspauschale = VERPFLEGUNGSPAUSCHALE_BISDez2020; diff --git a/ReportImp/LebenshilfeWetterau/CollectiveBillingReport.Designer.cs b/ReportImp/LebenshilfeWetterau/CollectiveBillingReport.Designer.cs index 379850a83..aa5354d34 100644 --- a/ReportImp/LebenshilfeWetterau/CollectiveBillingReport.Designer.cs +++ b/ReportImp/LebenshilfeWetterau/CollectiveBillingReport.Designer.cs @@ -70,8 +70,9 @@ namespace BeWo.LebenshilfeWetterau this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.fieldMonatskontingent = new DevExpress.XtraReports.UI.CalculatedField(); + this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); @@ -107,7 +108,7 @@ namespace BeWo.LebenshilfeWetterau // // bottomMarginBand1 // - this.bottomMarginBand1.HeightF = 15F; + this.bottomMarginBand1.HeightF = 50F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // // GroupFooter @@ -212,10 +213,9 @@ namespace BeWo.LebenshilfeWetterau this.xrLabel5, this.xrLabel3, this.xrLabel1, - this.xrLabel2, - this.xrTable5}); + this.xrLabel2}); this.Page1.Font = new System.Drawing.Font("Arial", 10F); - this.Page1.HeightF = 169.375F; + this.Page1.HeightF = 109.375F; this.Page1.Name = "Page1"; this.Page1.StylePriority.UseBorders = false; this.Page1.StylePriority.UseFont = false; @@ -323,7 +323,7 @@ namespace BeWo.LebenshilfeWetterau this.xrTable5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTable5.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); - this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 109.375F); + this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0.0002034505F, 0F); this.xrTable5.Name = "xrTable5"; this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow1}); @@ -403,7 +403,8 @@ namespace BeWo.LebenshilfeWetterau // DetailReport // this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { - this.Detail1}); + this.Detail1, + this.GroupHeader1}); this.DetailReport.DataMember = "ServiceInvoicePeriods"; this.DetailReport.DataSource = this.bindingSource1; this.DetailReport.Level = 0; @@ -535,10 +536,6 @@ namespace BeWo.LebenshilfeWetterau this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell18.Weight = 0.35785886809670403D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); - // // fieldMonatskontingent // this.fieldMonatskontingent.DataMember = "ServiceInvoicePeriods"; @@ -546,6 +543,18 @@ namespace BeWo.LebenshilfeWetterau this.fieldMonatskontingent.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldMonatskontingent.Name = "fieldMonatskontingent"; // + // GroupHeader1 + // + this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable5}); + this.GroupHeader1.HeightF = 60F; + this.GroupHeader1.Name = "GroupHeader1"; + this.GroupHeader1.RepeatEveryPage = true; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); + // // Sammelrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -565,7 +574,7 @@ namespace BeWo.LebenshilfeWetterau this.ruleRateFactorNull, this.ruleNoticeNull}); this.Landscape = true; - this.Margins = new System.Drawing.Printing.Margins(50, 50, 40, 15); + this.Margins = new System.Drawing.Printing.Margins(50, 50, 40, 50); this.PageHeight = 827; this.PageWidth = 1169; this.PaperKind = System.Drawing.Printing.PaperKind.A4; @@ -622,5 +631,6 @@ namespace BeWo.LebenshilfeWetterau private DevExpress.XtraReports.UI.XRTableCell cellTotalPerMonth; private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; private DevExpress.XtraReports.UI.XRLabel xrLabel4; + private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1; } } diff --git a/ReportImp/LebenshilfeWetterau/Invoicing/CustomInvoiceFactory.cs b/ReportImp/LebenshilfeWetterau/Invoicing/CustomInvoiceFactory.cs index df2af88a4..ca63ac4fd 100644 --- a/ReportImp/LebenshilfeWetterau/Invoicing/CustomInvoiceFactory.cs +++ b/ReportImp/LebenshilfeWetterau/Invoicing/CustomInvoiceFactory.cs @@ -13,7 +13,28 @@ namespace LebenshilfeWetterau.Invoicing public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary> supportConcepts2ServiceRecords) { - foreach (var list in supportConcepts2ServiceRecords.Values) + if (supportConcepts2ServiceRecords.Count > 1) + { + foreach (var item in supportConcepts2ServiceRecords) + { + var csc = item.Key; + + var cb2sc = DAOFactory.GenericDAO.LoadByID(csc.CostBearerRelOids[0]); + + var org = cb2sc.CostBearer.Organisation; + + if (org.Name != null && org.Name == "LWV-Hessen") + { + return new CollectiveInvoiceCreation(); + + } + + + } + } + + + foreach (var list in supportConcepts2ServiceRecords.Values) { foreach (var sr in list) @@ -25,31 +46,16 @@ namespace LebenshilfeWetterau.Invoicing } } - foreach (var item in supportConcepts2ServiceRecords) - { - var csc = item.Key; - - if (supportConcepts2ServiceRecords.Count == 1) - { - csc.IsApproved = true; - return new CustomInvoiceCreation(); - } - - //csc.IsApproved = true; - - var cb2sc = DAOFactory.GenericDAO.LoadByID(csc.CostBearerRelOids[0]); - - var org = cb2sc.CostBearer.Organisation; - - if (org.Name != null && org.Name == "LWV-Hessen") - { - return new CollectiveInvoiceCreation(); - - } - - - } + if (supportConcepts2ServiceRecords.Count == 1) + { + foreach (var item in supportConcepts2ServiceRecords) + { + var csc = item.Key; + csc.IsApproved = true; + return new CustomInvoiceCreation(); + } + } return new CustomInvoiceCreation(); diff --git a/ReportImp/MuenchenerAidsHilfeEV/ServiceInvoiceReport.Designer.cs b/ReportImp/MuenchenerAidsHilfeEV/ServiceInvoiceReport.Designer.cs index 5d326df70..e71f54e0c 100644 --- a/ReportImp/MuenchenerAidsHilfeEV/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/MuenchenerAidsHilfeEV/ServiceInvoiceReport.Designer.cs @@ -32,27 +32,38 @@ namespace MuenchenerAidsHilfeEV System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServiceInvoiceReport)); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.lblAbrechnungszeitraum = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); @@ -74,34 +85,22 @@ namespace MuenchenerAidsHilfeEV this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); + this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText(); + this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText(); + this.xrRichText4 = new DevExpress.XtraReports.UI.XRRichText(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -116,11 +115,20 @@ namespace MuenchenerAidsHilfeEV this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabel6, this.xrPictureBox1}); - this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F); this.ReportHeader.HeightF = 143.3333F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; // + // xrLabel6 + // + this.xrLabel6.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 104F); + this.xrLabel6.Name = "xrLabel6"; + this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel6.SizeF = new System.Drawing.SizeF(368.6666F, 17.00001F); + this.xrLabel6.StylePriority.UseFont = false; + this.xrLabel6.Text = "müah / postfach 150808 / 80337 München"; + // // xrPictureBox1 // this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image"))); @@ -138,17 +146,25 @@ namespace MuenchenerAidsHilfeEV // // topMarginBand1 // - this.topMarginBand1.HeightF = 90.83334F; + this.topMarginBand1.HeightF = 91F; this.topMarginBand1.Name = "topMarginBand1"; // // bottomMarginBand1 // - this.bottomMarginBand1.HeightF = 50F; + this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrRichText4, + this.xrRichText3, + this.xrRichText2, + this.xrRichText1, + this.xrLabel8}); + this.bottomMarginBand1.HeightF = 100F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel7, + this.xrLabel2, this.xrTable1, this.xrLabel10, this.lblAdresse, @@ -157,10 +173,125 @@ namespace MuenchenerAidsHilfeEV this.xrLabel5, this.lblAbrechnungszeitraum, this.xrTable2}); - this.Page1.HeightF = 354.0833F; + this.Page1.HeightF = 394.0833F; this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // + // xrTable1 + // + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(333.1252F, 139.1667F); + this.xrTable1.Name = "xrTable1"; + this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow2, + this.xrTableRow6, + this.xrTableRow7}); + this.xrTable1.SizeF = new System.Drawing.SizeF(343.8747F, 60F); + // + // xrTableRow2 + // + this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell2, + this.xrTableCell5}); + this.xrTableRow2.Name = "xrTableRow2"; + this.xrTableRow2.Weight = 0.13245033112582783D; + // + // xrTableCell2 + // + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell2.StylePriority.UsePadding = false; + this.xrTableCell2.StylePriority.UseTextAlignment = false; + this.xrTableCell2.Text = "Debitoren-Nr.:"; + this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell2.Weight = 0.43933283562699876D; + // + // xrTableCell5 + // + this.xrTableCell5.CanShrink = true; + this.xrTableCell5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "DebitorNumber")}); + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell5.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrTableCell5.StylePriority.UseFont = false; + this.xrTableCell5.StylePriority.UseTextAlignment = false; + this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell5.Weight = 0.56066716437300124D; + // + // xrTableRow6 + // + this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell10, + this.xrTableCell14}); + this.xrTableRow6.Name = "xrTableRow6"; + this.xrTableRow6.Weight = 0.13245033112582783D; + // + // xrTableCell10 + // + this.xrTableCell10.Name = "xrTableCell10"; + this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell10.StylePriority.UsePadding = false; + this.xrTableCell10.StylePriority.UseTextAlignment = false; + this.xrTableCell10.Text = "Rechnungsdatum:"; + this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell10.Weight = 0.43933283562699876D; + // + // xrTableCell14 + // + this.xrTableCell14.CanShrink = true; + this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")}); + this.xrTableCell14.Name = "xrTableCell14"; + this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell14.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrTableCell14.StylePriority.UseFont = false; + this.xrTableCell14.StylePriority.UseTextAlignment = false; + this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell14.Weight = 0.56066716437300124D; + // + // xrTableRow7 + // + this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell15, + this.xrTableCell16}); + this.xrTableRow7.Name = "xrTableRow7"; + this.xrTableRow7.Weight = 0.13245033112582783D; + // + // xrTableCell15 + // + this.xrTableCell15.Name = "xrTableCell15"; + this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell15.StylePriority.UsePadding = false; + this.xrTableCell15.StylePriority.UseTextAlignment = false; + this.xrTableCell15.Text = "Rechnungsnr.:"; + this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell15.Weight = 0.43933283562699876D; + // + // xrTableCell16 + // + this.xrTableCell16.CanShrink = true; + this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceNumber")}); + this.xrTableCell16.Name = "xrTableCell16"; + this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell16.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrTableCell16.StylePriority.UseFont = false; + this.xrTableCell16.StylePriority.UseTextAlignment = false; + this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell16.Weight = 0.56066716437300124D; + // + // xrLabel10 + // + this.xrLabel10.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrLabel10.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(332.9584F, 110.2083F); + this.xrLabel10.Name = "xrLabel10"; + this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel10.SizeF = new System.Drawing.SizeF(343.8747F, 16.99999F); + this.xrLabel10.StylePriority.UseBorders = false; + this.xrLabel10.StylePriority.UseFont = false; + this.xrLabel10.Text = "Bitte bei Zahlung angeben:"; + // // lblAdresse // this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); @@ -174,23 +305,24 @@ namespace MuenchenerAidsHilfeEV // this.xrLabel4.BackColor = System.Drawing.Color.Transparent; this.xrLabel4.CanShrink = true; - this.xrLabel4.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 247.5F); + this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 271.6667F); 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, 20F); this.xrLabel4.StylePriority.UseBackColor = false; this.xrLabel4.StylePriority.UseFont = false; - this.xrLabel4.Text = "Aktenzeichen: [CustomerReferenceNumber]"; + this.xrLabel4.Text = "Bewilligungszeitraum: [AccountingPeriodStart!dd.MM.yyyy] bis [AccountingPeriodEnd" + + "!dd.MM.yyyy]"; this.xrLabel4.WordWrap = false; // // xrLabel3 // this.xrLabel3.BackColor = System.Drawing.Color.Transparent; this.xrLabel3.CanShrink = true; - this.xrLabel3.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 227.5F); + this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 251.6667F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 20F); @@ -202,7 +334,7 @@ namespace MuenchenerAidsHilfeEV // // xrLabel5 // - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 297.5F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 337.5F); this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F); @@ -211,7 +343,7 @@ namespace MuenchenerAidsHilfeEV // // lblAbrechnungszeitraum // - this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 322.5F); + this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 362.5F); this.lblAbrechnungszeitraum.Multiline = true; this.lblAbrechnungszeitraum.Name = "lblAbrechnungszeitraum"; this.lblAbrechnungszeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -230,10 +362,28 @@ namespace MuenchenerAidsHilfeEV this.xrTableRow1}); this.xrTable2.SizeF = new System.Drawing.SizeF(343.8747F, 80F); // + // xrTableRow5 + // + this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell13}); + this.xrTableRow5.Name = "xrTableRow5"; + this.xrTableRow5.Weight = 0.13245033112582783D; + // + // xrTableCell13 + // + this.xrTableCell13.CanShrink = true; + this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderContactPerson")}); + this.xrTableCell13.Name = "xrTableCell13"; + this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell13.StylePriority.UseFont = false; + this.xrTableCell13.StylePriority.UseTextAlignment = false; + this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell13.Weight = 1D; + // // xrTableRow4 // this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell3, this.xrTableCell11}); this.xrTableRow4.Name = "xrTableRow4"; this.xrTableRow4.Weight = 0.13245033112582783D; @@ -248,79 +398,56 @@ namespace MuenchenerAidsHilfeEV this.xrTableCell11.StylePriority.UseFont = false; this.xrTableCell11.StylePriority.UseTextAlignment = false; this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell11.Weight = 0.62367480382481233D; + this.xrTableCell11.Weight = 1D; + // + // xrTableRow3 + // + this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell8}); + this.xrTableRow3.Name = "xrTableRow3"; + this.xrTableRow3.Weight = 0.13245033112582783D; + // + // xrTableCell8 + // + this.xrTableCell8.CanShrink = true; + this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderContactPersonFax")}); + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell8.StylePriority.UseFont = false; + this.xrTableCell8.StylePriority.UseTextAlignment = false; + this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell8.Weight = 1D; + // + // xrTableRow1 + // + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell1}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Weight = 0.13245033112582783D; + // + // xrTableCell1 + // + this.xrTableCell1.CanShrink = true; + this.xrTableCell1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderContactPersonMail")}); + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell1.StylePriority.UseFont = false; + this.xrTableCell1.StylePriority.UseTextAlignment = false; + this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell1.Weight = 1D; // // xrLabel15 // - this.xrLabel15.Font = new System.Drawing.Font("Verdana", 10F); - this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 114.5833F); + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 67.08334F); + this.xrLabel15.Multiline = true; 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.SizeF = new System.Drawing.SizeF(666.9999F, 59.50002F); this.xrLabel15.StylePriority.UseFont = false; - this.xrLabel15.Text = "Mit freundlichen Grüßen"; - // - // xrTable4 - // - this.xrTable4.Font = new System.Drawing.Font("Verdana", 10F); - this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 68.75F); - this.xrTable4.Name = "xrTable4"; - this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow10, - this.xrTableRow14}); - this.xrTable4.SizeF = new System.Drawing.SizeF(650F, 26F); - this.xrTable4.StylePriority.UseFont = false; - // - // xrTableRow10 - // - this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell9}); - this.xrTableRow10.Name = "xrTableRow10"; - this.xrTableRow10.Weight = 0.38095238095238093D; - // - // xrTableCell9 - // - this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")}); - this.xrTableCell9.Name = "xrTableCell9"; - this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell9.StylePriority.UsePadding = false; - this.xrTableCell9.Text = "xrTableCell1"; - this.xrTableCell9.Weight = 3D; - // - // xrTableRow14 - // - this.xrTableRow14.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell12}); - this.xrTableRow14.Name = "xrTableRow14"; - this.xrTableRow14.Weight = 0.23809523809523808D; - // - // xrTableCell12 - // - this.xrTableCell12.Name = "xrTableCell12"; - this.xrTableCell12.Weight = 3D; - // - // xrLabel14 - // - this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "CreatorName")}); - this.xrLabel14.Font = new System.Drawing.Font("Verdana", 10F); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 189.5833F); - this.xrLabel14.Name = "xrLabel14"; - this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel14.SizeF = new System.Drawing.SizeF(225F, 17F); - this.xrLabel14.StylePriority.UseFont = false; - this.xrLabel14.Text = "[CreatorName]"; - // - // xrLabel9 - // - this.xrLabel9.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Italic); - this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 43.75F); - this.xrLabel9.Name = "xrLabel9"; - this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel9.SizeF = new System.Drawing.SizeF(250F, 17F); - this.xrLabel9.StylePriority.UseFont = false; - this.xrLabel9.Text = "Abschließende Bemerkungen:"; + this.xrLabel15.Text = "Zahlung sofort nach Rechnungserhalt ohne Abzug.\r\n\r\nDiese Rechnung wurde maschinel" + + "l erstellt und ist ohne Unterschrift gültig."; // // DetailReport // @@ -557,18 +684,15 @@ namespace MuenchenerAidsHilfeEV // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabel1, - this.xrLabel9, - this.xrTable4, - this.xrLabel14, this.xrLabel15}); - this.GroupFooter1.HeightF = 206.5833F; + this.GroupFooter1.HeightF = 126.5834F; this.GroupFooter1.Name = "GroupFooter1"; // // xrLabel1 // this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim", "Gesamtsumme: {0}")}); - this.xrLabel1.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Bold); + this.xrLabel1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(420.9999F, 0F); this.xrLabel1.Name = "xrLabel1"; this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F); @@ -583,230 +707,82 @@ namespace MuenchenerAidsHilfeEV // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // - // xrLabel6 + // xrLabel2 // - this.xrLabel6.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Underline); - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 104F); - this.xrLabel6.Name = "xrLabel6"; - this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel6.SizeF = new System.Drawing.SizeF(368.6666F, 17.00001F); - this.xrLabel6.StylePriority.UseFont = false; - this.xrLabel6.Text = "müah / postfach 150808 / 80337 München"; + this.xrLabel2.BackColor = System.Drawing.Color.Transparent; + this.xrLabel2.CanShrink = true; + this.xrLabel2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 231.6667F); + this.xrLabel2.Multiline = true; + this.xrLabel2.Name = "xrLabel2"; + this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(650F, 20F); + this.xrLabel2.StylePriority.UseBackColor = false; + this.xrLabel2.StylePriority.UseFont = false; + this.xrLabel2.Text = "Rechnung"; + this.xrLabel2.WordWrap = false; // - // xrTableCell3 + // xrLabel7 // - this.xrTableCell3.Name = "xrTableCell3"; - this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell3.StylePriority.UsePadding = false; - this.xrTableCell3.StylePriority.UseTextAlignment = false; - this.xrTableCell3.Text = "Telefon:"; - this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell3.Weight = 0.37632519617518773D; + this.xrLabel7.BackColor = System.Drawing.Color.Transparent; + this.xrLabel7.CanShrink = true; + this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 291.6667F); + this.xrLabel7.Multiline = true; + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(650F, 20F); + this.xrLabel7.StylePriority.UseBackColor = false; + this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.Text = "Aktenzeichen: [CustomerReferenceNumber]"; + this.xrLabel7.WordWrap = false; // - // xrTableCell1 + // xrLabel8 // - this.xrTableCell1.CanShrink = true; - this.xrTableCell1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderContactPersonMail")}); - this.xrTableCell1.Name = "xrTableCell1"; - this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell1.StylePriority.UseFont = false; - this.xrTableCell1.StylePriority.UseTextAlignment = false; - this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell1.Weight = 0.62367480382481233D; + this.xrLabel8.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + 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(676.83F, 5F); + this.xrLabel8.StylePriority.UseBorders = false; + this.xrLabel8.StylePriority.UseFont = false; // - // xrTableRow1 + // xrRichText1 // - this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell7, - this.xrTableCell1}); - this.xrTableRow1.Name = "xrTableRow1"; - this.xrTableRow1.Weight = 0.13245033112582783D; + this.xrRichText1.Font = new System.Drawing.Font("Arial", 8F); + this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 5F); + this.xrRichText1.Name = "xrRichText1"; + this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); + this.xrRichText1.SizeF = new System.Drawing.SizeF(122.4721F, 65F); + this.xrRichText1.StylePriority.UseFont = false; // - // xrTableCell8 + // xrRichText2 // - this.xrTableCell8.CanShrink = true; - this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderContactPersonFax")}); - this.xrTableCell8.Name = "xrTableCell8"; - this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell8.StylePriority.UseFont = false; - this.xrTableCell8.StylePriority.UseTextAlignment = false; - this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell8.Weight = 0.62367480382481233D; + this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F); + this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(122.4721F, 5F); + this.xrRichText2.Name = "xrRichText2"; + this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString"); + this.xrRichText2.SizeF = new System.Drawing.SizeF(223.7504F, 65F); + this.xrRichText2.StylePriority.UseFont = false; // - // xrTableRow3 + // xrRichText3 // - this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell6, - this.xrTableCell8}); - this.xrTableRow3.Name = "xrTableRow3"; - this.xrTableRow3.Weight = 0.13245033112582783D; + this.xrRichText3.Font = new System.Drawing.Font("Arial", 8F); + this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(346.2225F, 5F); + this.xrRichText3.Name = "xrRichText3"; + this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString"); + this.xrRichText3.SizeF = new System.Drawing.SizeF(159.9721F, 65F); + this.xrRichText3.StylePriority.UseFont = false; // - // xrTableCell13 + // xrRichText4 // - this.xrTableCell13.CanShrink = true; - this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderContactPerson")}); - this.xrTableCell13.Name = "xrTableCell13"; - this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell13.StylePriority.UseFont = false; - this.xrTableCell13.StylePriority.UseTextAlignment = false; - this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell13.Weight = 0.62367480382481233D; - // - // xrTableRow5 - // - this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell4, - this.xrTableCell13}); - this.xrTableRow5.Name = "xrTableRow5"; - this.xrTableRow5.Weight = 0.13245033112582783D; - // - // xrTableCell4 - // - this.xrTableCell4.Name = "xrTableCell4"; - this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell4.StylePriority.UsePadding = false; - this.xrTableCell4.StylePriority.UseTextAlignment = false; - this.xrTableCell4.Text = "Bearbeiter:"; - this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell4.Weight = 0.37632519617518773D; - // - // xrTableCell6 - // - this.xrTableCell6.Name = "xrTableCell6"; - this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell6.StylePriority.UsePadding = false; - this.xrTableCell6.StylePriority.UseTextAlignment = false; - this.xrTableCell6.Text = "Fax:"; - this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell6.Weight = 0.37632519617518773D; - // - // xrTableCell7 - // - this.xrTableCell7.Name = "xrTableCell7"; - this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell7.StylePriority.UsePadding = false; - this.xrTableCell7.StylePriority.UseTextAlignment = false; - this.xrTableCell7.Text = "E-Mail:"; - this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell7.Weight = 0.37632519617518773D; - // - // xrLabel10 - // - this.xrLabel10.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrLabel10.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(332.9584F, 110.2083F); - this.xrLabel10.Name = "xrLabel10"; - this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel10.SizeF = new System.Drawing.SizeF(343.8747F, 16.99999F); - this.xrLabel10.StylePriority.UseBorders = false; - this.xrLabel10.StylePriority.UseFont = false; - this.xrLabel10.Text = "Bitte bei Zahlung angeben:"; - // - // xrTable1 - // - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(333.1252F, 139.1667F); - this.xrTable1.Name = "xrTable1"; - this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow2, - this.xrTableRow6, - this.xrTableRow7}); - this.xrTable1.SizeF = new System.Drawing.SizeF(343.8747F, 60F); - // - // xrTableRow2 - // - this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell2, - this.xrTableCell5}); - this.xrTableRow2.Name = "xrTableRow2"; - this.xrTableRow2.Weight = 0.13245033112582783D; - // - // xrTableCell2 - // - this.xrTableCell2.Name = "xrTableCell2"; - this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell2.StylePriority.UsePadding = false; - this.xrTableCell2.StylePriority.UseTextAlignment = false; - this.xrTableCell2.Text = "Debitoren-Nr.:"; - this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell2.Weight = 0.43933283562699876D; - // - // xrTableCell5 - // - this.xrTableCell5.CanShrink = true; - this.xrTableCell5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "DebitorNumber")}); - this.xrTableCell5.Name = "xrTableCell5"; - this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell5.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell5.StylePriority.UseFont = false; - this.xrTableCell5.StylePriority.UseTextAlignment = false; - this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell5.Weight = 0.56066716437300124D; - // - // xrTableRow6 - // - this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell10, - this.xrTableCell14}); - this.xrTableRow6.Name = "xrTableRow6"; - this.xrTableRow6.Weight = 0.13245033112582783D; - // - // xrTableCell10 - // - this.xrTableCell10.Name = "xrTableCell10"; - this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell10.StylePriority.UsePadding = false; - this.xrTableCell10.StylePriority.UseTextAlignment = false; - this.xrTableCell10.Text = "Rechnungsdatum:"; - this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell10.Weight = 0.43933283562699876D; - // - // xrTableCell14 - // - this.xrTableCell14.CanShrink = true; - this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")}); - this.xrTableCell14.Name = "xrTableCell14"; - this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell14.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell14.StylePriority.UseFont = false; - this.xrTableCell14.StylePriority.UseTextAlignment = false; - this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell14.Weight = 0.56066716437300124D; - // - // xrTableRow7 - // - this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell15, - this.xrTableCell16}); - this.xrTableRow7.Name = "xrTableRow7"; - this.xrTableRow7.Weight = 0.13245033112582783D; - // - // xrTableCell15 - // - this.xrTableCell15.Name = "xrTableCell15"; - this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell15.StylePriority.UsePadding = false; - this.xrTableCell15.StylePriority.UseTextAlignment = false; - this.xrTableCell15.Text = "Rechnungsnr.:"; - this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell15.Weight = 0.43933283562699876D; - // - // xrTableCell16 - // - this.xrTableCell16.CanShrink = true; - this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceNumber")}); - this.xrTableCell16.Name = "xrTableCell16"; - this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell16.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell16.StylePriority.UseFont = false; - this.xrTableCell16.StylePriority.UseTextAlignment = false; - this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell16.Weight = 0.56066716437300124D; + this.xrRichText4.Font = new System.Drawing.Font("Arial", 8F); + this.xrRichText4.LocationFloat = new DevExpress.Utils.PointFloat(506.1947F, 5F); + this.xrRichText4.Name = "xrRichText4"; + this.xrRichText4.SerializableRtfString = resources.GetString("xrRichText4.SerializableRtfString"); + this.xrRichText4.SizeF = new System.Drawing.SizeF(185.8053F, 65F); + this.xrRichText4.StylePriority.UseFont = false; // // ServiceInvoiceReport // @@ -819,20 +795,23 @@ namespace MuenchenerAidsHilfeEV this.DetailReport}); this.DataSource = this.bindingSource1; this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; - this.Font = new System.Drawing.Font("Verdana", 10F); + this.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new System.Drawing.Printing.Margins(75, 75, 91, 50); + this.Margins = new System.Drawing.Printing.Margins(75, 60, 91, 100); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = System.Drawing.Printing.PaperKind.A4; this.Version = "17.1"; + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -853,13 +832,6 @@ namespace MuenchenerAidsHilfeEV private DevExpress.XtraReports.UI.XRTableRow xrTableRow4; private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; private DevExpress.XtraReports.UI.XRLabel xrLabel15; - private DevExpress.XtraReports.UI.XRTable xrTable4; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow10; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow14; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; - private DevExpress.XtraReports.UI.XRLabel xrLabel14; - private DevExpress.XtraReports.UI.XRLabel xrLabel9; private DevExpress.XtraReports.UI.DetailReportBand DetailReport; private DevExpress.XtraReports.UI.DetailBand Detail1; private DevExpress.XtraReports.UI.XRTable xrTable5; @@ -885,14 +857,10 @@ namespace MuenchenerAidsHilfeEV private DevExpress.XtraReports.UI.XRLabel xrLabel6; private DevExpress.XtraReports.UI.XRLabel xrLabel10; private DevExpress.XtraReports.UI.XRTableRow xrTableRow5; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; private DevExpress.XtraReports.UI.XRTable xrTable1; private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; @@ -904,5 +872,12 @@ namespace MuenchenerAidsHilfeEV private DevExpress.XtraReports.UI.XRTableRow xrTableRow7; private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; + private DevExpress.XtraReports.UI.XRLabel xrLabel2; + private DevExpress.XtraReports.UI.XRLabel xrLabel7; + private DevExpress.XtraReports.UI.XRLabel xrLabel8; + private DevExpress.XtraReports.UI.XRRichText xrRichText4; + private DevExpress.XtraReports.UI.XRRichText xrRichText3; + private DevExpress.XtraReports.UI.XRRichText xrRichText2; + private DevExpress.XtraReports.UI.XRRichText xrRichText1; } } diff --git a/ReportImp/MuenchenerAidsHilfeEV/ServiceInvoiceReport.cs b/ReportImp/MuenchenerAidsHilfeEV/ServiceInvoiceReport.cs index cade16cf5..623d47840 100644 --- a/ReportImp/MuenchenerAidsHilfeEV/ServiceInvoiceReport.cs +++ b/ReportImp/MuenchenerAidsHilfeEV/ServiceInvoiceReport.cs @@ -16,6 +16,8 @@ namespace MuenchenerAidsHilfeEV public void SetReportDataSource(ServiceInvoiceRO pRO) { + pRO.InvoiceDate = String.Format("{0:dd.MM.yyyy}", new DateTime(pRO.InvoiceDateTime.Value.Year, pRO.InvoiceDateTime.Value.Month, 1)); + StringBuilder sb = new StringBuilder(); if (!String.IsNullOrEmpty(pRO.RecipientOrganisation)) @@ -44,11 +46,11 @@ namespace MuenchenerAidsHilfeEV DateTime end = pRO.AccountingPeriodEnd; if (start.Month == end.Month && start.Year == end.Year) { - lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Monat {0:MMMM yyyy} folgende erbrachte Tätigkeiten:", start); + lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Monat {0:MMMM yyyy} folgende erbrachte Leistungen:", start); } else { - lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Zeitraum {0:MMMM yyyy} - {1:MMMM yyyy} folgende erbrachte Tätigkeiten:", start, end); + lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Zeitraum {0:MMMM yyyy} - {1:MMMM yyyy} folgende erbrachte Leistungen:", start, end); } this.bindingSource1.DataSource = pRO; diff --git a/ReportImp/MuenchenerAidsHilfeEV/ServiceInvoiceReport.resx b/ReportImp/MuenchenerAidsHilfeEV/ServiceInvoiceReport.resx index 5f48f3508..5e5b6fbdb 100644 --- a/ReportImp/MuenchenerAidsHilfeEV/ServiceInvoiceReport.resx +++ b/ReportImp/MuenchenerAidsHilfeEV/ServiceInvoiceReport.resx @@ -179,6 +179,18 @@ R/2i7u0e1ha28hrjyTGCnmlOX29Nx7nrSK6n/9k= + + ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGIAXABmADIAXABmAHMAMQA0AFwAYwBmADEAIABCAGEAbgBrAHYAZQByAGIAaQBuAGQAdQBuAGcAfQBcAGYAcwAyADIAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAMgBcAGYAcwAxADQAXABjAGYAMQAgAEcATABTACAARwBlAG0AZQBpAG4AcwBjAGgAYQBmAHQAcwBiAGEAbgBrACAAZQBHAH0AXABmAHMAMgAyAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAaAB5AHAAaABwAGEAcgAwAHsAXABmADIAXABmAHMAMQA0AFwAYwBmADEAIABCAEwAWgA6ACAANAAzADAANgAwADkANgA3ACAAIAAgACAAIAAgAEsAVABPADoAIAA4ADIANAAzADMAMQA4ADMAMAAwAH0AXABmAHMAMgAyAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAaAB5AHAAaABwAGEAcgAwAHsAXABmADIAXABmAHMAMQA0AFwAYwBmADEAIABCAEkAQwA6ACAARwBFAE4ATwBEAEUATQAxAEcATABTAH0AXABmAHMAMgAyAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADIAXABmAHMAMQA0AFwAYwBmADEAIABJAEIAQQBOADoAIABEAEUANwAzACAANAAzADAANgAgADAAOQA2ADcAIAA4ADIANAAzACAAMwAxADgAMwAgADAAMAB9AFwAZgAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAfQA= + + + ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGIAXABmADIAXABmAHMAMQA0AFwAYwBmADAAIABLAG8AbgB0AGEAawB0AH0AXABmAHMAMgAyAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAaAB5AHAAaABwAGEAcgAwAHsAXABmADIAXABmAHMAMQA0AFwAYwBmADAAIABUAGUAbABlAGYAbwBuADoAIAAwADgAOQAvADUANAAzADMAMwAtADAAfQBcAGYAcwAyADIAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAMgBcAGYAcwAxADQAXABjAGYAMAAgAFQAZQBsAGUAZgBhAHgAOgAgADAAOAA5AC8ANQA0ADMAMwAzAC0AMQAxADEAfQBcAGYAcwAyADIAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAMgBcAGYAcwAxADQAXABjAGYAMAAgAE0AYQBpAGwAOgAgAGkAbgBmAG8AQABtAHUAZQBuAGMAaABuAGUAcgAtAGEAaQBkAHMAaABpAGwAZgBlAC4AZABlAH0AXABmAHMAMgAyAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADIAXABmAHMAMQA0AFwAYwBmADAAIABXAGUAYgA6ACAAdwB3AHcALgBtAHUAZQBuAGMAaABuAGUAcgAtAGEAaQBkAHMAaABpAGwAZgBlAC4AZABlAH0AXABmADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgB9AA== + + + ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGIAXABmADIAXABmAHMAMQA0AFwAYwBmADAAIABWAGUAcgBlAGkAbgB9AFwAZgBzADIAMgBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGgAeQBwAGgAcABhAHIAMAB7AFwAZgAyAFwAZgBzADEANABcAGMAZgAwACAARwBlAHMAYwBoAFwAdQAyADIAOABcACcAZQA0AGYAdABzAGYAXAB1ADIANQAyAFwAJwBmAGMAaAByAGUAcgA6ACAARAByAC4AIABUAG8AYgBpAGEAcwAgAE8AbABpAHYAZQBpAHIAYQAgAFcAZQBpAHMAbQBhAG4AdABlAGwAfQBcAGYAcwAyADIAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAMgBcAGYAcwAxADQAXABjAGYAMAAgAFYAZQByAGUAaQBuAHMAcgBlAGcAaQBzAHQAZQByADoAIABWAFIAMQAxADMAOQA2ACwAIABBAG0AdABzAGcAZQByAGkAYwBoAHQAIABNAFwAdQAyADUAMgBcACcAZgBjAG4AYwBoAGUAbgB9AFwAZgBzADIAMgBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGgAeQBwAGgAcABhAHIAMAB7AFwAZgAyAFwAZgBzADEANABcAGMAZgAwACAAVQBTAHQALgAtAEkAZABOAHIALgA6ACAARABFACAAMgAwADYAMwA2ADIAMwAxADcAfQBcAGYAcwAyADIAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAxADQAXABjAGYAMAAgAFMAdABlAHUAZQByAG4AdQBtAG0AZQByADoAIAAxADQAMwAvADIAMQA5AC8ANAAwADYANQAwAH0AXABmADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgB9AA== + + + ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGIAXABmADIAXABmAHMAMQA0AFwAYwBmADEAIABBAG4AcwBjAGgAcgBpAGYAdAB9AFwAZgBzADIAMgBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGgAeQBwAGgAcABhAHIAMAB7AFwAZgAyAFwAZgBzADEANABcAGMAZgAxACAATQBcAHUAMgA1ADIAXAAnAGYAYwBuAGMAaABuAGUAcgAtAEEAaQBkAHMAaABpAGwAZgBlACAAZQAuAFYALgB9AFwAZgBzADIAMgBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGgAeQBwAGgAcABhAHIAMAB7AFwAZgAyAFwAZgBzADEANABcAGMAZgAxACAATABpAG4AZAB3AHUAcgBtAHMAdAByAC4AIAA3ADEAfQBcAGYAcwAyADIAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAMgBcAGYAcwAxADQAXABjAGYAMQAgADgAMAAzADMANwAgAE0AXAB1ADIANQAyAFwAJwBmAGMAbgBjAGgAZQBuAH0AXABmAHMAMgAyAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADIAXABmAHMAMQA0AFwAYwBmADEAIABEAGUAdQB0AHMAYwBoAGwAYQBuAGQAfQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A + 17, 17 diff --git a/Service/DCEntityMapper/BargeldtransaktionDC_Bargeldtransaktion.cs b/Service/DCEntityMapper/BargeldtransaktionDC_Bargeldtransaktion.cs index c2d00849f..a15baeb11 100644 --- a/Service/DCEntityMapper/BargeldtransaktionDC_Bargeldtransaktion.cs +++ b/Service/DCEntityMapper/BargeldtransaktionDC_Bargeldtransaktion.cs @@ -11,6 +11,7 @@ namespace BeWo.Service.DCEntityMapper pDataContract.BargeldtransaktionVersion = pEntity.Version; //pDataContract.Customer = MapperFactory.CompactCustomerDC_Customer.MapToNewDC(pEntity.Customer); pDataContract.Betrag = pEntity.Betrag; + pDataContract.Belegnummer = pEntity.Belegnummer; pDataContract.Zahlungstyp = pEntity.Zahlungstyp; pDataContract.Zahlungsdatum = pEntity.Zahlungsdatum; pDataContract.Transaktionskassenbestand = pEntity.Transaktionskassenbestand; @@ -27,6 +28,7 @@ namespace BeWo.Service.DCEntityMapper pEntity.Oid = pDataContract.BargeldtransaktionOid; //pEntity.Customer = MapperFactory.CompactCustomerDC_Customer.MergeWithEntity(pDataContract.Customer, pEntity.Customer); pEntity.Betrag = pDataContract.Betrag; + pEntity.Belegnummer = pDataContract.Belegnummer; pEntity.Zahlungstyp = pDataContract.Zahlungstyp; pEntity.Zahlungsdatum = pDataContract.Zahlungsdatum; pEntity.Transaktionskassenbestand = pDataContract.Transaktionskassenbestand; diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index 5fae4f3a9..e227a18a6 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -172,7 +172,7 @@ namespace BeWo.Service.Plugins //t = "6586058528"; // Freundeskreis Suchtkrankenhilfe e.V. //t = "2632162696"; // Pro BeWo Düren //t = "6340891020"; // Caritas Ahlen - t = "3659854106"; // alpha e.V. + //t = "3659854106"; // alpha e.V. //t = "5809130435"; // Lebenshilfe Kusel //t = "3367947706"; // PaS Mönchengladbach //t = "2331203795"; // BeWo für dich @@ -280,7 +280,7 @@ namespace BeWo.Service.Plugins //t = "8283849714"; // Forum e.V. (proviel GmbH) //t = "3915346496"; // Sprungbrett 2. DB (Haus Theresia) //t = "2387527289"; // Lebenshilfe Duisburg HPFH - //t = "5595701056"; // Domiziel Ansbach + t = "5595701056"; // Domiziel Ansbach //t = "9430188510"; // Pro INTEGRA //t = "4820371076"; // Zuhause Wohnen Iris Thimm //t = "1078667960"; // FAM Rhein-Sieg Gbr diff --git a/Shared/BeWoEntityEnums.cs b/Shared/BeWoEntityEnums.cs index 8932e3b48..866b2e8d9 100644 --- a/Shared/BeWoEntityEnums.cs +++ b/Shared/BeWoEntityEnums.cs @@ -531,6 +531,7 @@ namespace BS.Shared PivotTabelleAnsehen = 29003, DienstplanungAnsehen = 29004, AbwesenheitsPlanungAnsehen = 29005, + KilometerauswertungEigene_View = 29010, VertretungenView_View = 30000, @@ -541,6 +542,8 @@ namespace BS.Shared Person_FamilyView = 40010, + //FinanzenBargeldkassenBearbeiten = 50000, + Customer_Anonymization = 171717, Customer_Full_Delete = 171718, Person_Full_Delete = 171719, diff --git a/Shared/Core/EnumTranslations.cs b/Shared/Core/EnumTranslations.cs index 378d5cdb4..9666dbc9c 100644 --- a/Shared/Core/EnumTranslations.cs +++ b/Shared/Core/EnumTranslations.cs @@ -68,8 +68,9 @@ namespace BS.Shared.Core UserRightType.AccountingTransactionView_Edit, Translator.Translate("Finanzen ändern") }, { - UserRightType.AccountingTransactionView_View, Translator.Translate("Finanzen ansehen") + UserRightType.AccountingTransactionView_View, Translator.Translate("Finanzen ansehen (alle)") }, + { UserRightType.AdministrationView_Create, Translator.Translate("Verwaltung anlegen") }, @@ -239,7 +240,7 @@ namespace BS.Shared.Core UserRightType.QueryView_View, Translator.Translate("Auswertungen ansehen") }, { - UserRightType.Analysis_Settlement_View, Translator.Translate("Auswertungen Spitzabrechnung erstellen") + UserRightType.Analysis_Settlement_View, Translator.Translate("Finanzen Spitzabrechnung erstellen") }, { UserRightType.Analysis_EmployeeOverviewAll_View, Translator.Translate("Auswertungen für alle Mitarbeiter erstellen") @@ -269,7 +270,11 @@ namespace BS.Shared.Core UserRightType.Analysis_AuslastungTeam_View, Translator.Translate("Auswertung Mitarbeiterauslastung für alle Teams erstellen") }, { - UserRightType.Kilometerauswertung_View, Translator.Translate("Auswertung über Kilometer erstellen") + UserRightType.Kilometerauswertung_View, Translator.Translate("Auswertung über Kilometer erstellen (für alle Mitarbeitenden)") + } + , + { + UserRightType.KilometerauswertungEigene_View, Translator.Translate("Auswertung über Kilometer erstellen (nur eigene)") } , { diff --git a/Shared/DataContracts/BargeldtransaktionDC.cs b/Shared/DataContracts/BargeldtransaktionDC.cs index 606a88229..6d0b3074b 100644 --- a/Shared/DataContracts/BargeldtransaktionDC.cs +++ b/Shared/DataContracts/BargeldtransaktionDC.cs @@ -31,7 +31,10 @@ namespace BS.Shared.DataContracts [DataMember] public string Notice { get; set; } - [DataMember] + [DataMember] + public string Belegnummer { get; set; } + + [DataMember] public string InsUser { get; set; } } } \ No newline at end of file diff --git a/Shared/DataContracts/Compact/ClientPartials/CompactCustomerDC.cs b/Shared/DataContracts/Compact/ClientPartials/CompactCustomerDC.cs index f48ccd6a5..2314b5784 100644 --- a/Shared/DataContracts/Compact/ClientPartials/CompactCustomerDC.cs +++ b/Shared/DataContracts/Compact/ClientPartials/CompactCustomerDC.cs @@ -53,7 +53,7 @@ namespace BS.Shared.DataContracts.Compact { get { - string lResult = this.FirstName + " " + this.LastName + " " + CustomerAlias + " " + AddressString + " " + MainAttendant; + string lResult = this.FirstName + " " + this.LastName + " " + CustomerAlias + " " + AddressString + " " + MainAttendant + " " + Teams; if (this.CostBearerReferenceNumbers != null) { lResult += string.Join(" ", this.CostBearerReferenceNumbers.Values.ToArray()); diff --git a/Shared/DataContracts/Compact/ClientPartials/CompactEmployeeDC.cs b/Shared/DataContracts/Compact/ClientPartials/CompactEmployeeDC.cs index bd3e0ab6b..1fff899dd 100644 --- a/Shared/DataContracts/Compact/ClientPartials/CompactEmployeeDC.cs +++ b/Shared/DataContracts/Compact/ClientPartials/CompactEmployeeDC.cs @@ -20,7 +20,7 @@ namespace BS.Shared.DataContracts.Compact } - public string FilterRelevants => String.Format("{0} {1} {2} {3} {4}", FirstName, LastName, PersonnelNumber, Details2, Details3); + public string FilterRelevants => String.Format("{0} {1} {2} {3} {4} {5}", FirstName, LastName, PersonnelNumber, Details2, Details3, Teams); public string IconPath => @"..\..\Ressources\Icons\UserBusinessMaleDisabled.png"; diff --git a/Shared/DataContracts/ReportTypes.cs b/Shared/DataContracts/ReportTypes.cs index 701b9d0b5..93ef32280 100644 --- a/Shared/DataContracts/ReportTypes.cs +++ b/Shared/DataContracts/ReportTypes.cs @@ -33,6 +33,7 @@ ServicesOverviewNew, Stundenzettel, VorlagenReport, - AbwesenheitsPrintReport + AbwesenheitsPrintReport, + MitarbeiterKlientenReport } } \ No newline at end of file