diff --git a/ReportImp/SprungbrettReports/BudgetnachweisSeite2.Designer.cs b/ReportImp/SprungbrettReports/BudgetnachweisSeite2.Designer.cs index 01174eb55..d655367ca 100644 --- a/ReportImp/SprungbrettReports/BudgetnachweisSeite2.Designer.cs +++ b/ReportImp/SprungbrettReports/BudgetnachweisSeite2.Designer.cs @@ -543,8 +543,8 @@ namespace BeWo.SprungbrettReports this.xrLabel18, this.xrRichText15}); this.ReportFooter.HeightF = 307F; + this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; - this.ReportFooter.PrintAtBottom = true; // // xrLabel16 // diff --git a/ReportImp/SprungbrettReports/CustomReportCreator.cs b/ReportImp/SprungbrettReports/CustomReportCreator.cs index d1d7bd486..b9f3497bb 100644 --- a/ReportImp/SprungbrettReports/CustomReportCreator.cs +++ b/ReportImp/SprungbrettReports/CustomReportCreator.cs @@ -56,12 +56,6 @@ namespace BeWo.SprungbrettReports } else { - //IBeWoReport lSettlementReport = FindReportImp(reportId); - //var ro = SettlementRO.Create(lSettlementDC); - //lSettlementReport.SetReportDataSource(ro); - - //report = lSettlementReport as XtraReport; - //IBeWoReport lSettlementReport = new Budgetnachweis(); var ro = new Budgetnachweis(); ro.SetReportDataSource(SettlementRO.Create(lSettlementDC)); ro.CreateDocument(); @@ -71,6 +65,5 @@ namespace BeWo.SprungbrettReports return report; } - //return base.CreateSettlementReport(dcId, invoiceBaseOid, true); } } diff --git a/ReportImp/SprungbrettTheresia/BudgetnachweisSeite2.Designer.cs b/ReportImp/SprungbrettTheresia/BudgetnachweisSeite2.Designer.cs index 8e4ec4ff0..329d393f6 100644 --- a/ReportImp/SprungbrettTheresia/BudgetnachweisSeite2.Designer.cs +++ b/ReportImp/SprungbrettTheresia/BudgetnachweisSeite2.Designer.cs @@ -137,7 +137,6 @@ namespace BeWo.SprungbrettTheresia this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail2 = new DevExpress.XtraReports.UI.DetailBand(); this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); @@ -145,14 +144,15 @@ namespace BeWo.SprungbrettTheresia this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText15)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -496,8 +496,8 @@ namespace BeWo.SprungbrettTheresia this.xrLabel18, this.xrRichText15}); this.ReportFooter.HeightF = 307F; + this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; - this.ReportFooter.PrintAtBottom = true; // // xrLabel16 // @@ -1443,10 +1443,6 @@ namespace BeWo.SprungbrettTheresia this.xrLabel1.SizeF = new System.Drawing.SizeF(267F, 16F); this.xrLabel1.StylePriority.UseFont = false; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); - // // DetailReport1 // this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1524,7 +1520,11 @@ namespace BeWo.SprungbrettTheresia this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell5.Weight = 0.298590117231564D; // - // SpitzabrechnungSeite2 + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); + // + // BudgetnachweisSeite2 // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { this.Detail, @@ -1560,8 +1560,8 @@ namespace BeWo.SprungbrettTheresia ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } diff --git a/ReportImp/SprungbrettTheresia/CustomReportCreator.cs b/ReportImp/SprungbrettTheresia/CustomReportCreator.cs index a5635dae5..39d9e1f40 100644 --- a/ReportImp/SprungbrettTheresia/CustomReportCreator.cs +++ b/ReportImp/SprungbrettTheresia/CustomReportCreator.cs @@ -56,21 +56,12 @@ namespace BeWo.SprungbrettTheresia } else { - //IBeWoReport lSettlementReport = FindReportImp(reportId); - //var ro = SettlementRO.Create(lSettlementDC); - //lSettlementReport.SetReportDataSource(ro); - - //report = lSettlementReport as XtraReport; - //IBeWoReport lSettlementReport = new Budgetnachweis(); var ro = new Budgetnachweis(); ro.SetReportDataSource(SettlementRO.Create(lSettlementDC)); ro.CreateDocument(); report = ro as XtraReport; } - - return report; } - //return base.CreateSettlementReport(dcId, invoiceBaseOid, true); } }