ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MH: BeWo Schilling Summen auf Spitzabrechnung

Browse Source 
SupportOID=168541
This commit is contained in:
HirschleM
2026-07-20 10:20:58 +02:00
parent 8769f32bfb
commit 0371bae325
6 changed files with 66 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ReportImp/BeWoSchillingReports/SettlementReport.Designer.cs generated
View File

@@ -522,7 +522,7 @@ namespace BeWo.BeWoSchillingReports.Alt
this.xrTableCell12.StylePriority.UseBorders = false;
this.xrTableCell12.StylePriority.UseFont = false;
this.xrTableCell12.StylePriority.UsePadding = false;
this.xrTableCell12.Text = "Gesamtforderung:";
this.xrTableCell12.Text = "Gesamtforderung ([RecordedFLSTotal!0.00] FLS inkl. Faktor):";
this.xrTableCell12.Weight = 0.78314100999098546D;
//
// xrTableCell9
@@ -954,6 +954,8 @@ namespace BeWo.BeWoSchillingReports.Alt
this.topMarginBand1,
this.bottomMarginBand1,
this.GroupHeader1});
this.ComponentStorage.AddRange(new System.ComponentModel.IComponent[] {
this.bindingSource1});
this.DataSource = this.bindingSource1;
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {

3
ReportImp/BeWoSchillingReports/SettlementReport.cs
View File

@@ -74,8 +74,9 @@ namespace BeWo.BeWoSchillingReports.Alt
pRO.Betrag3 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatzAktuell * (decimal)pRO.RateFactor * pRO.HourlyRateNew);
}
pRO.RecordedFLSTotal *= Convert.ToDouble(pRO.RateFactor);
this.bindingSource1.DataSource = pRO;
}
}

2
ReportImp/BeWoSchillingReports/SettlementReport.resx
View File

File diff suppressed because one or more lines are too long

62
ReportImp/BeWoSchillingReports/SettlementReport2.Designer.cs generated
View File

@@ -112,6 +112,9 @@ namespace Bewo.BeWoSchillingReports
this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrRichText6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText7)).BeginInit();
@@ -248,11 +251,12 @@ namespace Bewo.BeWoSchillingReports
// xrTable1
//
this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 226.3749F);
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 227.9164F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow3,
this.rowErbrachteLeistung});
this.xrTable1.SizeF = new System.Drawing.SizeF(650F, 17F);
this.xrTable1.SizeF = new System.Drawing.SizeF(650F, 34F);
this.xrTable1.StylePriority.UseBorderColor = false;
//
// rowErbrachteLeistung
@@ -287,7 +291,7 @@ namespace Bewo.BeWoSchillingReports
//
this.xrLabel6.BackColor = System.Drawing.Color.Transparent;
this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 10F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 151.3749F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 148.9167F);
this.xrLabel6.Multiline = true;
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -412,7 +416,7 @@ namespace Bewo.BeWoSchillingReports
this.xrTableRow21.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell18});
this.xrTableRow21.Name = "xrTableRow21";
this.xrTableRow21.Weight = 0.19835969864444109D;
this.xrTableRow21.Weight = 0.19835969864444108D;
//
// xrTableCell18
//
@@ -585,7 +589,7 @@ namespace Bewo.BeWoSchillingReports
this.xrTable1,
this.xrLabel8});
this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.GroupHeader1.HeightF = 243.3749F;
this.GroupHeader1.HeightF = 261.9164F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
@@ -797,7 +801,7 @@ namespace Bewo.BeWoSchillingReports
this.xrTableCell49.StylePriority.UseBorders = false;
this.xrTableCell49.StylePriority.UseFont = false;
this.xrTableCell49.StylePriority.UsePadding = false;
this.xrTableCell49.Text = "Gesamtforderung:";
this.xrTableCell49.Text = "Gesamtforderung ([RecordedFLS!0.00] FLS inkl. Faktor):";
this.xrTableCell49.Weight = 0.78314100999098546D;
//
// xrTableCell50
@@ -964,6 +968,49 @@ namespace Bewo.BeWoSchillingReports
this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell60.Weight = 0.21685899000901443D;
//
// xrTableRow3
//
this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell3,
this.xrTableCell4});
this.xrTableRow3.Name = "xrTableRow3";
this.xrTableRow3.Weight = 0.085D;
//
// xrTableCell3
//
this.xrTableCell3.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 10F);
this.xrTableCell3.Multiline = true;
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell3.StylePriority.UseBorderColor = false;
this.xrTableCell3.StylePriority.UseBorders = false;
this.xrTableCell3.StylePriority.UseFont = false;
this.xrTableCell3.Text = "Ingesamt bewilligt:";
this.xrTableCell3.Weight = 0.78314091609074521D;
//
// xrTableCell4
//
this.xrTableCell4.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLS")});
this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 10F);
this.xrTableCell4.Multiline = true;
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell4.StylePriority.UseBorderColor = false;
this.xrTableCell4.StylePriority.UseBorders = false;
this.xrTableCell4.StylePriority.UseFont = false;
this.xrTableCell4.StylePriority.UseTextAlignment = false;
this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell4.Weight = 0.21685908390925479D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
@@ -1093,5 +1140,8 @@ namespace Bewo.BeWoSchillingReports
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow10;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
}
}

3
ReportImp/BeWoSchillingReports/SettlementReport2.cs
View File

@@ -44,6 +44,9 @@ namespace Bewo.BeWoSchillingReports
}
}
pRO.RecordedFLS *= Convert.ToDecimal(pRO.RateFactor);
pRO.RateFactor = (double)rateFactor;
this.bindingSource1.DataSource = pRO;

2
ReportImp/BeWoSchillingReports/SettlementReport2.resx
View File

File diff suppressed because one or more lines are too long