diff --git a/BeWo/Scheduler/Converter/ToolTipTimeConverter.cs b/BeWo/Scheduler/Converter/ToolTipTimeConverter.cs index 160d184cf..769db891c 100644 --- a/BeWo/Scheduler/Converter/ToolTipTimeConverter.cs +++ b/BeWo/Scheduler/Converter/ToolTipTimeConverter.cs @@ -10,6 +10,7 @@ namespace BeWo.Scheduler.Converter { public class ToolTipTimeConverter : IMultiValueConverter { + public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture) { if(values is null || values.Length != 2) @@ -17,7 +18,7 @@ namespace BeWo.Scheduler.Converter return null; } - if(values[0] is VisualAppointmentViewInfo visualAppointmentViewInfo && values[1] is TimeInterval timeInterval) + if(values[0] is VisualAppointmentViewInfo visualAppointmentViewInfo) { if(visualAppointmentViewInfo.CustomViewInfo is CustomFieldCollection customFieldCollection && customFieldCollection[nameof(CustomFieldStorage)] is CustomFieldStorage customFieldStorage) { diff --git a/BeWo/Scheduler/View/NewSchedulerView.xaml b/BeWo/Scheduler/View/NewSchedulerView.xaml index 83bfece8c..5bf7ce474 100644 --- a/BeWo/Scheduler/View/NewSchedulerView.xaml +++ b/BeWo/Scheduler/View/NewSchedulerView.xaml @@ -341,10 +341,10 @@ Orientation="Horizontal" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipTimeVisibility}"> - + - + diff --git a/BeWo/Scheduler/View/NewSchedulerView.xaml.cs b/BeWo/Scheduler/View/NewSchedulerView.xaml.cs index d24df7abf..5c709f4e7 100644 --- a/BeWo/Scheduler/View/NewSchedulerView.xaml.cs +++ b/BeWo/Scheduler/View/NewSchedulerView.xaml.cs @@ -1319,6 +1319,23 @@ namespace BeWo.Scheduler.View e.Appointment.CF_ResourceList(new List(SelectedResources)); } + var app = e.Appointment; + if (app.AllDay) // Neue Ganztägige Termine funktionieren nicht richtig, wenn man das Ganztägig wegklickt, wird das Enddatum falsch gesetzt + { + if (app.CustomFields != null && app.CustomFields.Count > 0) + { + var cf = app.CustomFields[0] as CustomFieldStorage; + if (cf != null && !cf.SchedulerAppointmentOid.HasValue) // Nur bei neuen Terminen + { + app.AllDay = true; + //app.Start = app.Start.Date.AddHours(8); + //app.End = app.Start.Date.AddHours(9); + app.Start = app.Start.Date; + app.End = app.Start.Date; + } + + } + } var form = ViewModel.GetEditAppointmentForm(control, e.Appointment); if(form is null) { diff --git a/Model/Changes_alle_fuer_neue_db.txt b/Model/Changes_alle_fuer_neue_db.txt index 8cfa8ff8e..491fffa22 100644 --- a/Model/Changes_alle_fuer_neue_db.txt +++ b/Model/Changes_alle_fuer_neue_db.txt @@ -1400,4 +1400,88 @@ ADD COLUMN `ShowGkvBzUrbelege` TINYINT NULL DEFAULT NULL AFTER `ShowGkvBzEinzel` ALTER TABLE `customer` -ADD COLUMN `CustomerFalldatenOid` BIGINT NULL; \ No newline at end of file +ADD COLUMN `CustomerFalldatenOid` BIGINT NULL; + +ALTER TABLE `InvoiceItem` +ADD COLUMN `CustomString1` VARCHAR(1024) NULL DEFAULT NULL, +ADD COLUMN `CustomString2` VARCHAR(1024) NULL DEFAULT NULL, +ADD COLUMN `CustomString3` VARCHAR(1024) NULL DEFAULT NULL, +ADD COLUMN `CustomString4` VARCHAR(1024) NULL DEFAULT NULL, +ADD COLUMN `CustomString5` VARCHAR(1024) NULL DEFAULT NULL, +ADD COLUMN `CustomNumber1` DECIMAL(18,10) NULL DEFAULT NULL, +ADD COLUMN `CustomNumber2` DECIMAL(18,10) NULL DEFAULT NULL, +ADD COLUMN `CustomNumber3` DECIMAL(18,10) NULL DEFAULT NULL, +ADD COLUMN `CustomNumber4` DECIMAL(18,10) NULL DEFAULT NULL, +ADD COLUMN `CustomNumber5` DECIMAL(18,10) NULL DEFAULT NULL, +ADD COLUMN `CustomDate1` datetime NULL DEFAULT NULL, +ADD COLUMN `CustomDate2` datetime NULL DEFAULT NULL, +ADD COLUMN `CustomDate3` datetime NULL DEFAULT NULL, +ADD COLUMN `CustomDate4` datetime NULL DEFAULT NULL, +ADD COLUMN `CustomDate5` datetime NULL DEFAULT NULL; + +CREATE TABLE `gkvabrechnung` ( + `Oid` bigint NOT NULL AUTO_INCREMENT, + `Tid` int NOT NULL, + `Notice` varchar(1024) DEFAULT NULL, + `InsTs` datetime DEFAULT NULL, + `InsUser` varchar(256) DEFAULT NULL, + `Version` bigint DEFAULT NULL, + `UdpUser` varchar(256) DEFAULT NULL, + `IsActive` tinyint DEFAULT NULL, + `SystemEntryID` int DEFAULT NULL, + `AbrechnungsZeitraumStart` datetime DEFAULT NULL, + `AbrechnungsZeitraumEnde` datetime DEFAULT NULL, + `Betrag` decimal(18,10) DEFAULT NULL, + `Bezahlt` tinyint DEFAULT NULL, + `UrbelegeGesendet` tinyint DEFAULT NULL, + `ErstelltAm` datetime DEFAULT NULL, + `Verfahrensstufe` int DEFAULT '0', + PRIMARY KEY (`Oid`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +CREATE TABLE `gkvabrechnung2invoicebase` ( + `GkvAbrechnungOid` bigint NOT NULL, + `InvoiceBaseOid` bigint NOT NULL, + PRIMARY KEY (`GkvAbrechnungOid`,`InvoiceBaseOid`), + KEY `fk_invoicebaseoid_idx` (`InvoiceBaseOid`), + CONSTRAINT `fk_gkvabrechnungoid` FOREIGN KEY (`GkvAbrechnungOid`) REFERENCES `gkvabrechnung` (`Oid`), + CONSTRAINT `fk_invoicebaseoid` FOREIGN KEY (`InvoiceBaseOid`) REFERENCES `invoicebase` (`Oid`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +CREATE TABLE `gkvtransferprotokoll` ( + `Oid` bigint NOT NULL AUTO_INCREMENT, + `Tid` int NOT NULL, + `Notice` varchar(1024) DEFAULT NULL, + `InsTs` datetime DEFAULT NULL, + `InsUser` varchar(256) DEFAULT NULL, + `Version` bigint DEFAULT NULL, + `UdpUser` varchar(256) DEFAULT NULL, + `IsActive` tinyint DEFAULT NULL, + `SystemEntryID` int DEFAULT NULL, + `GkvAbrechnungOid` bigint DEFAULT NULL, + `AbsenderBezeichnung` varchar(4096) DEFAULT NULL, + `EmpfangerBezeichnung` varchar(4096) DEFAULT NULL, + `IKLeistungserbringer` varchar(256) DEFAULT NULL, + `IKKrankenkasse` varchar(256) DEFAULT NULL, + `IKKostentrager` varchar(256) DEFAULT NULL, + `IKDatenannahmestelle` varchar(256) DEFAULT NULL, + `Rechnungsnummer` varchar(64) DEFAULT NULL, + `Datenaustauschreferenz` int DEFAULT NULL, + `Transfernummer` int DEFAULT NULL, + `Transfername` varchar(256) DEFAULT NULL, + `ErstelltAm` datetime DEFAULT NULL, + `Dateityp` varchar(4096) DEFAULT NULL, + `Dateiname` varchar(4096) DEFAULT NULL, + `Dateigrosse` int DEFAULT NULL, + `Nutzdatendatei` mediumtext, + `Auftragsdatei` varchar(1024) DEFAULT NULL, + `SentApp8Success` tinyint NOT NULL DEFAULT '0', + `SentDakotaSuccess` tinyint NOT NULL DEFAULT '0', + `ResultType` int DEFAULT NULL, + `Fehlertitel` varchar(256) DEFAULT NULL, + `Fehlerdatum` datetime DEFAULT NULL, + `Fehlernachricht` varchar(4096) DEFAULT NULL, + PRIMARY KEY (`Oid`), + KEY `FK_GKVTRANSFERPROTOKOLL_GKVABRECHNUNG` (`GkvAbrechnungOid`), + CONSTRAINT `FK_GKVTRANSFERPROTOKOLL_GKVABRECHNUNG` FOREIGN KEY (`GkvAbrechnungOid`) REFERENCES `gkvabrechnung` (`Oid`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; \ No newline at end of file diff --git a/Report/ReportObjects/SbdStundenaufstellungRO.cs b/Report/ReportObjects/SbdStundenaufstellungRO.cs index 1a996a2d4..35fa8b511 100644 --- a/Report/ReportObjects/SbdStundenaufstellungRO.cs +++ b/Report/ReportObjects/SbdStundenaufstellungRO.cs @@ -87,7 +87,7 @@ namespace BeWo.Report.ReportObjects } } - public static List Create(int pMonth, int pYear, long orgaOid, long empOid, long serviceCategoryOid, int startDay, int endDay, bool checkServiceRecords, string bundesland) + public static List Create(int pMonth, int pYear, long orgaOid, long empOid, long serviceCategoryOid, int startDay, int endDay, bool checkServiceRecords, string bundesland, bool splitByEmployee = true) { var roList = new List(); @@ -157,7 +157,7 @@ namespace BeWo.Report.ReportObjects // IList customers = DAOFactory.SearchDAO.GetAllCustomerWithServiceRecordsInSpan(pSpan).OrderBy(ob => ob.Person.LastName + ", " + ob.Person.FirstName).ToList(); foreach (Customer customer in customers) { - var rolist = Create(customer, pSpan, orgaOid, empOid, serviceCategoryOid, true, checkServiceRecords, bundesland); + var rolist = Create(customer, pSpan, orgaOid, empOid, serviceCategoryOid, true, checkServiceRecords, bundesland, splitByEmployee); if (rolist != null) { roList.AddRange(rolist); @@ -191,7 +191,7 @@ namespace BeWo.Report.ReportObjects return rights; } - public static List Create(long pCustomerOid, int pMonth, int pYear, long orgaOid, long empOid, long serviceCategoryOid, int start, int end, bool checkServiceRecords, string bundesland, bool disableEmptySupportConcepts = false) + public static List Create(long pCustomerOid, int pMonth, int pYear, long orgaOid, long empOid, long serviceCategoryOid, int start, int end, bool checkServiceRecords, string bundesland, bool disableEmptySupportConcepts = false, bool splitByEmployee = true) { var pSpan = new DateTimeSpan(); if (start > end) @@ -209,7 +209,7 @@ namespace BeWo.Report.ReportObjects if (pCustomerOid > 0) { c = DAOFactory.GenericDAO.LoadByID(pCustomerOid); - resultList.AddRange(Create(c, pSpan, orgaOid, empOid, serviceCategoryOid, disableEmptySupportConcepts, checkServiceRecords, bundesland)); + resultList.AddRange(Create(c, pSpan, orgaOid, empOid, serviceCategoryOid, disableEmptySupportConcepts, checkServiceRecords, bundesland, splitByEmployee)); } else if (empOid > 0) { @@ -220,7 +220,7 @@ namespace BeWo.Report.ReportObjects if (e2c.Customer.IsActive == ActivationTypeId.Active) { resultList.AddRange(Create(e2c.Customer, pSpan, orgaOid, empOid, serviceCategoryOid, - disableEmptySupportConcepts, checkServiceRecords, bundesland)); + disableEmptySupportConcepts, checkServiceRecords, bundesland, splitByEmployee)); } } } @@ -228,7 +228,7 @@ namespace BeWo.Report.ReportObjects return resultList; } - public static List Create(Customer cust, DateTimeSpan span, long orgaOid, long empOid, long serviceCategoryOid, bool disableEmptySupportConcepts, bool checkServiceRecords, string bundesland) + public static List Create(Customer cust, DateTimeSpan span, long orgaOid, long empOid, long serviceCategoryOid, bool disableEmptySupportConcepts, bool checkServiceRecords, string bundesland, bool splitByEmployee) { var resultList = new List(); Dictionary employeeOid2Ro = new Dictionary(); @@ -295,13 +295,19 @@ namespace BeWo.Report.ReportObjects if (cont) { SbdStundenaufstellungRO ro = null; - if (employeeOid2Ro.ContainsKey(iSr.EmployeeOid.Value)) + if (!splitByEmployee && employeeOid2Ro.Count == 1) + { + ro = employeeOid2Ro.Values.ToList()[0]; + } + else if (employeeOid2Ro.ContainsKey(iSr.EmployeeOid.Value)) + { ro = employeeOid2Ro[iSr.EmployeeOid.Value]; - + } else { ro = CreateInitalRo(cust, span, iSr.Employee, 0); employeeOid2Ro.Add(iSr.EmployeeOid.Value, ro); + resultList.Add(ro); } @@ -520,7 +526,12 @@ namespace BeWo.Report.ReportObjects { eintrag.EmployeeOid = hauptBetreuer.Oid.Value; } - if (employeeOid2Ro.ContainsKey(eintrag.EmployeeOid)) + + if (!splitByEmployee && employeeOid2Ro.Count == 1) + { + ro = employeeOid2Ro.Values.ToList()[0]; + } + else if (employeeOid2Ro.ContainsKey(eintrag.EmployeeOid)) { ro = employeeOid2Ro[eintrag.EmployeeOid]; } diff --git a/ReportImp/ChristopherusHausMID/CustomReportCreator.cs b/ReportImp/ChristopherusHausMID/CustomReportCreator.cs index e0a5529f9..1b7ad341e 100644 --- a/ReportImp/ChristopherusHausMID/CustomReportCreator.cs +++ b/ReportImp/ChristopherusHausMID/CustomReportCreator.cs @@ -16,8 +16,46 @@ namespace ChristopherusHausMID.Reporting { public override XtraReport CreateSbdLeistungsnachweisForSingleCustomerReport(long customerOid, int month, int year, long orgaOid, long empOid, long serviceCategoryOid, int startDay, int endDay, bool checkServiceRecords, string bundesland) { - return CreateReportForStundenaufstellungROs(SbdStundenaufstellungRO.Create(customerOid, month, year, orgaOid, empOid, serviceCategoryOid, startDay, endDay, true, "nrw", false)); - + return CreateReportForStundenaufstellungROs(SbdStundenaufstellungRO.Create(customerOid, month, year, orgaOid, empOid, serviceCategoryOid, startDay, endDay, true, "nrw", false, false)); } + + public override XtraReport CreateServiceInvoiceReport(string dcIds, long? invoiceBaseOid) + { + var master = base.CreateServiceInvoiceReport(dcIds, invoiceBaseOid); + + + var oid = invoiceBaseOid; + if (oid == null && !String.IsNullOrEmpty(dcIds)) + { + if (Int64.TryParse(dcIds, out var temp)) + { + oid = temp; + } + + } + + + //Füge Leistungsnachweis als Anhang hinzu + if (oid.HasValue) + { + var i = DAOFactory.GenericDAO.LoadByID(oid.Value); + if (i.InvoiceBase.CostBearer2SupportConcept != null) + { + int month = i.InvoiceBase.AccountingPeriodStart.Value.Month; + int year = i.InvoiceBase.AccountingPeriodStart.Value.Year; + long cOid = i.InvoiceBase.CostBearer2SupportConcept.SupportConcept.Customer.Oid.Value; + + var qb = CreateServiceOverviewSingleCustomerReport(cOid, month, year, 0, 0, null, 1, DateTime.DaysInMonth(year, month)); + qb.CreateDocument(); + if (master.Pages.Count == 0) + { + master.CreateDocument(); + } + master.Pages.AddRange(qb.Pages); + } + } + return master; + } + } } diff --git a/ReportImp/ChristopherusHausMID/Invoicing/CustomInvoiceCreation.cs b/ReportImp/ChristopherusHausMID/Invoicing/CustomInvoiceCreation.cs index e7301a6b8..4a9e48f43 100644 --- a/ReportImp/ChristopherusHausMID/Invoicing/CustomInvoiceCreation.cs +++ b/ReportImp/ChristopherusHausMID/Invoicing/CustomInvoiceCreation.cs @@ -61,6 +61,7 @@ namespace ChristopherusHausMID.Invoicing foreach (var item in items) { + item.UnitDescription = "Faktor 1.0"; item.CustomNumber1 = anzahlAbwesenheitsTage; } return items; @@ -100,7 +101,13 @@ namespace ChristopherusHausMID.Invoicing public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, Calculations calc) { - return base.CreateInvoiceItem(iServiceRecord, scap, calc); + var ii = base.CreateInvoiceItem(iServiceRecord, scap, calc); + if (PoolHelper.GetAbsenceTime(scap.CostBearer2SupportConcept.SupportConcept.Customer, iServiceRecord.Start.Value) != null) + { + //Bei Abwesenheit darf nichts berechnet werden + return null; + } + return ii; } private decimal GetAbwesenheitsTage(Customer customer, DateTimeSpan invoicePeriod) diff --git a/ReportImp/ChristopherusHausMID/Invoicing/PoolHelper.cs b/ReportImp/ChristopherusHausMID/Invoicing/PoolHelper.cs index 9c302043a..5413e564b 100644 --- a/ReportImp/ChristopherusHausMID/Invoicing/PoolHelper.cs +++ b/ReportImp/ChristopherusHausMID/Invoicing/PoolHelper.cs @@ -1,4 +1,5 @@ -using System; +using BeWo.Data.Entities; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -8,5 +9,17 @@ namespace ChristopherusHausMID.Invoicing { public class PoolHelper { + public static AbsenceTime GetAbsenceTime(Customer customer, DateTime date) + { + foreach (var at in customer.AbsenceTimes) + { + if ((!at.Start.HasValue || at.Start.Value.Date <= date) && (!at.End.HasValue || at.End.Value.Date >= date)) + { + return at; + } + } + + return null; + } } } diff --git a/ReportImp/ChristopherusHausMID/Leistungsnachweis.cs b/ReportImp/ChristopherusHausMID/Leistungsnachweis.cs index 905b4a630..cced97731 100644 --- a/ReportImp/ChristopherusHausMID/Leistungsnachweis.cs +++ b/ReportImp/ChristopherusHausMID/Leistungsnachweis.cs @@ -8,6 +8,7 @@ using BS.Shared.Core; using BeWo.Data.Access; using BeWo.Data.Entities; using System.Linq; +using ChristopherusHausMID.Invoicing; namespace ChristopherusHausMID { @@ -28,11 +29,12 @@ namespace ChristopherusHausMID String klassen = ""; String bewilligungen = ""; + Customer mainCustomer = null; if (pRO.EmployeeOid > 0 && pRO.CustomerOid > 0) { - var mainCustomer = DAOFactory.GenericDAO.LoadByID(pRO.CustomerOid); + mainCustomer = DAOFactory.GenericDAO.LoadByID(pRO.CustomerOid); var emp = DAOFactory.GenericDAO.LoadByID(pRO.EmployeeOid); klienten = mainCustomer.Person.FirstNameLastName; @@ -84,6 +86,18 @@ namespace ChristopherusHausMID item.IstUhrzeiten1 = String.Format("{0:HH:mm}", item.StartDate); item.IstUhrzeiten2 = String.Format("{0:HH:mm}", item.EndDate); } + + if (!String.IsNullOrEmpty(item.EmployeeFullname) && item.EmployeeFullname != pRO.EmployeeName && item.Minutes > 0) + { + item.Notice = String.Format("Vertretung durch {0}", item.EmployeeFullname); + } + + var at = PoolHelper.GetAbsenceTime(mainCustomer, item.StartDate); + if (at != null) + { + item.Notice = at.AbsenceReason.Description; + item.Minutes = 0; + } if (item.Minutes > 0) { item.Notice5 = String.Format("{0:0.0}", poolFaktor); @@ -93,6 +107,7 @@ namespace ChristopherusHausMID this.bindingSource1.DataSource = pRO; } + private decimal GetAktuelleBewilligung(Customer c, DateTime datum) { var scList = c.SupportConcepts; diff --git a/ReportImp/ChristopherusHausMID/Leistungsnachweis.designer.cs b/ReportImp/ChristopherusHausMID/Leistungsnachweis.designer.cs index 20c5ee561..634d6c64c 100644 --- a/ReportImp/ChristopherusHausMID/Leistungsnachweis.designer.cs +++ b/ReportImp/ChristopherusHausMID/Leistungsnachweis.designer.cs @@ -222,7 +222,6 @@ namespace ChristopherusHausMID new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.IstUhrzeiten2")}); this.xrTableCell11.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell11.Name = "xrTableCell11"; - this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F); this.xrTableCell11.StylePriority.UseFont = false; this.xrTableCell11.StylePriority.UsePadding = false; this.xrTableCell11.Weight = 0.096551744452217175D; @@ -232,9 +231,10 @@ namespace ChristopherusHausMID this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice")}); this.xrTableCell8.Name = "xrTableCell8"; - this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F); + this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F); this.xrTableCell8.StylePriority.UsePadding = false; this.xrTableCell8.StylePriority.UseTextAlignment = false; + this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; this.xrTableCell8.Weight = 0.36551731898236622D; // // xrTableCell34 @@ -243,7 +243,6 @@ namespace ChristopherusHausMID new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice5")}); this.xrTableCell34.Multiline = true; this.xrTableCell34.Name = "xrTableCell34"; - this.xrTableCell34.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F); this.xrTableCell34.StylePriority.UsePadding = false; this.xrTableCell34.StylePriority.UseTextAlignment = false; this.xrTableCell34.Weight = 0.090804588890990648D; @@ -857,13 +856,12 @@ namespace ChristopherusHausMID | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell15.Name = "xrTableCell15"; - this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(10, 0, 0, 0, 100F); this.xrTableCell15.StylePriority.UseBorders = false; this.xrTableCell15.StylePriority.UseFont = false; this.xrTableCell15.StylePriority.UsePadding = false; this.xrTableCell15.StylePriority.UseTextAlignment = false; this.xrTableCell15.Text = "Die Richtigkeit der eingetragenen Zeiten wird hiermit bestätigt"; - this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell15.Weight = 1.027586607156568D; // // xrTableRow10 diff --git a/ReportImp/ChristopherusHausMID/Rechnung.Designer.cs b/ReportImp/ChristopherusHausMID/Rechnung.Designer.cs index 919764d37..d702af901 100644 --- a/ReportImp/ChristopherusHausMID/Rechnung.Designer.cs +++ b/ReportImp/ChristopherusHausMID/Rechnung.Designer.cs @@ -29,12 +29,8 @@ namespace ChristopherusHausMID private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary(); - DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary(); - DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary(); - DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary(); - DevExpress.XtraReports.UI.XRSummary xrSummary6 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Rechnung)); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); @@ -46,6 +42,22 @@ namespace ChristopherusHausMID this.GroupFooter = new DevExpress.XtraReports.UI.GroupFooterBand(); this.ruleNoticeNull = new DevExpress.XtraReports.UI.FormattingRule(); this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -68,8 +80,6 @@ namespace ChristopherusHausMID this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); this.lblKategorie = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); - this.lblBewilligungVom = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); @@ -94,14 +104,17 @@ namespace ChristopherusHausMID this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.fieldAnteilAnRechnung = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldSummeStunden = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldBetragAllerStunden = new DevExpress.XtraReports.UI.CalculatedField(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); - this.xrLabel25 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel28 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblAbrechenbareStunden = new DevExpress.XtraReports.UI.XRLabel(); + this.lblAbweichung = new DevExpress.XtraReports.UI.XRLabel(); + this.lblIstStunden = new DevExpress.XtraReports.UI.XRLabel(); + this.lblSollstunden = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); @@ -128,28 +141,11 @@ namespace ChristopherusHausMID this.xrTableCell56 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.fieldAbweichungIstSoll = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -219,8 +215,6 @@ namespace ChristopherusHausMID this.xrLabel12, this.lblKategorie, this.xrLabel11, - this.lblBewilligungVom, - this.xrLabel10, this.xrLabel6, this.xrLabel8, this.xrLabel4, @@ -231,6 +225,289 @@ namespace ChristopherusHausMID this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // + // xrTable2 + // + this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTable2.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 339.6658F); + this.xrTable2.Name = "xrTable2"; + this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow2}); + this.xrTable2.SizeF = new System.Drawing.SizeF(764.9999F, 26.54215F); + this.xrTable2.StylePriority.UseBorders = false; + this.xrTable2.StylePriority.UseFont = false; + // + // xrTableRow2 + // + this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell28, + this.xrTableCell29, + this.xrTableCell30, + this.xrTableCell31, + this.xrTableCell32, + this.xrTableCell33, + this.xrTableCell34, + this.xrTableCell35, + this.xrTableCell36, + this.xrTableCell38, + this.xrTableCell39, + this.xrTableCell40, + this.xrTableCell41, + this.xrTableCell42}); + this.xrTableRow2.Name = "xrTableRow2"; + this.xrTableRow2.Weight = 1D; + // + // xrTableCell28 + // + this.xrTableCell28.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell28.Name = "xrTableCell28"; + this.xrTableCell28.StylePriority.UseBackColor = false; + this.xrTableCell28.StylePriority.UseBorderColor = false; + this.xrTableCell28.StylePriority.UseBorders = false; + this.xrTableCell28.StylePriority.UseFont = false; + this.xrTableCell28.StylePriority.UsePadding = false; + this.xrTableCell28.StylePriority.UseTextAlignment = false; + xrSummary1.FormatString = "{0:0}"; + xrSummary1.Func = DevExpress.XtraReports.UI.SummaryFunc.RecordNumber; + xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; + this.xrTableCell28.Summary = xrSummary1; + this.xrTableCell28.Text = "1"; + this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell28.Weight = 0.8258043660348906D; + // + // xrTableCell29 + // + this.xrTableCell29.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.CustomerName")}); + this.xrTableCell29.Multiline = true; + this.xrTableCell29.Name = "xrTableCell29"; + this.xrTableCell29.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F); + this.xrTableCell29.StylePriority.UseBackColor = false; + this.xrTableCell29.StylePriority.UseBorderColor = false; + this.xrTableCell29.StylePriority.UseBorders = false; + this.xrTableCell29.StylePriority.UseFont = false; + this.xrTableCell29.StylePriority.UsePadding = false; + this.xrTableCell29.StylePriority.UseTextAlignment = false; + this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell29.Weight = 2.7391234297526954D; + // + // xrTableCell30 + // + this.xrTableCell30.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.BewilligtProWoche")}); + this.xrTableCell30.Multiline = true; + this.xrTableCell30.Name = "xrTableCell30"; + this.xrTableCell30.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); + this.xrTableCell30.StylePriority.UseBackColor = false; + this.xrTableCell30.StylePriority.UseBorderColor = false; + this.xrTableCell30.StylePriority.UseBorders = false; + this.xrTableCell30.StylePriority.UseFont = false; + this.xrTableCell30.StylePriority.UsePadding = false; + this.xrTableCell30.StylePriority.UseTextAlignment = false; + this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell30.TextFormatString = "{0:0.00} h"; + this.xrTableCell30.Weight = 1.9334924156454902D; + // + // xrTableCell31 + // + this.xrTableCell31.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.Fehltage")}); + this.xrTableCell31.Multiline = true; + this.xrTableCell31.Name = "xrTableCell31"; + this.xrTableCell31.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); + this.xrTableCell31.StylePriority.UseBackColor = false; + this.xrTableCell31.StylePriority.UseBorderColor = false; + this.xrTableCell31.StylePriority.UseBorders = false; + this.xrTableCell31.StylePriority.UseFont = false; + this.xrTableCell31.StylePriority.UsePadding = false; + this.xrTableCell31.StylePriority.UseTextAlignment = false; + this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell31.Weight = 1.2889993735091139D; + // + // xrTableCell32 + // + this.xrTableCell32.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell32.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.Rechungsanteil")}); + this.xrTableCell32.Multiline = true; + this.xrTableCell32.Name = "xrTableCell32"; + this.xrTableCell32.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); + this.xrTableCell32.StylePriority.UseBackColor = false; + this.xrTableCell32.StylePriority.UseBorderColor = false; + this.xrTableCell32.StylePriority.UseBorders = false; + this.xrTableCell32.StylePriority.UseFont = false; + this.xrTableCell32.StylePriority.UsePadding = false; + this.xrTableCell32.StylePriority.UseTextAlignment = false; + this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell32.TextFormatString = "{0:0.00}%"; + this.xrTableCell32.Weight = 1.9334990413834123D; + // + // xrTableCell33 + // + this.xrTableCell33.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell33.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.Stundensatz")}); + this.xrTableCell33.Multiline = true; + this.xrTableCell33.Name = "xrTableCell33"; + this.xrTableCell33.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); + this.xrTableCell33.StylePriority.UseBackColor = false; + this.xrTableCell33.StylePriority.UseBorderColor = false; + this.xrTableCell33.StylePriority.UseBorders = false; + this.xrTableCell33.StylePriority.UseFont = false; + this.xrTableCell33.StylePriority.UsePadding = false; + this.xrTableCell33.StylePriority.UseTextAlignment = false; + this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell33.TextFormatString = "{0:c}"; + this.xrTableCell33.Weight = 1.6112490927924212D; + // + // xrTableCell34 + // + this.xrTableCell34.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell34.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.Stunden5Prozent10")}); + this.xrTableCell34.Multiline = true; + this.xrTableCell34.Name = "xrTableCell34"; + this.xrTableCell34.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); + this.xrTableCell34.StylePriority.UseBackColor = false; + this.xrTableCell34.StylePriority.UseBorderColor = false; + this.xrTableCell34.StylePriority.UseBorders = false; + this.xrTableCell34.StylePriority.UseFont = false; + this.xrTableCell34.StylePriority.UsePadding = false; + this.xrTableCell34.StylePriority.UseTextAlignment = false; + this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell34.TextFormatString = "{0:0.00} h"; + this.xrTableCell34.Weight = 1.7401491722474813D; + // + // xrTableCell35 + // + this.xrTableCell35.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell35.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.BetreuteStunden10")}); + this.xrTableCell35.Multiline = true; + this.xrTableCell35.Name = "xrTableCell35"; + this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); + this.xrTableCell35.StylePriority.UseBackColor = false; + this.xrTableCell35.StylePriority.UseBorderColor = false; + this.xrTableCell35.StylePriority.UseBorders = false; + this.xrTableCell35.StylePriority.UseFont = false; + this.xrTableCell35.StylePriority.UsePadding = false; + this.xrTableCell35.StylePriority.UseTextAlignment = false; + this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell35.TextFormatString = "{0:0.00} h"; + this.xrTableCell35.Weight = 1.7401491722474811D; + // + // xrTableCell36 + // + this.xrTableCell36.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell36.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.BetreuteStunden11")}); + this.xrTableCell36.Multiline = true; + this.xrTableCell36.Name = "xrTableCell36"; + this.xrTableCell36.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); + this.xrTableCell36.StylePriority.UseBackColor = false; + this.xrTableCell36.StylePriority.UseBorderColor = false; + this.xrTableCell36.StylePriority.UseBorders = false; + this.xrTableCell36.StylePriority.UseFont = false; + this.xrTableCell36.StylePriority.UsePadding = false; + this.xrTableCell36.StylePriority.UseTextAlignment = false; + this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell36.TextFormatString = "{0:0.00} h"; + this.xrTableCell36.Weight = 1.740149172247468D; + // + // xrTableCell38 + // + this.xrTableCell38.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell38.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.BetreuteStunden12")}); + this.xrTableCell38.Multiline = true; + this.xrTableCell38.Name = "xrTableCell38"; + this.xrTableCell38.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); + this.xrTableCell38.StylePriority.UseBackColor = false; + this.xrTableCell38.StylePriority.UseBorderColor = false; + this.xrTableCell38.StylePriority.UseBorders = false; + this.xrTableCell38.StylePriority.UseFont = false; + this.xrTableCell38.StylePriority.UsePadding = false; + this.xrTableCell38.StylePriority.UseTextAlignment = false; + this.xrTableCell38.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell38.TextFormatString = "{0:0.00} h"; + this.xrTableCell38.Weight = 1.7401491722474685D; + // + // xrTableCell39 + // + this.xrTableCell39.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell39.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.BetreuteStunden13")}); + this.xrTableCell39.Multiline = true; + this.xrTableCell39.Name = "xrTableCell39"; + this.xrTableCell39.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); + this.xrTableCell39.StylePriority.UseBackColor = false; + this.xrTableCell39.StylePriority.UseBorderColor = false; + this.xrTableCell39.StylePriority.UseBorders = false; + this.xrTableCell39.StylePriority.UseFont = false; + this.xrTableCell39.StylePriority.UsePadding = false; + this.xrTableCell39.StylePriority.UseTextAlignment = false; + this.xrTableCell39.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell39.TextFormatString = "{0:0.00} h"; + this.xrTableCell39.Weight = 1.7401491722474678D; + // + // xrTableCell40 + // + this.xrTableCell40.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.BetreuteStunden14")}); + this.xrTableCell40.Multiline = true; + this.xrTableCell40.Name = "xrTableCell40"; + this.xrTableCell40.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); + this.xrTableCell40.StylePriority.UseBackColor = false; + this.xrTableCell40.StylePriority.UseBorderColor = false; + this.xrTableCell40.StylePriority.UseBorders = false; + this.xrTableCell40.StylePriority.UseFont = false; + this.xrTableCell40.StylePriority.UsePadding = false; + this.xrTableCell40.StylePriority.UseTextAlignment = false; + this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell40.TextFormatString = "{0:0.00} h"; + this.xrTableCell40.Weight = 1.7401491722474418D; + // + // xrTableCell41 + // + this.xrTableCell41.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell41.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.BetreuteStunden15")}); + this.xrTableCell41.Multiline = true; + this.xrTableCell41.Name = "xrTableCell41"; + this.xrTableCell41.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); + this.xrTableCell41.StylePriority.UseBackColor = false; + this.xrTableCell41.StylePriority.UseBorderColor = false; + this.xrTableCell41.StylePriority.UseBorders = false; + this.xrTableCell41.StylePriority.UseFont = false; + this.xrTableCell41.StylePriority.UsePadding = false; + this.xrTableCell41.StylePriority.UseTextAlignment = false; + this.xrTableCell41.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell41.TextFormatString = "{0:0.00} h"; + this.xrTableCell41.Weight = 1.7401491722474416D; + // + // xrTableCell42 + // + this.xrTableCell42.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.GesamtBetrag")}); + this.xrTableCell42.Multiline = true; + this.xrTableCell42.Name = "xrTableCell42"; + this.xrTableCell42.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); + this.xrTableCell42.StylePriority.UseBackColor = false; + this.xrTableCell42.StylePriority.UseBorderColor = false; + this.xrTableCell42.StylePriority.UseBorders = false; + this.xrTableCell42.StylePriority.UseFont = false; + this.xrTableCell42.StylePriority.UsePadding = false; + this.xrTableCell42.StylePriority.UseTextAlignment = false; + this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell42.TextFormatString = "{0:c} "; + this.xrTableCell42.Weight = 2.1388968897819165D; + // // xrTable5 // this.xrTable5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) @@ -265,7 +542,6 @@ namespace ChristopherusHausMID // xrTableCell37 // this.xrTableCell37.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell37.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell37.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell37.Name = "xrTableCell37"; this.xrTableCell37.StylePriority.UseBackColor = false; @@ -281,7 +557,6 @@ namespace ChristopherusHausMID // xrTableCell1 // this.xrTableCell1.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell1.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell1.Multiline = true; this.xrTableCell1.Name = "xrTableCell1"; @@ -298,7 +573,6 @@ namespace ChristopherusHausMID // xrTableCell2 // this.xrTableCell2.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell2.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell2.Multiline = true; this.xrTableCell2.Name = "xrTableCell2"; @@ -315,7 +589,6 @@ namespace ChristopherusHausMID // xrTableCell3 // this.xrTableCell3.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell3.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell3.Multiline = true; this.xrTableCell3.Name = "xrTableCell3"; @@ -332,7 +605,6 @@ namespace ChristopherusHausMID // xrTableCell4 // this.xrTableCell4.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell4.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell4.Multiline = true; this.xrTableCell4.Name = "xrTableCell4"; @@ -349,7 +621,6 @@ namespace ChristopherusHausMID // xrTableCell5 // this.xrTableCell5.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell5.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell5.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell5.Multiline = true; this.xrTableCell5.Name = "xrTableCell5"; @@ -366,7 +637,6 @@ namespace ChristopherusHausMID // xrTableCell6 // this.xrTableCell6.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell6.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell6.Multiline = true; this.xrTableCell6.Name = "xrTableCell6"; @@ -383,7 +653,6 @@ namespace ChristopherusHausMID // xrTableCell7 // this.xrTableCell7.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell7.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell7.Multiline = true; this.xrTableCell7.Name = "xrTableCell7"; @@ -400,7 +669,6 @@ namespace ChristopherusHausMID // xrTableCell8 // this.xrTableCell8.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell8.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell8.Multiline = true; this.xrTableCell8.Name = "xrTableCell8"; @@ -417,7 +685,6 @@ namespace ChristopherusHausMID // xrTableCell9 // this.xrTableCell9.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell9.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell9.Multiline = true; this.xrTableCell9.Name = "xrTableCell9"; @@ -434,7 +701,6 @@ namespace ChristopherusHausMID // xrTableCell10 // this.xrTableCell10.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell10.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell10.Multiline = true; this.xrTableCell10.Name = "xrTableCell10"; @@ -451,7 +717,6 @@ namespace ChristopherusHausMID // xrTableCell11 // this.xrTableCell11.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell11.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell11.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell11.Multiline = true; this.xrTableCell11.Name = "xrTableCell11"; @@ -468,7 +733,6 @@ namespace ChristopherusHausMID // xrTableCell12 // this.xrTableCell12.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell12.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell12.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell12.Multiline = true; this.xrTableCell12.Name = "xrTableCell12"; @@ -485,7 +749,6 @@ namespace ChristopherusHausMID // xrTableCell13 // this.xrTableCell13.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell13.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell13.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell13.Multiline = true; this.xrTableCell13.Name = "xrTableCell13"; @@ -556,7 +819,6 @@ namespace ChristopherusHausMID this.xrLabel12.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel12.CanShrink = true; this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 139.0415F); this.xrLabel12.Name = "xrLabel12"; @@ -576,7 +838,7 @@ namespace ChristopherusHausMID this.lblKategorie.BackColor = System.Drawing.Color.Transparent; this.lblKategorie.CanShrink = true; this.lblKategorie.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.lblKategorie.LocationFloat = new DevExpress.Utils.PointFloat(490.0001F, 110.4167F); + this.lblKategorie.LocationFloat = new DevExpress.Utils.PointFloat(490.0002F, 90.41677F); this.lblKategorie.Name = "lblKategorie"; this.lblKategorie.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.lblKategorie.SizeF = new System.Drawing.SizeF(157.2084F, 28.62479F); @@ -590,47 +852,15 @@ namespace ChristopherusHausMID this.xrLabel11.BackColor = System.Drawing.Color.Transparent; this.xrLabel11.CanShrink = true; this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(489.9998F, 79.9999F); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(489.9998F, 60F); this.xrLabel11.Name = "xrLabel11"; this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel11.SizeF = new System.Drawing.SizeF(265.0002F, 20.00001F); this.xrLabel11.StylePriority.UseBackColor = false; this.xrLabel11.StylePriority.UseFont = false; - this.xrLabel11.Text = "Vers.-Nr. [ServiceInvoice.CustomerInsuranceNumber]"; + this.xrLabel11.Text = "Vers.-Nr. [ServiceInvoice.CustomerReferenceNumber]"; this.xrLabel11.WordWrap = false; // - // lblBewilligungVom - // - this.lblBewilligungVom.BackColor = System.Drawing.Color.Transparent; - this.lblBewilligungVom.CanShrink = true; - this.lblBewilligungVom.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoice.ApprovalDate")}); - this.lblBewilligungVom.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.lblBewilligungVom.LocationFloat = new DevExpress.Utils.PointFloat(619.3317F, 59.9999F); - this.lblBewilligungVom.Name = "lblBewilligungVom"; - this.lblBewilligungVom.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblBewilligungVom.SizeF = new System.Drawing.SizeF(135.669F, 20.00002F); - this.lblBewilligungVom.StylePriority.UseBackColor = false; - this.lblBewilligungVom.StylePriority.UseFont = false; - this.lblBewilligungVom.StylePriority.UseTextAlignment = false; - this.lblBewilligungVom.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.lblBewilligungVom.TextFormatString = "{0:dd.MM.yyyy}"; - this.lblBewilligungVom.WordWrap = false; - // - // xrLabel10 - // - this.xrLabel10.BackColor = System.Drawing.Color.Transparent; - this.xrLabel10.CanShrink = true; - this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(489.9998F, 59.9999F); - this.xrLabel10.Name = "xrLabel10"; - this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel10.SizeF = new System.Drawing.SizeF(129.3311F, 20.00001F); - this.xrLabel10.StylePriority.UseBackColor = false; - this.xrLabel10.StylePriority.UseFont = false; - this.xrLabel10.Text = "Bewilligung vom"; - this.xrLabel10.WordWrap = false; - // // xrLabel6 // this.xrLabel6.BackColor = System.Drawing.Color.Transparent; @@ -773,7 +1003,6 @@ namespace ChristopherusHausMID // xrTableCell14 // this.xrTableCell14.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell14.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell14.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -787,17 +1016,12 @@ namespace ChristopherusHausMID this.xrTableCell14.StylePriority.UseFont = false; this.xrTableCell14.StylePriority.UsePadding = false; this.xrTableCell14.StylePriority.UseTextAlignment = false; - xrSummary2.FormatString = "{0:0}"; - xrSummary2.Func = DevExpress.XtraReports.UI.SummaryFunc.RecordNumber; - xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; - this.xrTableCell14.Summary = xrSummary2; this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell14.Weight = 0.8258043660348906D; // // xrTableCell15 // this.xrTableCell15.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell15.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell15.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -818,7 +1042,6 @@ namespace ChristopherusHausMID // xrTableCell16 // this.xrTableCell16.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell16.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell16.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -840,7 +1063,6 @@ namespace ChristopherusHausMID // xrTableCell17 // this.xrTableCell17.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell17.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell17.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -861,7 +1083,6 @@ namespace ChristopherusHausMID // xrTableCell18 // this.xrTableCell18.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell18.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell18.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -883,7 +1104,6 @@ namespace ChristopherusHausMID // xrTableCell19 // this.xrTableCell19.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell19.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell19.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -905,7 +1125,6 @@ namespace ChristopherusHausMID // xrTableCell20 // this.xrTableCell20.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell20.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -926,7 +1145,6 @@ namespace ChristopherusHausMID // xrTableCell21 // this.xrTableCell21.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell21.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell21.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -948,7 +1166,6 @@ namespace ChristopherusHausMID // xrTableCell22 // this.xrTableCell22.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell22.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell22.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -970,7 +1187,6 @@ namespace ChristopherusHausMID // xrTableCell23 // this.xrTableCell23.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell23.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell23.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -991,7 +1207,6 @@ namespace ChristopherusHausMID // xrTableCell24 // this.xrTableCell24.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell24.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell24.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -1013,7 +1228,6 @@ namespace ChristopherusHausMID // xrTableCell25 // this.xrTableCell25.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell25.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell25.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -1035,7 +1249,6 @@ namespace ChristopherusHausMID // xrTableCell26 // this.xrTableCell26.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell26.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell26.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -1057,7 +1270,6 @@ namespace ChristopherusHausMID // xrTableCell27 // this.xrTableCell27.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell27.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell27.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -1075,6 +1287,10 @@ namespace ChristopherusHausMID this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell27.Weight = 2.1388968897819165D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(ChristopherusHausMID.RechnungRO); + // // fieldAnteilAnRechnung // this.fieldAnteilAnRechnung.DataMember = "ServiceInvoicePeriods"; @@ -1098,10 +1314,12 @@ namespace ChristopherusHausMID // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel25, - this.xrLabel26, - this.xrLabel27, - this.xrLabel28, + this.xrLabel9, + this.xrLabel7, + this.lblAbrechenbareStunden, + this.lblAbweichung, + this.lblIstStunden, + this.lblSollstunden, this.xrLabel20, this.xrLabel15, this.xrLabel14, @@ -1113,84 +1331,104 @@ namespace ChristopherusHausMID this.ReportFooter.HeightF = 282.3737F; this.ReportFooter.Name = "ReportFooter"; // - // xrLabel25 + // xrLabel9 // - this.xrLabel25.BackColor = System.Drawing.Color.Transparent; - this.xrLabel25.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.UnitCount")}); - this.xrLabel25.Font = new DevExpress.Drawing.DXFont("Arial", 9F); - this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(157.6261F, 69.9999F); - this.xrLabel25.Name = "xrLabel25"; - this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel25.SizeF = new System.Drawing.SizeF(53.00008F, 20.00002F); - this.xrLabel25.StylePriority.UseBackColor = false; - this.xrLabel25.StylePriority.UseBorders = false; - this.xrLabel25.StylePriority.UseFont = false; - xrSummary3.FormatString = "{0:0.00}"; - xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; - this.xrLabel25.Summary = xrSummary3; - this.xrLabel25.WordWrap = false; + this.xrLabel9.BackColor = System.Drawing.Color.Transparent; + this.xrLabel9.Borders = DevExpress.XtraPrinting.BorderSide.Left; + this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 9F); + this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLabel9.Multiline = true; + this.xrLabel9.Name = "xrLabel9"; + this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel9.SizeF = new System.Drawing.SizeF(25.62622F, 116.4574F); + this.xrLabel9.StylePriority.UseBackColor = false; + this.xrLabel9.StylePriority.UseBorders = false; + this.xrLabel9.StylePriority.UseFont = false; // - // xrLabel26 + // xrLabel7 // - this.xrLabel26.BackColor = System.Drawing.Color.Transparent; - this.xrLabel26.Borders = DevExpress.XtraPrinting.BorderSide.Right; - this.xrLabel26.Font = new DevExpress.Drawing.DXFont("Arial", 9F); - this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(157.6261F, 49.9999F); - this.xrLabel26.Name = "xrLabel26"; - this.xrLabel26.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel26.SizeF = new System.Drawing.SizeF(53.00008F, 20.00002F); - this.xrLabel26.StylePriority.UseBackColor = false; - this.xrLabel26.StylePriority.UseBorders = false; - this.xrLabel26.StylePriority.UseFont = false; - this.xrLabel26.Text = "[fieldAbweichungIstSoll] %"; - this.xrLabel26.WordWrap = false; + this.xrLabel7.BackColor = System.Drawing.Color.Transparent; + this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.Right; + this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 9F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(740.9977F, 0F); + 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(24.00208F, 116.4574F); + this.xrLabel7.StylePriority.UseBackColor = false; + this.xrLabel7.StylePriority.UseBorders = false; + this.xrLabel7.StylePriority.UseFont = false; // - // xrLabel27 + // lblAbrechenbareStunden // - this.xrLabel27.BackColor = System.Drawing.Color.Transparent; - this.xrLabel27.Borders = DevExpress.XtraPrinting.BorderSide.Right; - this.xrLabel27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.UnitCount")}); - this.xrLabel27.Font = new DevExpress.Drawing.DXFont("Arial", 9F); - this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(157.6261F, 30.0001F); - this.xrLabel27.Name = "xrLabel27"; - this.xrLabel27.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel27.SizeF = new System.Drawing.SizeF(53.00008F, 20.00003F); - this.xrLabel27.StylePriority.UseBackColor = false; - this.xrLabel27.StylePriority.UseBorders = false; - this.xrLabel27.StylePriority.UseFont = false; - xrSummary4.FormatString = "{0:0.00}"; - xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; - this.xrLabel27.Summary = xrSummary4; - this.xrLabel27.WordWrap = false; + this.lblAbrechenbareStunden.BackColor = System.Drawing.Color.Transparent; + this.lblAbrechenbareStunden.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.lblAbrechenbareStunden.Font = new DevExpress.Drawing.DXFont("Arial", 9F); + this.lblAbrechenbareStunden.LocationFloat = new DevExpress.Utils.PointFloat(157.6261F, 81.66656F); + this.lblAbrechenbareStunden.Name = "lblAbrechenbareStunden"; + this.lblAbrechenbareStunden.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblAbrechenbareStunden.SizeF = new System.Drawing.SizeF(53.00008F, 20.00002F); + this.lblAbrechenbareStunden.StylePriority.UseBackColor = false; + this.lblAbrechenbareStunden.StylePriority.UseBorders = false; + this.lblAbrechenbareStunden.StylePriority.UseFont = false; + this.lblAbrechenbareStunden.StylePriority.UseTextAlignment = false; + this.lblAbrechenbareStunden.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.lblAbrechenbareStunden.WordWrap = false; // - // xrLabel28 + // lblAbweichung // - this.xrLabel28.BackColor = System.Drawing.Color.Transparent; - this.xrLabel28.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrLabel28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ApprovedHours")}); - this.xrLabel28.Font = new DevExpress.Drawing.DXFont("Arial", 9F); - this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(157.6261F, 9.999898F); - this.xrLabel28.Name = "xrLabel28"; - this.xrLabel28.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel28.SizeF = new System.Drawing.SizeF(53.00008F, 20.00003F); - this.xrLabel28.StylePriority.UseBackColor = false; - this.xrLabel28.StylePriority.UseBorders = false; - this.xrLabel28.StylePriority.UseFont = false; - xrSummary5.FormatString = "{0:0.00}"; - xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; - this.xrLabel28.Summary = xrSummary5; - this.xrLabel28.WordWrap = false; + this.lblAbweichung.BackColor = System.Drawing.Color.Transparent; + this.lblAbweichung.Borders = DevExpress.XtraPrinting.BorderSide.Right; + this.lblAbweichung.Font = new DevExpress.Drawing.DXFont("Arial", 9F); + this.lblAbweichung.LocationFloat = new DevExpress.Utils.PointFloat(157.6261F, 61.66656F); + this.lblAbweichung.Name = "lblAbweichung"; + this.lblAbweichung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblAbweichung.SizeF = new System.Drawing.SizeF(53.00008F, 20.00002F); + this.lblAbweichung.StylePriority.UseBackColor = false; + this.lblAbweichung.StylePriority.UseBorders = false; + this.lblAbweichung.StylePriority.UseFont = false; + this.lblAbweichung.StylePriority.UseTextAlignment = false; + this.lblAbweichung.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.lblAbweichung.WordWrap = false; + // + // lblIstStunden + // + this.lblIstStunden.BackColor = System.Drawing.Color.Transparent; + this.lblIstStunden.Borders = DevExpress.XtraPrinting.BorderSide.Right; + this.lblIstStunden.Font = new DevExpress.Drawing.DXFont("Arial", 9F); + this.lblIstStunden.LocationFloat = new DevExpress.Utils.PointFloat(157.6261F, 41.66677F); + this.lblIstStunden.Name = "lblIstStunden"; + this.lblIstStunden.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblIstStunden.SizeF = new System.Drawing.SizeF(53.00008F, 20.00003F); + this.lblIstStunden.StylePriority.UseBackColor = false; + this.lblIstStunden.StylePriority.UseBorders = false; + this.lblIstStunden.StylePriority.UseFont = false; + this.lblIstStunden.StylePriority.UseTextAlignment = false; + this.lblIstStunden.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.lblIstStunden.WordWrap = false; + // + // lblSollstunden + // + this.lblSollstunden.BackColor = System.Drawing.Color.Transparent; + this.lblSollstunden.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right))); + this.lblSollstunden.Font = new DevExpress.Drawing.DXFont("Arial", 9F); + this.lblSollstunden.LocationFloat = new DevExpress.Utils.PointFloat(157.6261F, 21.66656F); + this.lblSollstunden.Name = "lblSollstunden"; + this.lblSollstunden.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblSollstunden.SizeF = new System.Drawing.SizeF(53.00008F, 20.00003F); + this.lblSollstunden.StylePriority.UseBackColor = false; + this.lblSollstunden.StylePriority.UseBorders = false; + this.lblSollstunden.StylePriority.UseFont = false; + this.lblSollstunden.StylePriority.UseTextAlignment = false; + this.lblSollstunden.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.lblSollstunden.WordWrap = false; // // xrLabel20 // this.xrLabel20.BackColor = System.Drawing.Color.Transparent; this.xrLabel20.Borders = DevExpress.XtraPrinting.BorderSide.Left; this.xrLabel20.Font = new DevExpress.Drawing.DXFont("Arial", 9F); - this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(25.62622F, 49.99868F); + this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(25.62622F, 61.66534F); this.xrLabel20.Name = "xrLabel20"; this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel20.SizeF = new System.Drawing.SizeF(131.9999F, 20.00003F); @@ -1205,7 +1443,7 @@ namespace ChristopherusHausMID this.xrLabel15.BackColor = System.Drawing.Color.Transparent; this.xrLabel15.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Arial", 9F); - this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(25.62622F, 69.99857F); + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(25.62622F, 81.66525F); this.xrLabel15.Name = "xrLabel15"; this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F); this.xrLabel15.SizeF = new System.Drawing.SizeF(132F, 20F); @@ -1221,7 +1459,7 @@ namespace ChristopherusHausMID this.xrLabel14.BackColor = System.Drawing.Color.Transparent; this.xrLabel14.Borders = DevExpress.XtraPrinting.BorderSide.Left; this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 9F); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(25.62622F, 30.0001F); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(25.62622F, 41.66677F); this.xrLabel14.Name = "xrLabel14"; this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel14.SizeF = new System.Drawing.SizeF(131.9999F, 19.99849F); @@ -1236,7 +1474,7 @@ namespace ChristopherusHausMID this.xrLabel1.BackColor = System.Drawing.Color.Transparent; this.xrLabel1.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 9F); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(25.62622F, 10F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(25.62622F, 21.66667F); this.xrLabel1.Name = "xrLabel1"; this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel1.SizeF = new System.Drawing.SizeF(131.9999F, 20.00003F); @@ -1249,7 +1487,8 @@ namespace ChristopherusHausMID // xrLabel21 // this.xrLabel21.BackColor = System.Drawing.Color.Transparent; - this.xrLabel21.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrLabel21.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel21.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(0F, 116.4574F); this.xrLabel21.Name = "xrLabel21"; @@ -1267,7 +1506,8 @@ namespace ChristopherusHausMID // xrLabel22 // this.xrLabel22.BackColor = System.Drawing.Color.Transparent; - this.xrLabel22.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrLabel22.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoice.GrossClaim")}); this.xrLabel22.Font = new DevExpress.Drawing.DXFont("Arial", 10F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline)))); @@ -1286,14 +1526,13 @@ namespace ChristopherusHausMID // xrLabel23 // this.xrLabel23.BackColor = System.Drawing.Color.Transparent; - this.xrLabel23.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrLabel23.CanShrink = true; + this.xrLabel23.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); this.xrLabel23.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(0F, 168.7491F); this.xrLabel23.Multiline = true; this.xrLabel23.Name = "xrLabel23"; this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel23.SizeF = new System.Drawing.SizeF(765F, 33.54169F); + this.xrLabel23.SizeF = new System.Drawing.SizeF(765F, 43.54176F); this.xrLabel23.StylePriority.UseBackColor = false; this.xrLabel23.StylePriority.UseBorders = false; this.xrLabel23.StylePriority.UseFont = false; @@ -1306,7 +1545,8 @@ namespace ChristopherusHausMID // xrLabel24 // this.xrLabel24.BackColor = System.Drawing.Color.Transparent; - this.xrLabel24.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrLabel24.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel24.CanShrink = true; this.xrLabel24.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(0F, 212.2908F); @@ -1356,7 +1596,6 @@ namespace ChristopherusHausMID // xrTableCell43 // this.xrTableCell43.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell43.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell43.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); @@ -1369,16 +1608,15 @@ namespace ChristopherusHausMID this.xrTableCell43.StylePriority.UseFont = false; this.xrTableCell43.StylePriority.UsePadding = false; this.xrTableCell43.StylePriority.UseTextAlignment = false; - xrSummary6.FormatString = "{0:0}"; - xrSummary6.Func = DevExpress.XtraReports.UI.SummaryFunc.RecordNumber; - this.xrTableCell43.Summary = xrSummary6; + xrSummary2.FormatString = "{0:0}"; + xrSummary2.Func = DevExpress.XtraReports.UI.SummaryFunc.RecordNumber; + this.xrTableCell43.Summary = xrSummary2; this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell43.Weight = 0.8258043660348906D; // // xrTableCell44 // this.xrTableCell44.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell44.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell44.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); @@ -1398,7 +1636,6 @@ namespace ChristopherusHausMID // xrTableCell45 // this.xrTableCell45.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell45.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell45.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); @@ -1419,7 +1656,6 @@ namespace ChristopherusHausMID // xrTableCell46 // this.xrTableCell46.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell46.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell46.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); @@ -1439,7 +1675,6 @@ namespace ChristopherusHausMID // xrTableCell47 // this.xrTableCell47.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell47.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell47.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); @@ -1461,7 +1696,6 @@ namespace ChristopherusHausMID // xrTableCell48 // this.xrTableCell48.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell48.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell48.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); @@ -1484,7 +1718,6 @@ namespace ChristopherusHausMID // xrTableCell49 // this.xrTableCell49.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell49.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell49.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); @@ -1504,7 +1737,6 @@ namespace ChristopherusHausMID // xrTableCell50 // this.xrTableCell50.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell50.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell50.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); @@ -1518,7 +1750,8 @@ namespace ChristopherusHausMID this.xrTableCell50.StylePriority.UseFont = false; this.xrTableCell50.StylePriority.UsePadding = false; this.xrTableCell50.StylePriority.UseTextAlignment = false; - this.xrTableCell50.Text = "[SummenPosition.BetreuteStunden10!0.00]\r\n[SummenPosition.BetragStunden10!0.00] €"; + this.xrTableCell50.Text = "[SummenPosition.BetreuteStunden10!0.00] h\r\n[SummenPosition.BetragStunden10!0.00] " + + "€"; this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell50.TextFormatString = "{0:0.00} h"; this.xrTableCell50.Weight = 1.7401491722474813D; @@ -1526,7 +1759,6 @@ namespace ChristopherusHausMID // xrTableCell51 // this.xrTableCell51.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell51.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell51.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); @@ -1540,14 +1772,14 @@ namespace ChristopherusHausMID this.xrTableCell51.StylePriority.UseFont = false; this.xrTableCell51.StylePriority.UsePadding = false; this.xrTableCell51.StylePriority.UseTextAlignment = false; - this.xrTableCell51.Text = "[SummenPosition.BetreuteStunden11!0.00]\r\n[SummenPosition.BetragStunden11!0.00] €"; + this.xrTableCell51.Text = "[SummenPosition.BetreuteStunden11!0.00] h\r\n[SummenPosition.BetragStunden11!0.00] " + + "€"; this.xrTableCell51.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell51.Weight = 1.7401491722474678D; // // xrTableCell52 // this.xrTableCell52.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell52.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell52.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); @@ -1561,14 +1793,14 @@ namespace ChristopherusHausMID this.xrTableCell52.StylePriority.UseFont = false; this.xrTableCell52.StylePriority.UsePadding = false; this.xrTableCell52.StylePriority.UseTextAlignment = false; - this.xrTableCell52.Text = "[SummenPosition.BetreuteStunden12!0.00]\r\n[SummenPosition.BetragStunden12!0.00] €"; + this.xrTableCell52.Text = "[SummenPosition.BetreuteStunden12!0.00] h\r\n[SummenPosition.BetragStunden12!0.00] " + + "€"; this.xrTableCell52.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell52.Weight = 1.7401491722474682D; // // xrTableCell53 // this.xrTableCell53.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell53.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell53.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); @@ -1582,14 +1814,14 @@ namespace ChristopherusHausMID this.xrTableCell53.StylePriority.UseFont = false; this.xrTableCell53.StylePriority.UsePadding = false; this.xrTableCell53.StylePriority.UseTextAlignment = false; - this.xrTableCell53.Text = "[SummenPosition.BetreuteStunden13!0.00]\r\n[SummenPosition.BetragStunden13!0.00] €"; + this.xrTableCell53.Text = "[SummenPosition.BetreuteStunden13!0.00] h\r\n[SummenPosition.BetragStunden13!0.00] " + + "€"; this.xrTableCell53.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell53.Weight = 1.740149172247468D; // // xrTableCell54 // this.xrTableCell54.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell54.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell54.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); @@ -1603,14 +1835,14 @@ namespace ChristopherusHausMID this.xrTableCell54.StylePriority.UseFont = false; this.xrTableCell54.StylePriority.UsePadding = false; this.xrTableCell54.StylePriority.UseTextAlignment = false; - this.xrTableCell54.Text = "[SummenPosition.BetreuteStunden14!0.00]\r\n[SummenPosition.BetragStunden14!0.00] €"; + this.xrTableCell54.Text = "[SummenPosition.BetreuteStunden14!0.00] h\r\n[SummenPosition.BetragStunden14!0.00] " + + "€"; this.xrTableCell54.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell54.Weight = 1.7401491722474416D; // // xrTableCell55 // this.xrTableCell55.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell55.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell55.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); @@ -1624,14 +1856,14 @@ namespace ChristopherusHausMID this.xrTableCell55.StylePriority.UseFont = false; this.xrTableCell55.StylePriority.UsePadding = false; this.xrTableCell55.StylePriority.UseTextAlignment = false; - this.xrTableCell55.Text = "[SummenPosition.BetreuteStunden15!0.00]\r\n[SummenPosition.BetragStunden15!0.00] €"; + this.xrTableCell55.Text = "[SummenPosition.BetreuteStunden15!0.00] h\r\n[SummenPosition.BetragStunden15!0.00] " + + "€"; this.xrTableCell55.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell55.Weight = 1.7401491722474418D; // // xrTableCell56 // this.xrTableCell56.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell56.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell56.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); @@ -1645,7 +1877,7 @@ namespace ChristopherusHausMID this.xrTableCell56.StylePriority.UseFont = false; this.xrTableCell56.StylePriority.UsePadding = false; this.xrTableCell56.StylePriority.UseTextAlignment = false; - this.xrTableCell56.Text = "[SummenPosition.GesamtStunden!0.00]\r\n[SummenPosition.GesamtBetrag!0.00] €"; + this.xrTableCell56.Text = "[SummenPosition.GesamtStunden!0.00] h\r\n[SummenPosition.GesamtBetrag!0.00] €"; this.xrTableCell56.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell56.Weight = 2.1388971356390334D; // @@ -1663,307 +1895,6 @@ namespace ChristopherusHausMID "cePeriods].[ApprovedHours]))/Sum([ServiceInvoicePeriods].[ApprovedHours]) * 100"; this.fieldAbweichungIstSoll.Name = "fieldAbweichungIstSoll"; // - // xrTable2 - // - this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTable2.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 339.6658F); - this.xrTable2.Name = "xrTable2"; - this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow2}); - this.xrTable2.SizeF = new System.Drawing.SizeF(764.9999F, 26.54215F); - this.xrTable2.StylePriority.UseBorders = false; - this.xrTable2.StylePriority.UseFont = false; - // - // xrTableRow2 - // - this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell28, - this.xrTableCell29, - this.xrTableCell30, - this.xrTableCell31, - this.xrTableCell32, - this.xrTableCell33, - this.xrTableCell34, - this.xrTableCell35, - this.xrTableCell36, - this.xrTableCell38, - this.xrTableCell39, - this.xrTableCell40, - this.xrTableCell41, - this.xrTableCell42}); - this.xrTableRow2.Name = "xrTableRow2"; - this.xrTableRow2.Weight = 1D; - // - // xrTableCell28 - // - this.xrTableCell28.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell28.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell28.Name = "xrTableCell28"; - this.xrTableCell28.StylePriority.UseBackColor = false; - this.xrTableCell28.StylePriority.UseBorderColor = false; - this.xrTableCell28.StylePriority.UseBorders = false; - this.xrTableCell28.StylePriority.UseFont = false; - this.xrTableCell28.StylePriority.UsePadding = false; - this.xrTableCell28.StylePriority.UseTextAlignment = false; - xrSummary1.FormatString = "{0:0}"; - xrSummary1.Func = DevExpress.XtraReports.UI.SummaryFunc.RecordNumber; - xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; - this.xrTableCell28.Summary = xrSummary1; - this.xrTableCell28.Text = "1"; - this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell28.Weight = 0.8258043660348906D; - // - // xrTableCell29 - // - this.xrTableCell29.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell29.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.CustomerName")}); - this.xrTableCell29.Multiline = true; - this.xrTableCell29.Name = "xrTableCell29"; - this.xrTableCell29.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F); - this.xrTableCell29.StylePriority.UseBackColor = false; - this.xrTableCell29.StylePriority.UseBorderColor = false; - this.xrTableCell29.StylePriority.UseBorders = false; - this.xrTableCell29.StylePriority.UseFont = false; - this.xrTableCell29.StylePriority.UsePadding = false; - this.xrTableCell29.StylePriority.UseTextAlignment = false; - this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell29.Weight = 2.7391234297526954D; - // - // xrTableCell30 - // - this.xrTableCell30.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell30.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.BewilligtProWoche")}); - this.xrTableCell30.Multiline = true; - this.xrTableCell30.Name = "xrTableCell30"; - this.xrTableCell30.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); - this.xrTableCell30.StylePriority.UseBackColor = false; - this.xrTableCell30.StylePriority.UseBorderColor = false; - this.xrTableCell30.StylePriority.UseBorders = false; - this.xrTableCell30.StylePriority.UseFont = false; - this.xrTableCell30.StylePriority.UsePadding = false; - this.xrTableCell30.StylePriority.UseTextAlignment = false; - this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell30.TextFormatString = "{0:0.00} h"; - this.xrTableCell30.Weight = 1.9334924156454902D; - // - // xrTableCell31 - // - this.xrTableCell31.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell31.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.Fehltage")}); - this.xrTableCell31.Multiline = true; - this.xrTableCell31.Name = "xrTableCell31"; - this.xrTableCell31.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); - this.xrTableCell31.StylePriority.UseBackColor = false; - this.xrTableCell31.StylePriority.UseBorderColor = false; - this.xrTableCell31.StylePriority.UseBorders = false; - this.xrTableCell31.StylePriority.UseFont = false; - this.xrTableCell31.StylePriority.UsePadding = false; - this.xrTableCell31.StylePriority.UseTextAlignment = false; - this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell31.Weight = 1.2889993735091139D; - // - // xrTableCell32 - // - this.xrTableCell32.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell32.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell32.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.Rechungsanteil")}); - this.xrTableCell32.Multiline = true; - this.xrTableCell32.Name = "xrTableCell32"; - this.xrTableCell32.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); - this.xrTableCell32.StylePriority.UseBackColor = false; - this.xrTableCell32.StylePriority.UseBorderColor = false; - this.xrTableCell32.StylePriority.UseBorders = false; - this.xrTableCell32.StylePriority.UseFont = false; - this.xrTableCell32.StylePriority.UsePadding = false; - this.xrTableCell32.StylePriority.UseTextAlignment = false; - this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell32.TextFormatString = "{0:0.00}%"; - this.xrTableCell32.Weight = 1.9334990413834123D; - // - // xrTableCell33 - // - this.xrTableCell33.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell33.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell33.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.Stundensatz")}); - this.xrTableCell33.Multiline = true; - this.xrTableCell33.Name = "xrTableCell33"; - this.xrTableCell33.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); - this.xrTableCell33.StylePriority.UseBackColor = false; - this.xrTableCell33.StylePriority.UseBorderColor = false; - this.xrTableCell33.StylePriority.UseBorders = false; - this.xrTableCell33.StylePriority.UseFont = false; - this.xrTableCell33.StylePriority.UsePadding = false; - this.xrTableCell33.StylePriority.UseTextAlignment = false; - this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell33.TextFormatString = "{0:c}"; - this.xrTableCell33.Weight = 1.6112490927924212D; - // - // xrTableCell34 - // - this.xrTableCell34.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell34.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell34.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.Stunden5Prozent10")}); - this.xrTableCell34.Multiline = true; - this.xrTableCell34.Name = "xrTableCell34"; - this.xrTableCell34.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); - this.xrTableCell34.StylePriority.UseBackColor = false; - this.xrTableCell34.StylePriority.UseBorderColor = false; - this.xrTableCell34.StylePriority.UseBorders = false; - this.xrTableCell34.StylePriority.UseFont = false; - this.xrTableCell34.StylePriority.UsePadding = false; - this.xrTableCell34.StylePriority.UseTextAlignment = false; - this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell34.TextFormatString = "{0:0.00} h"; - this.xrTableCell34.Weight = 1.7401491722474813D; - // - // xrTableCell35 - // - this.xrTableCell35.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell35.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell35.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.BetreuteStunden10")}); - this.xrTableCell35.Multiline = true; - this.xrTableCell35.Name = "xrTableCell35"; - this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); - this.xrTableCell35.StylePriority.UseBackColor = false; - this.xrTableCell35.StylePriority.UseBorderColor = false; - this.xrTableCell35.StylePriority.UseBorders = false; - this.xrTableCell35.StylePriority.UseFont = false; - this.xrTableCell35.StylePriority.UsePadding = false; - this.xrTableCell35.StylePriority.UseTextAlignment = false; - this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell35.TextFormatString = "{0:0.00} h"; - this.xrTableCell35.Weight = 1.7401491722474811D; - // - // xrTableCell36 - // - this.xrTableCell36.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell36.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell36.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.BetreuteStunden11")}); - this.xrTableCell36.Multiline = true; - this.xrTableCell36.Name = "xrTableCell36"; - this.xrTableCell36.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); - this.xrTableCell36.StylePriority.UseBackColor = false; - this.xrTableCell36.StylePriority.UseBorderColor = false; - this.xrTableCell36.StylePriority.UseBorders = false; - this.xrTableCell36.StylePriority.UseFont = false; - this.xrTableCell36.StylePriority.UsePadding = false; - this.xrTableCell36.StylePriority.UseTextAlignment = false; - this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell36.TextFormatString = "{0:0.00} h"; - this.xrTableCell36.Weight = 1.740149172247468D; - // - // xrTableCell38 - // - this.xrTableCell38.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell38.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell38.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.BetreuteStunden12")}); - this.xrTableCell38.Multiline = true; - this.xrTableCell38.Name = "xrTableCell38"; - this.xrTableCell38.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); - this.xrTableCell38.StylePriority.UseBackColor = false; - this.xrTableCell38.StylePriority.UseBorderColor = false; - this.xrTableCell38.StylePriority.UseBorders = false; - this.xrTableCell38.StylePriority.UseFont = false; - this.xrTableCell38.StylePriority.UsePadding = false; - this.xrTableCell38.StylePriority.UseTextAlignment = false; - this.xrTableCell38.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell38.TextFormatString = "{0:0.00} h"; - this.xrTableCell38.Weight = 1.7401491722474685D; - // - // xrTableCell39 - // - this.xrTableCell39.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell39.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell39.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.BetreuteStunden13")}); - this.xrTableCell39.Multiline = true; - this.xrTableCell39.Name = "xrTableCell39"; - this.xrTableCell39.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); - this.xrTableCell39.StylePriority.UseBackColor = false; - this.xrTableCell39.StylePriority.UseBorderColor = false; - this.xrTableCell39.StylePriority.UseBorders = false; - this.xrTableCell39.StylePriority.UseFont = false; - this.xrTableCell39.StylePriority.UsePadding = false; - this.xrTableCell39.StylePriority.UseTextAlignment = false; - this.xrTableCell39.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell39.TextFormatString = "{0:0.00} h"; - this.xrTableCell39.Weight = 1.7401491722474678D; - // - // xrTableCell40 - // - this.xrTableCell40.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell40.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.BetreuteStunden14")}); - this.xrTableCell40.Multiline = true; - this.xrTableCell40.Name = "xrTableCell40"; - this.xrTableCell40.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); - this.xrTableCell40.StylePriority.UseBackColor = false; - this.xrTableCell40.StylePriority.UseBorderColor = false; - this.xrTableCell40.StylePriority.UseBorders = false; - this.xrTableCell40.StylePriority.UseFont = false; - this.xrTableCell40.StylePriority.UsePadding = false; - this.xrTableCell40.StylePriority.UseTextAlignment = false; - this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell40.TextFormatString = "{0:0.00} h"; - this.xrTableCell40.Weight = 1.7401491722474418D; - // - // xrTableCell41 - // - this.xrTableCell41.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell41.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell41.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.BetreuteStunden15")}); - this.xrTableCell41.Multiline = true; - this.xrTableCell41.Name = "xrTableCell41"; - this.xrTableCell41.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); - this.xrTableCell41.StylePriority.UseBackColor = false; - this.xrTableCell41.StylePriority.UseBorderColor = false; - this.xrTableCell41.StylePriority.UseBorders = false; - this.xrTableCell41.StylePriority.UseFont = false; - this.xrTableCell41.StylePriority.UsePadding = false; - this.xrTableCell41.StylePriority.UseTextAlignment = false; - this.xrTableCell41.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell41.TextFormatString = "{0:0.00} h"; - this.xrTableCell41.Weight = 1.7401491722474416D; - // - // xrTableCell42 - // - this.xrTableCell42.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell42.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainRechnungsposition.GesamtBetrag")}); - this.xrTableCell42.Multiline = true; - this.xrTableCell42.Name = "xrTableCell42"; - this.xrTableCell42.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); - this.xrTableCell42.StylePriority.UseBackColor = false; - this.xrTableCell42.StylePriority.UseBorderColor = false; - this.xrTableCell42.StylePriority.UseBorders = false; - this.xrTableCell42.StylePriority.UseFont = false; - this.xrTableCell42.StylePriority.UsePadding = false; - this.xrTableCell42.StylePriority.UseTextAlignment = false; - this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell42.TextFormatString = "{0:c} "; - this.xrTableCell42.Weight = 2.1388968897819165D; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(ChristopherusHausMID.RechnungRO); - // // Rechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1995,12 +1926,13 @@ namespace ChristopherusHausMID xrWatermark1.Id = "Watermark1"; xrWatermark1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrWatermark1.ImageSource")); xrWatermark1.ImageViewMode = DevExpress.XtraPrinting.Drawing.ImageViewMode.Zoom; + xrWatermark1.PageRange = "1"; this.Watermarks.Add(xrWatermark1); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -2024,8 +1956,6 @@ namespace ChristopherusHausMID private DevExpress.XtraReports.UI.XRLabel xrLabel5; private DevExpress.XtraReports.UI.XRLabel xrLabel6; private DevExpress.XtraReports.UI.XRLabel xrLabel8; - private DevExpress.XtraReports.UI.XRLabel lblBewilligungVom; - private DevExpress.XtraReports.UI.XRLabel xrLabel10; private DevExpress.XtraReports.UI.XRLabel xrLabel11; private DevExpress.XtraReports.UI.XRLabel lblKategorie; private DevExpress.XtraReports.UI.XRLabel xrLabel12; @@ -2093,10 +2023,10 @@ namespace ChristopherusHausMID private DevExpress.XtraReports.UI.XRLabel xrLabel20; private DevExpress.XtraReports.UI.XRLabel xrLabel15; private DevExpress.XtraReports.UI.XRLabel xrLabel14; - private DevExpress.XtraReports.UI.XRLabel xrLabel25; - private DevExpress.XtraReports.UI.XRLabel xrLabel26; - private DevExpress.XtraReports.UI.XRLabel xrLabel27; - private DevExpress.XtraReports.UI.XRLabel xrLabel28; + private DevExpress.XtraReports.UI.XRLabel lblAbrechenbareStunden; + private DevExpress.XtraReports.UI.XRLabel lblAbweichung; + private DevExpress.XtraReports.UI.XRLabel lblIstStunden; + private DevExpress.XtraReports.UI.XRLabel lblSollstunden; private DevExpress.XtraReports.UI.CalculatedField fieldAbweichungIstSoll; private DevExpress.XtraReports.UI.XRTable xrTable2; private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; @@ -2114,5 +2044,7 @@ namespace ChristopherusHausMID private DevExpress.XtraReports.UI.XRTableCell xrTableCell40; private DevExpress.XtraReports.UI.XRTableCell xrTableCell41; private DevExpress.XtraReports.UI.XRTableCell xrTableCell42; + private DevExpress.XtraReports.UI.XRLabel xrLabel9; + private DevExpress.XtraReports.UI.XRLabel xrLabel7; } } diff --git a/ReportImp/ChristopherusHausMID/Rechnung.cs b/ReportImp/ChristopherusHausMID/Rechnung.cs index 217e99de8..e2db1a356 100644 --- a/ReportImp/ChristopherusHausMID/Rechnung.cs +++ b/ReportImp/ChristopherusHausMID/Rechnung.cs @@ -22,12 +22,14 @@ namespace ChristopherusHausMID public void SetReportDataSource(ServiceInvoiceRO pRO) { + var ro = CreateRechnungsRO(pRO); SetzeAdresse(pRO); SetzeSchule(pRO); - SetzeSollIst(pRO); SetzeKategorie(pRO); - this.bindingSource1.DataSource = CreateRechnungsRO(pRO); + SetzeSollIst(ro); + + this.bindingSource1.DataSource = ro; } private RechnungRO CreateRechnungsRO(ServiceInvoiceRO pRO) @@ -48,26 +50,32 @@ namespace ChristopherusHausMID if (item.UnitDescription == "Faktor 1.0") { pos.BetreuteStunden10 = item.UnitCount ?? 0; + pos.BetragStunden10 = item.NetAmount ?? 0; } else if (item.UnitDescription == "Faktor 1.1") { pos.BetreuteStunden11 = item.UnitCount ?? 0; + pos.BetragStunden11 = item.NetAmount ?? 0; } else if (item.UnitDescription == "Faktor 1.2") { pos.BetreuteStunden12 = item.UnitCount ?? 0; + pos.BetragStunden12 = item.NetAmount ?? 0; } else if (item.UnitDescription == "Faktor 1.3") { pos.BetreuteStunden13 = item.UnitCount ?? 0; + pos.BetragStunden13 = item.NetAmount ?? 0; } else if (item.UnitDescription == "Faktor 1.4") { pos.BetreuteStunden14 = item.UnitCount ?? 0; + pos.BetragStunden14 = item.NetAmount ?? 0; } else if (item.UnitDescription == "Faktor 1.5") { pos.BetreuteStunden15 = item.UnitCount ?? 0; + pos.BetragStunden15 = item.NetAmount ?? 0; } } else @@ -138,16 +146,21 @@ namespace ChristopherusHausMID } - private void SetzeSollIst(ServiceInvoiceRO pRO) + private void SetzeSollIst(RechnungRO pRO) { - foreach (var ip in pRO.ServiceInvoicePeriods) - { + lblSollstunden.Text = String.Format("{0:0.00} h", pRO.SummenPosition.GesamtStunden); + lblIstStunden.Text = String.Format("{0:0.00} h", pRO.SummenPosition.GesamtStunden); + lblAbweichung.Text = String.Format("{0:0.0}%", 0); + lblAbrechenbareStunden.Text = String.Format("{0:0.00} h", pRO.SummenPosition.GesamtStunden); - if (ip.SupportConceptApprovalPeriod.ApprovedBEInterval == BS.Shared.SupportConceptApprovalInterval.Weekly) - continue; - if (ip.SupportConceptApprovalPeriod.ApprovedBEInterval == BS.Shared.SupportConceptApprovalInterval.Monthly) - ip.SupportConceptApprovalPeriod.ApprovedBEPerInterval /= 4.34m; - } + //foreach (var ip in pRO.ServiceInvoicePeriods) + //{ + + // if (ip.SupportConceptApprovalPeriod.ApprovedBEInterval == BS.Shared.SupportConceptApprovalInterval.Weekly) + // continue; + // if (ip.SupportConceptApprovalPeriod.ApprovedBEInterval == BS.Shared.SupportConceptApprovalInterval.Monthly) + // ip.SupportConceptApprovalPeriod.ApprovedBEPerInterval /= 4.34m; + //} } private void SetzeKategorie(ServiceInvoiceRO pRO) diff --git a/ReportImp/ChristopherusHausMID/Service/CustomOperationService.cs b/ReportImp/ChristopherusHausMID/Service/CustomOperationService.cs index 2a665029e..32ae23934 100644 --- a/ReportImp/ChristopherusHausMID/Service/CustomOperationService.cs +++ b/ReportImp/ChristopherusHausMID/Service/CustomOperationService.cs @@ -17,15 +17,16 @@ namespace ChristopherusHausMID.Service public class CustomOperationService : OperationService { private ServiceDescription leistungSchulbegleitung; - + private VacationService vacationService; + protected override bool CreateServiceRecordsIfAnyExistInDateRange { get { return true; } } //public override ServiceRecord CreateServiceRecord(ArbeitszeitEintrag ae, DateTime datum, CostBearer2SupportConcept c2s, ServiceDescription defaultSd) //{ - + // var sr = base.CreateServiceRecord(ae, datum, c2s, defaultSd); - + // return sr; //} @@ -37,6 +38,28 @@ namespace ChristopherusHausMID.Service // b.Entry.Value.Contains("Hauptbetreuung")))?.Employee; //} + private VacationService GetVacationService() + { + if (vacationService == null) + { + vacationService = PluginLoader.FindClass(); + } + + return vacationService; + } + + protected override IList CreateServiceRecords(Arbeitszeit arbeitszeit, DateTime datum, CostBearer2SupportConcept c2s, ServiceDescription defaultSd, List existingList) + { + var ferien = GetVacationService().GetFerien(datum, "nrw"); + + if (ferien == null) + { + return base.CreateServiceRecords(arbeitszeit, datum, c2s, defaultSd, existingList); + } + + return new List(); + } + public override ServiceDescription GetDefaultServiceDescription(CostBearer2SupportConcept c2s) { if (leistungSchulbegleitung == null) diff --git a/ReportImp/VkmAachenSbd/CustomReportCreator.cs b/ReportImp/VkmAachenSbd/CustomReportCreator.cs index 7bc2c8360..8d157119f 100644 --- a/ReportImp/VkmAachenSbd/CustomReportCreator.cs +++ b/ReportImp/VkmAachenSbd/CustomReportCreator.cs @@ -476,7 +476,7 @@ namespace VkmAachenSbd if (pCustomerOid > 0) { c = DAOFactory.GenericDAO.LoadByID(pCustomerOid); - resultList.AddRange(SbdStundenaufstellungRO.Create(c, pSpan, orgaOid, empOid, serviceCategoryOid, disableEmptySupportConcepts, false, "nrw")); + resultList.AddRange(SbdStundenaufstellungRO.Create(c, pSpan, orgaOid, empOid, serviceCategoryOid, disableEmptySupportConcepts, false, "nrw", true)); } else if (empOid > 0) { @@ -488,7 +488,7 @@ namespace VkmAachenSbd { if (v2o.Entry != null && v2o.Entry.Type == ValueListEntryType.StaffRoleType && !v2o.Entry.Value.ToLower().Contains("ehemalig") && e2c.Customer.IsActive == ActivationTypeId.Active) { - resultList.AddRange(SbdStundenaufstellungRO.Create(e2c.Customer, pSpan, orgaOid, empOid, serviceCategoryOid, disableEmptySupportConcepts, false, "nrw")); + resultList.AddRange(SbdStundenaufstellungRO.Create(e2c.Customer, pSpan, orgaOid, empOid, serviceCategoryOid, disableEmptySupportConcepts, false, "nrw", true)); } } diff --git a/ReportImp/WahlEv/Invoicing/InvoiceCreationNachStunden.cs b/ReportImp/WahlEv/Invoicing/InvoiceCreationNachStunden.cs index 4c9afbc5e..e65391404 100644 --- a/ReportImp/WahlEv/Invoicing/InvoiceCreationNachStunden.cs +++ b/ReportImp/WahlEv/Invoicing/InvoiceCreationNachStunden.cs @@ -54,10 +54,14 @@ namespace WahlEv.Invoicing leistungsabrechnungUnitCount += ip.InvoiceItemList.Sum(i => i.UnitCount.Value); // Pauschale Sonderzahlung, die für alle gleich ist, die die Funktion "Kostenträger" haben - var pitem = CreateSonderZahlungPauschal(costBearer, leistungsabrechnungUnitCount); - if (pitem != null) + //CB, siehe https://tool.bewoplaner.de/support_edit.php?Refresh=1&SupportOID=122600 + if (invoicePeriod.StartDate < new DateTime(2024, 12, 21)) { - sip.InvoiceItemList.Add(pitem); + var pitem = CreateSonderZahlungPauschal(costBearer, leistungsabrechnungUnitCount); + if (pitem != null) + { + sip.InvoiceItemList.Add(pitem); + } } // Fahrtkostenpauschale, die individuell als Varfield beim Klienten eingetragen wird (oid 1) var customer = DAOFactory.GenericDAO.LoadByID(supportConcept.Customer.CustomerOid); @@ -67,12 +71,15 @@ namespace WahlEv.Invoicing sip.InvoiceItemList.Add(fitem); } // Weitere pauschale Sonderzahlung, die individuell als Varfield beim Klienten eingetragen wird (oid 2) - var sitem = CreateSonderzahlungInvoiceItem(customer); - if (sitem != null) + //CB, siehe https://tool.bewoplaner.de/support_edit.php?Refresh=1&SupportOID=122600 + if (invoicePeriod.StartDate < new DateTime(2024, 12, 21)) { - sip.InvoiceItemList.Add(sitem); + var sitem = CreateSonderzahlungInvoiceItem(customer); + if (sitem != null) + { + sip.InvoiceItemList.Add(sitem); + } } - SetServiceInvoicePeriodAmounts(inv); } return inv; diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index e820e0ce2..1f6e755e9 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -47,7 +47,7 @@ namespace BeWo.Service.Plugins //t = "2301474784"; // Hauskrankenpflege Leiendecker //t = "8243565510"; // Der Karren //t = "7709306800"; // Der Karren SBD - t = "2499262621"; // HPH Bersenbrück + //t = "2499262621"; // HPH Bersenbrück //t = "4950382346"; // Holsinger //t = "5973016645"; // Verein Lebensgestaltung Hanau //t = "7375324044"; // Diakonie KK Kleve