PROgymnasiumBensberg/SettlementReport2 - Entfall Zeile abgerechnete Stunden

This commit is contained in:
2026-01-15 15:15:49 +01:00
parent 464edaa254
commit 1b41d7588b
3 changed files with 147 additions and 174 deletions

View File

@@ -70,12 +70,22 @@ namespace PROgymnasiumBensberg
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
this.lblPlusMinusFLS = new DevExpress.XtraReports.UI.XRLabel(); this.lblPlusMinusFLS = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel();
this.lblVergFLS = new DevExpress.XtraReports.UI.XRLabel();
this.lblGelFLS = new DevExpress.XtraReports.UI.XRLabel(); this.lblGelFLS = new DevExpress.XtraReports.UI.XRLabel();
this.lblBewFLS = new DevExpress.XtraReports.UI.XRLabel(); this.lblBewFLS = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
@@ -95,6 +105,7 @@ namespace PROgymnasiumBensberg
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -121,26 +132,13 @@ namespace PROgymnasiumBensberg
this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
// //
// Detail // Detail
@@ -179,7 +177,7 @@ namespace PROgymnasiumBensberg
// xrTable1 // xrTable1
// //
this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight; this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 411.5834F); this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(3.178914E-05F, 401.1667F);
this.xrTable1.Name = "xrTable1"; this.xrTable1.Name = "xrTable1";
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.rowErbrachteLeistung}); this.rowErbrachteLeistung});
@@ -281,7 +279,7 @@ namespace PROgymnasiumBensberg
// //
this.xrLabel6.BackColor = System.Drawing.Color.Transparent; this.xrLabel6.BackColor = System.Drawing.Color.Transparent;
this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 344.5834F); this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(3.178914E-05F, 334.1667F);
this.xrLabel6.Multiline = true; this.xrLabel6.Multiline = true;
this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -293,7 +291,7 @@ namespace PROgymnasiumBensberg
// xrLabel5 // xrLabel5
// //
this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(4.768372E-05F, 316.2916F); this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(6.357829E-05F, 305.8749F);
this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F); this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F);
@@ -517,10 +515,8 @@ namespace PROgymnasiumBensberg
this.xrLabel17, this.xrLabel17,
this.lblPlusMinusFLS, this.lblPlusMinusFLS,
this.xrLabel19, this.xrLabel19,
this.lblVergFLS,
this.lblGelFLS, this.lblGelFLS,
this.lblBewFLS, this.lblBewFLS,
this.xrLabel15,
this.xrLabel14, this.xrLabel14,
this.xrLabel13, this.xrLabel13,
this.xrLabel9, this.xrLabel9,
@@ -533,10 +529,123 @@ namespace PROgymnasiumBensberg
this.xrLabel6, this.xrLabel6,
this.xrTable1}); this.xrTable1});
this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.GroupHeader1.HeightF = 438.1667F; this.GroupHeader1.HeightF = 427.75F;
this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false; this.GroupHeader1.StylePriority.UseFont = false;
// //
// xrTable5
//
this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable5.Name = "xrTable5";
this.xrTable5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F);
this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow6,
this.xrTableRow8,
this.xrTableRow10,
this.xrTableRow11,
this.xrTableRow12});
this.xrTable5.SizeF = new System.Drawing.SizeF(353.4583F, 85F);
//
// xrTableRow6
//
this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell33});
this.xrTableRow6.Name = "xrTableRow6";
this.xrTableRow6.Weight = 1D;
//
// xrTableCell33
//
this.xrTableCell33.CanShrink = true;
this.xrTableCell33.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecipientOrganisation")});
this.xrTableCell33.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrTableCell33.Multiline = true;
this.xrTableCell33.Name = "xrTableCell33";
this.xrTableCell33.StylePriority.UseFont = false;
this.xrTableCell33.Weight = 1D;
//
// xrTableRow8
//
this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell38});
this.xrTableRow8.Name = "xrTableRow8";
this.xrTableRow8.Weight = 1D;
//
// xrTableCell38
//
this.xrTableCell38.CanShrink = true;
this.xrTableCell38.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecipientDivision")});
this.xrTableCell38.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrTableCell38.Multiline = true;
this.xrTableCell38.Name = "xrTableCell38";
this.xrTableCell38.StylePriority.UseFont = false;
this.xrTableCell38.Weight = 1D;
//
// xrTableRow10
//
this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell39});
this.xrTableRow10.Name = "xrTableRow10";
this.xrTableRow10.Weight = 1D;
//
// xrTableCell39
//
this.xrTableCell39.CanShrink = true;
this.xrTableCell39.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecipientPostBox")});
this.xrTableCell39.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrTableCell39.Multiline = true;
this.xrTableCell39.Name = "xrTableCell39";
this.xrTableCell39.StylePriority.UseFont = false;
this.xrTableCell39.Weight = 1D;
//
// xrTableRow11
//
this.xrTableRow11.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell40});
this.xrTableRow11.Name = "xrTableRow11";
this.xrTableRow11.Weight = 1D;
//
// xrTableCell40
//
this.xrTableCell40.CanShrink = true;
this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecipientStreet")});
this.xrTableCell40.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrTableCell40.Multiline = true;
this.xrTableCell40.Name = "xrTableCell40";
this.xrTableCell40.StylePriority.UseFont = false;
this.xrTableCell40.Weight = 1D;
//
// xrTableRow12
//
this.xrTableRow12.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell41});
this.xrTableRow12.Name = "xrTableRow12";
this.xrTableRow12.Weight = 1D;
//
// xrTableCell41
//
this.xrTableCell41.CanShrink = true;
this.xrTableCell41.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecipientPostCodeAndTown")});
this.xrTableCell41.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrTableCell41.Multiline = true;
this.xrTableCell41.Name = "xrTableCell41";
this.xrTableCell41.StylePriority.UseFont = false;
this.xrTableCell41.Weight = 1D;
//
// xrLabel17
//
this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 123.9167F);
this.xrLabel17.Name = "xrLabel17";
this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel17.SizeF = new System.Drawing.SizeF(317F, 17F);
this.xrLabel17.StylePriority.UseFont = false;
this.xrLabel17.Text = "Datum: [InvoiceDate!dd.MM.yyyy]";
//
// lblPlusMinusFLS // lblPlusMinusFLS
// //
this.lblPlusMinusFLS.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.lblPlusMinusFLS.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
@@ -556,15 +665,6 @@ namespace PROgymnasiumBensberg
this.xrLabel19.StylePriority.UseFont = false; this.xrLabel19.StylePriority.UseFont = false;
this.xrLabel19.Text = "Plus/Minus"; this.xrLabel19.Text = "Plus/Minus";
// //
// lblVergFLS
//
this.lblVergFLS.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.lblVergFLS.LocationFloat = new DevExpress.Utils.PointFloat(194.0833F, 283.25F);
this.lblVergFLS.Name = "lblVergFLS";
this.lblVergFLS.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblVergFLS.SizeF = new System.Drawing.SizeF(97.91666F, 17F);
this.lblVergFLS.StylePriority.UseFont = false;
//
// lblGelFLS // lblGelFLS
// //
this.lblGelFLS.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.lblGelFLS.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
@@ -585,16 +685,6 @@ namespace PROgymnasiumBensberg
this.lblBewFLS.SizeF = new System.Drawing.SizeF(97.91666F, 17F); this.lblBewFLS.SizeF = new System.Drawing.SizeF(97.91666F, 17F);
this.lblBewFLS.StylePriority.UseFont = false; this.lblBewFLS.StylePriority.UseFont = false;
// //
// xrLabel15
//
this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 283.25F);
this.xrLabel15.Name = "xrLabel15";
this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel15.SizeF = new System.Drawing.SizeF(194.0834F, 17F);
this.xrLabel15.StylePriority.UseFont = false;
this.xrLabel15.Text = "Vergütete Fachleistungsstd.:";
//
// xrLabel14 // xrLabel14
// //
this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
@@ -824,6 +914,10 @@ namespace PROgymnasiumBensberg
this.GroupHeader2.Name = "GroupHeader2"; this.GroupHeader2.Name = "GroupHeader2";
this.GroupHeader2.StylePriority.UseBorderColor = false; this.GroupHeader2.StylePriority.UseBorderColor = false;
// //
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
//
// GroupFooter1 // GroupFooter1
// //
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -1191,123 +1285,6 @@ namespace PROgymnasiumBensberg
this.xrTableCell37.TextFormatString = "{0:C}"; this.xrTableCell37.TextFormatString = "{0:C}";
this.xrTableCell37.Weight = 0.927359893258694D; this.xrTableCell37.Weight = 0.927359893258694D;
// //
// xrLabel17
//
this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 123.9167F);
this.xrLabel17.Name = "xrLabel17";
this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel17.SizeF = new System.Drawing.SizeF(317F, 17F);
this.xrLabel17.StylePriority.UseFont = false;
this.xrLabel17.Text = "Datum: [InvoiceDate!dd.MM.yyyy]";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
//
// xrTable5
//
this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable5.Name = "xrTable5";
this.xrTable5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F);
this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow6,
this.xrTableRow8,
this.xrTableRow10,
this.xrTableRow11,
this.xrTableRow12});
this.xrTable5.SizeF = new System.Drawing.SizeF(353.4583F, 85F);
//
// xrTableRow6
//
this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell33});
this.xrTableRow6.Name = "xrTableRow6";
this.xrTableRow6.Weight = 1D;
//
// xrTableCell33
//
this.xrTableCell33.CanShrink = true;
this.xrTableCell33.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecipientOrganisation")});
this.xrTableCell33.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrTableCell33.Multiline = true;
this.xrTableCell33.Name = "xrTableCell33";
this.xrTableCell33.StylePriority.UseFont = false;
this.xrTableCell33.Weight = 1D;
//
// xrTableRow8
//
this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell38});
this.xrTableRow8.Name = "xrTableRow8";
this.xrTableRow8.Weight = 1D;
//
// xrTableCell38
//
this.xrTableCell38.CanShrink = true;
this.xrTableCell38.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecipientDivision")});
this.xrTableCell38.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrTableCell38.Multiline = true;
this.xrTableCell38.Name = "xrTableCell38";
this.xrTableCell38.StylePriority.UseFont = false;
this.xrTableCell38.Weight = 1D;
//
// xrTableRow10
//
this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell39});
this.xrTableRow10.Name = "xrTableRow10";
this.xrTableRow10.Weight = 1D;
//
// xrTableCell39
//
this.xrTableCell39.CanShrink = true;
this.xrTableCell39.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecipientPostBox")});
this.xrTableCell39.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrTableCell39.Multiline = true;
this.xrTableCell39.Name = "xrTableCell39";
this.xrTableCell39.StylePriority.UseFont = false;
this.xrTableCell39.Weight = 1D;
//
// xrTableRow11
//
this.xrTableRow11.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell40});
this.xrTableRow11.Name = "xrTableRow11";
this.xrTableRow11.Weight = 1D;
//
// xrTableCell40
//
this.xrTableCell40.CanShrink = true;
this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecipientStreet")});
this.xrTableCell40.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrTableCell40.Multiline = true;
this.xrTableCell40.Name = "xrTableCell40";
this.xrTableCell40.StylePriority.UseFont = false;
this.xrTableCell40.Weight = 1D;
//
// xrTableRow12
//
this.xrTableRow12.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell41});
this.xrTableRow12.Name = "xrTableRow12";
this.xrTableRow12.Weight = 1D;
//
// xrTableCell41
//
this.xrTableCell41.CanShrink = true;
this.xrTableCell41.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecipientPostCodeAndTown")});
this.xrTableCell41.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrTableCell41.Multiline = true;
this.xrTableCell41.Name = "xrTableCell41";
this.xrTableCell41.StylePriority.UseFont = false;
this.xrTableCell41.Weight = 1D;
//
// Spitzabrechnung // Spitzabrechnung
// //
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1335,10 +1312,10 @@ namespace PROgymnasiumBensberg
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
} }
@@ -1390,10 +1367,8 @@ namespace PROgymnasiumBensberg
private DevExpress.XtraReports.UI.XRLabel xrLabel4; private DevExpress.XtraReports.UI.XRLabel xrLabel4;
private DevExpress.XtraReports.UI.XRLabel xrLabel9; private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRLabel xrLabel13; private DevExpress.XtraReports.UI.XRLabel xrLabel13;
private DevExpress.XtraReports.UI.XRLabel xrLabel15;
private DevExpress.XtraReports.UI.XRLabel xrLabel14; private DevExpress.XtraReports.UI.XRLabel xrLabel14;
private DevExpress.XtraReports.UI.XRLabel lblBewFLS; private DevExpress.XtraReports.UI.XRLabel lblBewFLS;
private DevExpress.XtraReports.UI.XRLabel lblVergFLS;
private DevExpress.XtraReports.UI.XRLabel lblGelFLS; private DevExpress.XtraReports.UI.XRLabel lblGelFLS;
private DevExpress.XtraReports.UI.XRLabel xrLabel19; private DevExpress.XtraReports.UI.XRLabel xrLabel19;
private DevExpress.XtraReports.UI.XRLabel lblPlusMinusFLS; private DevExpress.XtraReports.UI.XRLabel lblPlusMinusFLS;

View File

@@ -26,7 +26,7 @@ namespace PROgymnasiumBensberg
decimal rateFactor = 1; decimal rateFactor = 1;
decimal geleistetGesamt = 0; decimal geleistetGesamt = 0;
decimal verguetetGesamt = 0; //decimal verguetetGesamt = 0; AB, 14.01.2026: auf Wunsch von Frau Weyer wieder entfernt
foreach (var ii in pRO.InvoiceItems) foreach (var ii in pRO.InvoiceItems)
{ {
if (ii.RateFactor.HasValue) if (ii.RateFactor.HasValue)
@@ -39,22 +39,20 @@ namespace PROgymnasiumBensberg
if (ii.ItemDescription != null && ii.ItemDescription.Contains("Fehlkontakte")) if (ii.ItemDescription != null && ii.ItemDescription.Contains("Fehlkontakte"))
{ {
ii.AbrechnungsText += " (Fehlkontakte)"; ii.AbrechnungsText += " (Fehlkontakte)";
geleistetGesamt += ii.UnitCount.Value / 80 * 100; // geleistetGesamt += ii.UnitCount.Value / 80 * 100; - das ist falsch, es wird ja schon seit geraumer Zeit der Preis reduziert nicht, die Zeit
verguetetGesamt += ii.UnitCount.Value; //verguetetGesamt += ii.UnitCount.Value;
} }
else else
{ {
geleistetGesamt += ii.UnitCount.Value; //verguetetGesamt += ii.UnitCount.Value * rateFactor;
verguetetGesamt += ii.UnitCount.Value * rateFactor;
} }
geleistetGesamt += ii.UnitCount.Value;
} }
pRO.RateFactor = (double)rateFactor; pRO.RateFactor = (double)rateFactor;
lblGelFLS.Text = string.Format("{0:0.00} FLS", geleistetGesamt); lblGelFLS.Text = string.Format("{0:0.00} FLS", geleistetGesamt);
lblVergFLS.Text = string.Format("{0:0.00} FLS", verguetetGesamt); //lblVergFLS.Text = string.Format("{0:0.00} FLS", verguetetGesamt);
lblPlusMinusFLS.Text = string.Format("{0:0.00} FLS", pRO.ApprovedFLSTotal - geleistetGesamt); lblPlusMinusFLS.Text = string.Format("{0:0.00} FLS", pRO.ApprovedFLSTotal - geleistetGesamt);
lblRestanspruchOderRueckzahlung.Text = pRO.Claim >= 0 ? "Restanspruch" : "Rückzahlung"; lblRestanspruchOderRueckzahlung.Text = pRO.Claim >= 0 ? "Restanspruch" : "Rückzahlung";
this.bindingSource1.DataSource = pRO; this.bindingSource1.DataSource = pRO;

File diff suppressed because one or more lines are too long