From 62d8a4a56c48917565fd5cf84596cffc5e63cee7 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Wed, 17 Aug 2022 13:13:31 +0200 Subject: [PATCH] PerspektivenEV DatevExporter und VSDHammReports/ServicesOverviewReport --- .../PerspektivenEV/CollectiveBillingReport.cs | 2 +- .../PerspektivenEV/Export/DatevExporter.cs | 123 +++--------------- .../PerspektivenEV/InvoiceCustomerReport.cs | 2 +- .../Invoicing/CollectiveInvoiceCreation.cs | 4 +- .../SelbstzahlerInvoiceReport.cs | 2 +- .../PerspektivenEV/ServiceInvoiceReport.cs | 2 +- .../ServicesOverviewReport.Designer.cs | 59 ++++----- 7 files changed, 55 insertions(+), 139 deletions(-) diff --git a/ReportImp/PerspektivenEV/CollectiveBillingReport.cs b/ReportImp/PerspektivenEV/CollectiveBillingReport.cs index 025b9648c..cae0c40e1 100644 --- a/ReportImp/PerspektivenEV/CollectiveBillingReport.cs +++ b/ReportImp/PerspektivenEV/CollectiveBillingReport.cs @@ -63,7 +63,7 @@ namespace PerspektivenEV } //Sonderlösung um im Notice-Feld bei Bedarf Teilzahlungen anzeigen zu können - if (pRO.Notice.Length > 0 || pRO.Notice != null) + if (!String.IsNullOrEmpty(pRO.Notice)) { int index = 0; index = pRO.Notice.IndexOf("\r\n"); diff --git a/ReportImp/PerspektivenEV/Export/DatevExporter.cs b/ReportImp/PerspektivenEV/Export/DatevExporter.cs index dc36b3d62..1ecae049a 100644 --- a/ReportImp/PerspektivenEV/Export/DatevExporter.cs +++ b/ReportImp/PerspektivenEV/Export/DatevExporter.cs @@ -29,12 +29,9 @@ namespace PerspektivenEV.Export { StringBuilder sb = new StringBuilder(); - //sb.AppendLine("Datum;Konto;Gegenkonto;Buchungstext;Belegfeld1;Umsatz Soll;Kostenstelle"); - //Kontonummer; Umsatz; Gegenkonto; Belegdatum; Kost 1; Belegfeld 1; Buchungstext; Festschreibung - sb.AppendLine("Kontonummer;Umsatz;Gegenkonto;Belegdatum;Kost1;Belegfeld1;Buchungstext;Festschreibung"); - var s = GetMonatlicheRechnungenString(date); + var s = GetMonatlicheRechnungenString(date); if (!String.IsNullOrWhiteSpace(s)) sb.Append(s); @@ -85,40 +82,34 @@ namespace PerspektivenEV.Export String isApproved = ""; if (row[8] != null) - { orgaName = row[8].ToString(); - } + if (row[9] != null ) - { itemDescription = row[9].ToString(); - } + if (row[10] != null) - { unitDescription = row[10].ToString(); - } + if (row[12] != null) - { isApproved = row[12].ToString(); - } if (sb.Length > 0) - { sb.AppendLine(); - } + DateTime lastDate = new DateTime(date.Year, date.Month, 1); lastDate = lastDate.AddMonths(1).AddDays(-1); - sb.Append(String.Format("{0}", row[1])); //Debitornr. als Kontonummer noch offen!? + sb.Append(String.Format("{0}", row[1])); //Debitornr. als Kontonummer sb.Append(";"); sb.Append(String.Format("{0:0.00}", row[15])); //Umsatz - der Rechnungsposition sb.Append(";"); var gegenkto = GetErloeskonto(itemDescription, unitDescription, orgaName, isApproved); - sb.Append(gegenkto); //Gegenkonto + sb.Append(gegenkto); //Gegenkonto - Auffang/Fehlerkonto 999999 sb.Append(";"); sb.Append(String.Format("{0:ddMM}", lastDate)); sb.Append(";"); var kostenstelle = GetKostenstelle(itemDescription, unitDescription, orgaName); - sb.Append(kostenstelle); //Kostenstelle + sb.Append(kostenstelle); //Kostenstelle - Auffang/Fehlerkostenstelle 999 sb.Append(";"); sb.Append(String.Format("{0}", row[3])); sb.Append(";"); @@ -128,15 +119,12 @@ namespace PerspektivenEV.Export if (c2sOid.HasValue) { var c2s = DAOFactory.GenericDAO.LoadByID(c2sOid.Value); - var c = c2s.SupportConcept.Customer; buchungstext = String.Format("{0}, {1}, {2:dd}/{2:MM}", c.Person.LastName, c.Person.FirstName, lastDate); } sb.Append(buchungstext); sb.Append(";"); - //noch löschen nur zur Kontrolle - sb.Append(String.Format("{0:0.00}", row[0])); //Umsatz } return sb.ToString(); @@ -144,9 +132,8 @@ namespace PerspektivenEV.Export public static String GetMonatlicheRechnungLWVString(DateTime date) { - /* - 0 sip.Claim, + 0 sip.Claim, 1 c.DebitorNumber, 2 ib.InvoiceDate, 3 ib.invoicenumber, @@ -169,7 +156,6 @@ namespace PerspektivenEV.Export var sql = GetMonatlicheRechnungPositionenLWVSql(date); var dt = ExecuteQuery(sql, date); - StringBuilder sb = new StringBuilder(); foreach (DataRow row in dt.Rows) { @@ -181,13 +167,10 @@ namespace PerspektivenEV.Export SupportConceptApprovalPeriod approvalPeriod; if (row[8] != null) - { orgaName = row[8].ToString(); - } + if (row[9] != null) - { itemDescription = row[9].ToString(); - } if (row[11] != null) { @@ -195,30 +178,29 @@ namespace PerspektivenEV.Export approvalPeriod = DAOFactory.GenericDAO.LoadByID(scApprovalPeriodOid); unitDescription = approvalPeriod.ServiceCategory.Name; row[1] = approvalPeriod.CostBearer2SupportConcept.SupportConcept.Customer.DebitorNumber; - if (approvalPeriod.CostBearer2SupportConcept.SupportConcept.ApprovalDate.HasValue) + if (approvalPeriod.CostBearer2SupportConcept.ApprovedStartDate.HasValue) isApproved = "true"; else isApproved = "false"; } if (sb.Length > 0) - { sb.AppendLine(); - } + DateTime lastDate = new DateTime(date.Year, date.Month, 1); lastDate = lastDate.AddMonths(1).AddDays(-1); - sb.Append(String.Format("{0}", row[1])); //Debitornr. als Kontonummer noch offen!? + sb.Append(String.Format("{0}", row[1])); //Debitornr. als Kontonummer sb.Append(";"); sb.Append(String.Format("{0:0.00}", row[15])); //Umsatz - der Rechnungsposition sb.Append(";"); var gegenkto = GetErloeskonto(itemDescription, unitDescription, orgaName, isApproved); - sb.Append(gegenkto); //Gegenkonto + sb.Append(gegenkto); //Gegenkonto - Auffang/Fehlerkonto 999999 sb.Append(";"); sb.Append(String.Format("{0:ddMM}", lastDate)); sb.Append(";"); var kostenstelle = GetKostenstelle(itemDescription, unitDescription, orgaName); - sb.Append(kostenstelle); //Kostenstelle + sb.Append(kostenstelle); //Kostenstelle - Auffang/Fehlerkostenstelle 999 sb.Append(";"); sb.Append(String.Format("{0}", row[3])); sb.Append(";"); @@ -226,8 +208,7 @@ namespace PerspektivenEV.Export buchungstext = String.Format("{0} {1:dd}/{1:MM}", itemDescription, lastDate); sb.Append(buchungstext); sb.Append(";"); - //noch löschen nur zur Kontrolle - sb.Append(String.Format("{0:0.00}", row[0])); //Umsatz + } return sb.ToString(); @@ -238,7 +219,7 @@ namespace PerspektivenEV.Export if (itemDesc.Contains("Handgeld")) return "496101"; - else if (orgaName == "Selbstzahler") + else if (orgaName == "SELBSTZAHLER") { if (unitDesc.Contains("FLS BW")) return "495805"; @@ -369,38 +350,6 @@ namespace PerspektivenEV.Export return sql; } - //public static String GetMonatlicheBetraegeLWVString(DateTime date) - //{ - // // Betrag, c.DebitorNumber, c.CostCenter, CONCAT(p.`LastName`, ', ', p.`FirstName`) as 'Verwendung', cb2sc.Oid - // var sql = GetMonatlicheBetraegeLWVSql(date); - // var dt = ExecuteQuery(sql, date); - - // StringBuilder sb = new StringBuilder(); - // foreach (DataRow row in dt.Rows) - // { - // if (sb.Length > 0) - // { - // sb.AppendLine(); - // } - // DateTime lastDate = new DateTime(date.Year, date.Month, 1); - // lastDate = lastDate.AddMonths(1).AddDays(-1); - // //Kontonummer; Umsatz; Gegenkonto; Belegdatum; Kost 1; Belegfeld 1; Buchungstext; Festschreibung - - // sb.Append(String.Format("{0}", row[1])); //DebitorNumber - // sb.Append(";LWV;"); //Kostenträger - // sb.Append(String.Format("{0};", row[3])); //Verwendung - Klient - // sb.Append(String.Format("{0:0.00}", row[0])); //Betrag - // sb.Append(";495800;"); //Erlöskonto - // sb.Append(String.Format("{0:ddMM}", lastDate)); - // sb.Append(";150;"); //Kostenstelle fest - // sb.Append(String.Format("{0:MM yy}", date)); //RNR - // sb.Append(String.Format(";{0} {1:MM/yyyy}", row[3], date)); //Verwendung - Klient - // sb.Append(";0;;;;;"); - // } - - // return sb.ToString(); - //} - private static String GetMonatlicheRechnungPositionenLWVSql(DateTime date) { @@ -435,43 +384,7 @@ namespace PerspektivenEV.Export return sql; } - //private static String GetMonatlicheBetraegeLWVSql(DateTime date) - //{ - // String sql = @" - // SELECT - // IF(crpRateFactor.`CostRateValue` is null, ROUND((sr.`GeleisteteFLM` / 60) * (SELECT crp.`CostRateValue` FROM `costrateperiod` crp WHERE crp.`ObjectTid` = 22 AND crp.`CostRateType` = 0 AND crp.`ObjectOid` = cb2sc.`CostBearerOid` AND (crp.`EndDate` is null or crp.`EndDate` > ':Monat_Start') order by IF(crp.`EndDate` is null, MAKEDATE(9999,365),crp.`EndDate`) LIMIT 1 )), - // ROUND(ROUND((sr.`GeleisteteFLM` / 60), 2) * (SELECT crp.`CostRateValue` FROM `costrateperiod` crp WHERE crp.`ObjectTid` = 22 AND crp.`CostRateType` = 0 AND crp.`ObjectOid` = cb2sc.`CostBearerOid` AND (crp.`EndDate` is null or crp.`EndDate` > ':Monat_Start') order by IF(crp.`EndDate` is null, MAKEDATE(9999,365),crp.`EndDate`) LIMIT 1 ) * ((100 + crpRateFactor.`CostRateValue`)/100), 2)) AS 'Betrag', - // c.DebitorNumber, - // c.CostCenter, - // CONCAT(p.`LastName`, ', ', p.`FirstName`) as 'Verwendung', - // cb2sc.Oid, - // crp.`CostRateValue` - // FROM `supportconcept` sc - // INNER JOIN `costbearer2supportconcept` cb2sc ON sc.`Oid` = cb2sc.`SupportConceptOid` - // INNER JOIN `costbearer` cb ON cb2sc.`CostBearerOid` = cb.`Oid` - // LEFT JOIN - // (SELECT crp.`ObjectOid`, crp.`CostRateValue` FROM `costrateperiod` crp - // WHERE crp.`ObjectTid` = 22 AND crp.`CostRateType` = 2 AND (crp.`EndDate` is null or crp.`EndDate` > NOW())) - // AS crpRateFactor ON crpRateFactor.`ObjectOid` = cb.`Oid` - // INNER JOIN `organisation` org ON org.`CostBearerOid` = cb.`Oid` - // INNER JOIN `customer` c ON sc.`CustomerOid` = c.`Oid` - // INNER JOIN `person` p on c.`PersonOid` = p.`Oid` - // LEFT JOIN - // (SELECT sr2.`CostBearer2SupportConceptOid`, SUM(sr2.`roundedduration` / IF(sr2.`GroupEmployeeCount` is null, 1, sr2.`GroupEmployeeCount`)) AS GeleisteteFLM FROM `servicerecord` sr2 - // INNER JOIN `servicedescription` sd ON sr2.`ServiceDescriptionOid` = sd.`Oid` - // INNER JOIN `servicecategory` sc ON sd.`ServiceCategoryOid` = sc.`Oid` - // WHERE sr2.`StartDate` >= ':Monat_Start' AND sr2.`StartDate` < ':Monat_End' AND sc.`Billable` = 1 GROUP BY sr2.`CostBearer2SupportConceptOid`) - // AS sr ON sr.`CostBearer2SupportConceptOid` = cb2sc.`Oid` - // WHERE c.`IsActive` = 1 AND sc.`IsActive` = 1 - // and (sr.`GeleisteteFLM` is not null) - // and org.Name = 'LWV Hessen' - // ORDER BY p.`LastName`, p.`FirstName`, cb2sc.`ApprovedStartDate` - // "; - - // return sql; - //} - - public static DataTable ExecuteQuery(String sql, DateTime dt) + public static DataTable ExecuteQuery(String sql, DateTime dt) { var newsql = sql; newsql = newsql.Replace(":Abrechnungsmonat", String.Format("{0:dd.MM.yyyy}", dt)); diff --git a/ReportImp/PerspektivenEV/InvoiceCustomerReport.cs b/ReportImp/PerspektivenEV/InvoiceCustomerReport.cs index 08ad877c7..5f6e1a8ce 100644 --- a/ReportImp/PerspektivenEV/InvoiceCustomerReport.cs +++ b/ReportImp/PerspektivenEV/InvoiceCustomerReport.cs @@ -53,7 +53,7 @@ namespace PerspektivenEV //Sonderlösung um im Notice-Feld bei Bedarf Teilzahlungen anzeigen zu können int index = 0; - if (pRO.Notice.Length > 0 || pRO.Notice != null) + if (!String.IsNullOrEmpty(pRO.Notice)) { index = pRO.Notice.IndexOf("\r\n"); if (index == 0) diff --git a/ReportImp/PerspektivenEV/Invoicing/CollectiveInvoiceCreation.cs b/ReportImp/PerspektivenEV/Invoicing/CollectiveInvoiceCreation.cs index d00e35aa2..c50c60107 100644 --- a/ReportImp/PerspektivenEV/Invoicing/CollectiveInvoiceCreation.cs +++ b/ReportImp/PerspektivenEV/Invoicing/CollectiveInvoiceCreation.cs @@ -82,8 +82,10 @@ namespace PerspektivenEV.Invoicing { if (ap.EndDate >= invoicePeriod.StartDateTime && ap.StartDate <= invoicePeriod.EndDate && ap.ServiceCategory != null) { - String key = ap.ServiceCategory.Name; + if (ap.ServiceCategory.Name.Contains("Tagesstätte")) + ap.ServiceCategory.Name = "Tagesstätte"; + String key = ap.ServiceCategory.Name; if (!cat2Daten.ContainsKey(key)) { cat2Daten.Add(key, new List()); diff --git a/ReportImp/PerspektivenEV/SelbstzahlerInvoiceReport.cs b/ReportImp/PerspektivenEV/SelbstzahlerInvoiceReport.cs index d6b246215..f3c84e5f5 100644 --- a/ReportImp/PerspektivenEV/SelbstzahlerInvoiceReport.cs +++ b/ReportImp/PerspektivenEV/SelbstzahlerInvoiceReport.cs @@ -86,7 +86,7 @@ namespace PerspektivenEV } //Sonderlösung um im Notice-Feld bei Bedarf Teilzahlungen anzeigen zu können - if (pRO.Notice.Length > 0 || pRO.Notice != null) + if (!String.IsNullOrEmpty(pRO.Notice)) { int index = 0; index = pRO.Notice.IndexOf("\r\n"); diff --git a/ReportImp/PerspektivenEV/ServiceInvoiceReport.cs b/ReportImp/PerspektivenEV/ServiceInvoiceReport.cs index 0bd5a6f71..3b265def4 100644 --- a/ReportImp/PerspektivenEV/ServiceInvoiceReport.cs +++ b/ReportImp/PerspektivenEV/ServiceInvoiceReport.cs @@ -86,7 +86,7 @@ namespace PerspektivenEV //Sonderlösung um im Notice-Feld bei Bedarf Teilzahlungen anzeigen zu können int index = 0; - if (pRO.Notice.Length > 0 || pRO.Notice != null) + if (!String.IsNullOrEmpty(pRO.Notice)) { index = pRO.Notice.IndexOf("\r\n"); if (index == 0) diff --git a/ReportImp/VSDHammReports/ServicesOverviewReport.Designer.cs b/ReportImp/VSDHammReports/ServicesOverviewReport.Designer.cs index 0928c1988..4baf8fda4 100644 --- a/ReportImp/VSDHammReports/ServicesOverviewReport.Designer.cs +++ b/ReportImp/VSDHammReports/ServicesOverviewReport.Designer.cs @@ -67,6 +67,7 @@ namespace VSDHammReports this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.lblExtraFLS = new DevExpress.XtraReports.UI.XRLabel(); this.lblYear = new DevExpress.XtraReports.UI.XRLabel(); this.lblYear2 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); @@ -89,7 +90,6 @@ namespace VSDHammReports this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); - this.lblExtraFLS = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -151,8 +151,7 @@ namespace VSDHammReports // // xrTableCell4 // - this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); this.xrTableCell4.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrTableCell4.Multiline = true; this.xrTableCell4.Name = "xrTableCell4"; @@ -161,7 +160,7 @@ namespace VSDHammReports this.xrTableCell4.StylePriority.UseTextAlignment = false; this.xrTableCell4.Text = "Uhrzeit\r\nvon ... bis"; this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell4.Weight = 0.17922586813419494D; + this.xrTableCell4.Weight = 0.15992460045810764D; // // xrTableCell11 // @@ -174,7 +173,7 @@ namespace VSDHammReports this.xrTableCell11.StylePriority.UseTextAlignment = false; this.xrTableCell11.Text = "Anzahl Minuten"; this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell11.Weight = 0.12407945172461825D; + this.xrTableCell11.Weight = 0.10460579889752718D; // // xrTableCell10 // @@ -185,7 +184,7 @@ namespace VSDHammReports this.xrTableCell10.StylePriority.UseTextAlignment = false; this.xrTableCell10.Text = "Mitarbeiter/in"; this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell10.Weight = 0.16543926069244525D; + this.xrTableCell10.Weight = 0.16543929224747928D; // // xrTableCell14 // @@ -196,7 +195,7 @@ namespace VSDHammReports this.xrTableCell14.StylePriority.UseTextAlignment = false; this.xrTableCell14.Text = "Leistungsart"; this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell14.Weight = 0.16543924828244064D; + this.xrTableCell14.Weight = 0.20421413723058499D; // // xrTableCell9 // @@ -270,7 +269,7 @@ namespace VSDHammReports // // xrTableCell7 // - this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell7.Borders = DevExpress.XtraPrinting.BorderSide.Top; this.xrTableCell7.Font = new System.Drawing.Font("Arial", 9.75F); this.xrTableCell7.Name = "xrTableCell7"; this.xrTableCell7.StylePriority.UseBorders = false; @@ -278,11 +277,12 @@ namespace VSDHammReports this.xrTableCell7.StylePriority.UseTextAlignment = false; this.xrTableCell7.Text = "[TimeRangeString]"; this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell7.Weight = 0.506548791696817D; + this.xrTableCell7.Weight = 0.45199738466069844D; // // xrTableCell5 // - this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); this.xrTableCell5.Font = new System.Drawing.Font("Arial", 9.75F); this.xrTableCell5.Name = "xrTableCell5"; this.xrTableCell5.StylePriority.UseBorders = false; @@ -290,7 +290,7 @@ namespace VSDHammReports this.xrTableCell5.StylePriority.UseTextAlignment = false; this.xrTableCell5.Text = "[Minutes]"; this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell5.Weight = 0.3506875335899623D; + this.xrTableCell5.Weight = 0.29564903069143506D; // // xrTableCell12 // @@ -304,7 +304,7 @@ namespace VSDHammReports this.xrTableCell12.StylePriority.UseTextAlignment = false; this.xrTableCell12.Text = "xrTableCell12"; this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell12.Weight = 0.46758374182241208D; + this.xrTableCell12.Weight = 0.46758347426899355D; // // xrTableCell15 // @@ -314,9 +314,8 @@ namespace VSDHammReports this.xrTableCell15.Name = "xrTableCell15"; this.xrTableCell15.StylePriority.UseBorders = false; this.xrTableCell15.StylePriority.UseTextAlignment = false; - this.xrTableCell15.Text = "xrTableCell15"; this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell15.Weight = 0.4675834116264016D; + this.xrTableCell15.Weight = 0.57717358911446581D; // // xrTableCell6 // @@ -391,8 +390,10 @@ namespace VSDHammReports this.xrLabel3, this.xrLabel4}); this.Detail2.HeightF = 173.9583F; + this.Detail2.KeepTogether = true; this.Detail2.Name = "Detail2"; this.Detail2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.Detail2.PageBreak = DevExpress.XtraReports.UI.PageBreak.BeforeBandExceptFirstEntry; this.Detail2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // // xrTable2 @@ -424,7 +425,7 @@ namespace VSDHammReports this.xrTableCell8.StylePriority.UseTextAlignment = false; this.xrTableCell8.Text = "Summe"; this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell8.Weight = 0.89230516859989528D; + this.xrTableCell8.Weight = 0.84164981293591612D; // // summeMinuten // @@ -441,7 +442,7 @@ namespace VSDHammReports this.summeMinuten.StylePriority.UseFont = false; this.summeMinuten.StylePriority.UseTextAlignment = false; this.summeMinuten.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.summeMinuten.Weight = 0.354583529784733D; + this.summeMinuten.Weight = 0.29564908998873107D; // // xrTableCell13 // @@ -452,7 +453,7 @@ namespace VSDHammReports this.xrTableCell13.StylePriority.UseFont = false; this.xrTableCell13.StylePriority.UseTextAlignment = false; this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell13.Weight = 1.5780945190219602D; + this.xrTableCell13.Weight = 1.6876843144819413D; // // xrLabel14 // @@ -575,6 +576,18 @@ namespace VSDHammReports this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; // + // lblExtraFLS + // + this.lblExtraFLS.LocationFloat = new DevExpress.Utils.PointFloat(378.5417F, 158.7083F); + this.lblExtraFLS.Multiline = true; + this.lblExtraFLS.Name = "lblExtraFLS"; + this.lblExtraFLS.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblExtraFLS.SizeF = new System.Drawing.SizeF(346.4583F, 24.08336F); + this.lblExtraFLS.StylePriority.UseFont = false; + this.lblExtraFLS.StylePriority.UseTextAlignment = false; + this.lblExtraFLS.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.lblExtraFLS.Visible = false; + // // lblYear // this.lblYear.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); @@ -817,18 +830,6 @@ namespace VSDHammReports this.bottomMarginBand1.HeightF = 30F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // - // lblExtraFLS - // - this.lblExtraFLS.LocationFloat = new DevExpress.Utils.PointFloat(378.5417F, 158.7083F); - this.lblExtraFLS.Multiline = true; - this.lblExtraFLS.Name = "lblExtraFLS"; - this.lblExtraFLS.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblExtraFLS.SizeF = new System.Drawing.SizeF(346.4583F, 24.08336F); - this.lblExtraFLS.StylePriority.UseFont = false; - this.lblExtraFLS.StylePriority.UseTextAlignment = false; - this.lblExtraFLS.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.lblExtraFLS.Visible = false; - // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);