diff --git a/ReportImp/NovaSelbstbestimmtLebenUG/Quittierungsbeleg.cs b/ReportImp/NovaSelbstbestimmtLebenUG/Quittierungsbeleg.cs index 9b5e180c8..3654b9f95 100644 --- a/ReportImp/NovaSelbstbestimmtLebenUG/Quittierungsbeleg.cs +++ b/ReportImp/NovaSelbstbestimmtLebenUG/Quittierungsbeleg.cs @@ -33,8 +33,14 @@ namespace NovaSelbstbestimmtLebenUG var cr = pRO.CostBearer2SupportConceptList[0].CostBearer.CostRatePeriods.Where(p => p.CostRateType == CostRatePeriodType.MinutesPerServiceUnit).OrderBy(c => c.EndDate).ToList(); var currentFLSUnit = cr.FirstOrDefault(c => c.EndDate >= pRO.EndDate); - if (currentFLSUnit == null) + if (currentFLSUnit != null) currentFLSUnit = cr[0]; + else + currentFLSUnit = new BeWo.Data.Entities.CostRatePeriod() + { + CostRateType = CostRatePeriodType.MinutesPerServiceUnit, + CostRateValue = 60 + }; if (pRO.Services != null) { diff --git a/ReportImp/NovaSelbstbestimmtLebenUG/ServiceInvoiceReport.Designer.cs b/ReportImp/NovaSelbstbestimmtLebenUG/ServiceInvoiceReport.Designer.cs index 8769bc8c8..935fac3b0 100644 --- a/ReportImp/NovaSelbstbestimmtLebenUG/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/NovaSelbstbestimmtLebenUG/ServiceInvoiceReport.Designer.cs @@ -37,6 +37,9 @@ namespace BeWo.Report.DefaultReports this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); @@ -93,9 +96,9 @@ namespace BeWo.Report.DefaultReports this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); @@ -127,7 +130,7 @@ namespace BeWo.Report.DefaultReports // this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrPictureBox3}); - this.topMarginBand1.HeightF = 157.5F; + this.topMarginBand1.HeightF = 157.5001F; this.topMarginBand1.Name = "topMarginBand1"; // // xrPictureBox3 @@ -140,9 +143,56 @@ namespace BeWo.Report.DefaultReports // // bottomMarginBand1 // - this.bottomMarginBand1.HeightF = 50F; + this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel6, + this.xrLabel7, + this.xrLabel12}); + this.bottomMarginBand1.HeightF = 120.4999F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // + // xrLabel6 + // + this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Verdana", 8F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(546.875F, 21.45831F); + this.xrLabel6.Multiline = true; + this.xrLabel6.Name = "xrLabel6"; + this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel6.SizeF = new System.Drawing.SizeF(183.125F, 70.45834F); + this.xrLabel6.StylePriority.UseFont = false; + this.xrLabel6.StylePriority.UseTextAlignment = false; + this.xrLabel6.Text = "Bankverbindung:\r\nNova Selbstbestimmt Leben UG\r\nLandessparkasse zu Oldenburg\r\nDE52" + + " 2805 0100 0095 9964 27"; + this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrLabel7 + // + this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Verdana", 8F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 21.45831F); + 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(207.625F, 70.45834F); + this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.StylePriority.UseTextAlignment = false; + this.xrLabel7.Text = "Nova \"Selbstbestimmt Leben\" UG\r\n(haftungsbeschränkt)\r\nAdelheider Straße 24a\r\n2775" + + "5 Delmenhorst\r\nwww.nova-del.de"; + this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrLabel12 + // + this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Verdana", 8F); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(220.125F, 21.45831F); + this.xrLabel12.Multiline = true; + this.xrLabel12.Name = "xrLabel12"; + this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel12.SizeF = new System.Drawing.SizeF(326.75F, 70.45834F); + this.xrLabel12.StylePriority.UseFont = false; + this.xrLabel12.StylePriority.UseTextAlignment = false; + this.xrLabel12.Text = "Registereintrag:\r\nEintragung im Handelsregister\r\nRegistergericht: Amtsgericht Old" + + "enburg\r\nRegisternummer: HRB 221927\r\nGeschäftsführer: Eric Lehmann, Christine Fah" + + "nenstiel"; + this.xrLabel12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -813,6 +863,18 @@ namespace BeWo.Report.DefaultReports this.xrLabel15}); this.GroupFooter1.HeightF = 261.6667F; this.GroupFooter1.Name = "GroupFooter1"; + // + // xrLabel5 + // + this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 41.20833F); + this.xrLabel5.Multiline = true; + this.xrLabel5.Name = "xrLabel5"; + this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel5.SizeF = new System.Drawing.SizeF(677.0001F, 39.91668F); + this.xrLabel5.StylePriority.UseFont = false; + this.xrLabel5.Text = "Bitte überweisen Sie den offenen Betrag an unser Konto mit der IBAN:\r\nDE52 2805 0" + + "100 0095 9964 27"; // // xrLabel1 // @@ -832,18 +894,6 @@ namespace BeWo.Report.DefaultReports // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); - // - // xrLabel5 - // - this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 41.20833F); - this.xrLabel5.Multiline = true; - this.xrLabel5.Name = "xrLabel5"; - this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel5.SizeF = new System.Drawing.SizeF(677.0001F, 39.91668F); - this.xrLabel5.StylePriority.UseFont = false; - this.xrLabel5.Text = "Bitte überweisen Sie den offenen Betrag an unser Konto mit der IBAN:\r\nDE52 2805 0" + - "100 0095 9964 27"; // // ServiceInvoiceReport // @@ -859,7 +909,7 @@ namespace BeWo.Report.DefaultReports this.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 157.5F, 50F); + this.Margins = new DevExpress.Drawing.DXMargins(53F, 39F, 157.5001F, 120.4999F); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; @@ -941,5 +991,8 @@ namespace BeWo.Report.DefaultReports private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox3; private DevExpress.XtraReports.UI.XRLabel xrLabel5; + private DevExpress.XtraReports.UI.XRLabel xrLabel6; + private DevExpress.XtraReports.UI.XRLabel xrLabel7; + private DevExpress.XtraReports.UI.XRLabel xrLabel12; } } diff --git a/ReportImp/NovaSelbstbestimmtLebenUG/SettlementReport2.Designer.cs b/ReportImp/NovaSelbstbestimmtLebenUG/SettlementReport2.Designer.cs index 640f787e5..6ece18ef3 100644 --- a/ReportImp/NovaSelbstbestimmtLebenUG/SettlementReport2.Designer.cs +++ b/ReportImp/NovaSelbstbestimmtLebenUG/SettlementReport2.Designer.cs @@ -90,6 +90,7 @@ namespace BeWo.Report.DefaultReports this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.fieldApprovedFLSWithFactor = new DevExpress.XtraReports.UI.CalculatedField(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); @@ -106,6 +107,7 @@ namespace BeWo.Report.DefaultReports this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow31 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -124,15 +126,15 @@ namespace BeWo.Report.DefaultReports this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -682,12 +684,28 @@ namespace BeWo.Report.DefaultReports // bottomMarginBand1 // this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel12, + this.xrLabel7, this.xrLabel5}); this.bottomMarginBand1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.bottomMarginBand1.HeightF = 90.4583F; + this.bottomMarginBand1.HeightF = 126.4582F; this.bottomMarginBand1.Name = "bottomMarginBand1"; this.bottomMarginBand1.StylePriority.UseFont = false; // + // xrLabel5 + // + this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Verdana", 8F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(521.7913F, 9.999974F); + this.xrLabel5.Multiline = true; + this.xrLabel5.Name = "xrLabel5"; + this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel5.SizeF = new System.Drawing.SizeF(208.2087F, 70.45834F); + this.xrLabel5.StylePriority.UseFont = false; + this.xrLabel5.StylePriority.UseTextAlignment = false; + this.xrLabel5.Text = "[Mandator.Name]\r\n[Mandator.BankAccount.BankName]\r\n[Mandator.BankAccount.IBAN]\r\n[M" + + "andator.BankAccount.Bic]"; + this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -882,6 +900,10 @@ namespace BeWo.Report.DefaultReports this.xrTableCell7.StylePriority.UsePadding = false; this.xrTableCell7.Weight = 3D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); + // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -1082,22 +1104,34 @@ namespace BeWo.Report.DefaultReports this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell60.Weight = 0.16397432767427886D; // - // xrLabel5 + // xrLabel7 // - this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Verdana", 9F); - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 31.79156F); - this.xrLabel5.Name = "xrLabel5"; - this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel5.SizeF = new System.Drawing.SizeF(678F, 17F); - this.xrLabel5.StylePriority.UseFont = false; - this.xrLabel5.StylePriority.UseTextAlignment = false; - this.xrLabel5.Text = "[Mandator.BankAccount.BankName] • [Mandator.BankAccount.IBAN] • [Mandator.BankAcc" + - "ount.Bic]"; - this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Verdana", 8F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 9.999974F); + 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(207.625F, 70.45834F); + this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.StylePriority.UseTextAlignment = false; + this.xrLabel7.Text = "Nova \"Selbstbestimmt Leben\" UG\r\n(haftungsbeschränkt)\r\nAdelheider Straße 24a\r\n2775" + + "5 Delmenhorst\r\nwww.nova-del.de"; + this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // - // bindingSource1 + // xrLabel12 // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); + this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Verdana", 8F); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(207.625F, 9.999974F); + this.xrLabel12.Multiline = true; + this.xrLabel12.Name = "xrLabel12"; + this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel12.SizeF = new System.Drawing.SizeF(314.1663F, 70.45834F); + this.xrLabel12.StylePriority.UseFont = false; + this.xrLabel12.StylePriority.UseTextAlignment = false; + this.xrLabel12.Text = "Registereintrag:\r\nEintragung im Handelsregister\r\nRegistergericht: Amtsgericht Old" + + "enburg\r\nRegisternummer: HRB 221927\r\nGeschäftsführer: Eric Lehmann, Christine Fah" + + "nenstiel"; + this.xrLabel12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // // Spitzabrechnung // @@ -1116,7 +1150,7 @@ namespace BeWo.Report.DefaultReports this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new DevExpress.Drawing.DXMargins(75F, 74F, 100F, 90.4583F); + this.Margins = new DevExpress.Drawing.DXMargins(50F, 47F, 100F, 126.4582F); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; @@ -1128,8 +1162,8 @@ namespace BeWo.Report.DefaultReports ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1229,5 +1263,7 @@ namespace BeWo.Report.DefaultReports private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox3; private DevExpress.XtraReports.UI.XRLabel xrLabel5; + private DevExpress.XtraReports.UI.XRLabel xrLabel7; + private DevExpress.XtraReports.UI.XRLabel xrLabel12; } } \ No newline at end of file