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

MH: AdikKleve Layout Spitzabrechnung

Browse Source
This commit is contained in:
HirschleM
2026-07-10 08:57:19 +02:00
parent c8199f2530
commit 802b6f8c98
7 changed files with 123 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ReportImp/AdikKleve/Invoicing/CustomInvoiceFactory.cs
View File

@@ -9,7 +9,10 @@ namespace AdikKleve.Invoicing
{
public class CustomInvoiceFactory : InvoiceFactory
{
// public override SettlementInvoiceCreation CreateSettlementInvoiceCreator(string costbearerId, string tenant, CostBearer2SupportConcept lCb2Sc)
// {
//return new CustomSettlementInvoiceCreation();
// }
public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
{

52
ReportImp/AdikKleve/SettlementReport.Designer.cs generated
View File

@@ -30,6 +30,7 @@ namespace AdikKleve.Alt
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung));
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
@@ -102,13 +103,12 @@ namespace AdikKleve.Alt
this.xrTableRow15 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow30 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow31 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell();
this.tcGesamtGeleistet = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow32 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -123,12 +123,13 @@ namespace AdikKleve.Alt
this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -274,7 +275,7 @@ namespace AdikKleve.Alt
this.xrLabel4.SizeF = new System.Drawing.SizeF(650F, 17F);
this.xrLabel4.StylePriority.UseBackColor = false;
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.Text = "[CustomerReferenceNumberAndDate]";
this.xrLabel4.Text = "[CustomerReferenceNumberAndDate],";
this.xrLabel4.WordWrap = false;
//
// xrLabel3
@@ -325,7 +326,7 @@ namespace AdikKleve.Alt
this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell4});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Weight = 0.13245033112582783D;
this.xrTableRow2.Weight = 0.13245033112582782D;
//
// xrTableCell4
//
@@ -344,7 +345,7 @@ namespace AdikKleve.Alt
this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell13});
this.xrTableRow5.Name = "xrTableRow5";
this.xrTableRow5.Weight = 0.13245033112582783D;
this.xrTableRow5.Weight = 0.13245033112582782D;
//
// xrTableCell13
//
@@ -363,7 +364,7 @@ namespace AdikKleve.Alt
this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell11});
this.xrTableRow4.Name = "xrTableRow4";
this.xrTableRow4.Weight = 0.13245033112582783D;
this.xrTableRow4.Weight = 0.13245033112582782D;
//
// xrTableCell11
//
@@ -382,7 +383,7 @@ namespace AdikKleve.Alt
this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell8});
this.xrTableRow3.Name = "xrTableRow3";
this.xrTableRow3.Weight = 0.13245033112582783D;
this.xrTableRow3.Weight = 0.13245033112582782D;
//
// xrTableCell8
//
@@ -401,7 +402,7 @@ namespace AdikKleve.Alt
this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell1});
this.xrTableRow1.Name = "xrTableRow1";
this.xrTableRow1.Weight = 0.13245033112582783D;
this.xrTableRow1.Weight = 0.13245033112582782D;
//
// xrTableCell1
//
@@ -858,10 +859,6 @@ namespace AdikKleve.Alt
this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell23.Weight = 0.21685899000901443D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -908,21 +905,20 @@ namespace AdikKleve.Alt
// xrTableRow31
//
this.xrTableRow31.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell49,
this.tcGesamtGeleistet,
this.xrTableCell50});
this.xrTableRow31.Name = "xrTableRow31";
this.xrTableRow31.Weight = 0.085D;
//
// xrTableCell49
// tcGesamtGeleistet
//
this.xrTableCell49.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell49.Name = "xrTableCell49";
this.xrTableCell49.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell49.StylePriority.UseBorders = false;
this.xrTableCell49.StylePriority.UseFont = false;
this.xrTableCell49.StylePriority.UsePadding = false;
this.xrTableCell49.Text = "Gesamtforderung:";
this.xrTableCell49.Weight = 0.78314100999098546D;
this.tcGesamtGeleistet.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.tcGesamtGeleistet.Name = "tcGesamtGeleistet";
this.tcGesamtGeleistet.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.tcGesamtGeleistet.StylePriority.UseBorders = false;
this.tcGesamtGeleistet.StylePriority.UseFont = false;
this.tcGesamtGeleistet.StylePriority.UsePadding = false;
this.tcGesamtGeleistet.Weight = 0.78314100999098546D;
//
// xrTableCell50
//
@@ -1077,6 +1073,10 @@ namespace AdikKleve.Alt
this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell58.Weight = 0.21685899000901443D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
//
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1096,12 +1096,14 @@ namespace AdikKleve.Alt
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "23.2";
xrWatermark1.Id = "Watermark1";
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -1163,7 +1165,7 @@ namespace AdikKleve.Alt
private DevExpress.XtraReports.UI.XRTableRow xrTableRow30;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell48;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow31;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell49;
private DevExpress.XtraReports.UI.XRTableCell tcGesamtGeleistet;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell50;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow32;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell51;

76
ReportImp/AdikKleve/SettlementReport.cs
View File

@@ -1,12 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared;
using BS.Shared.DataContracts;
using DevExpress.CodeParser;
using System;
using System.Collections.Generic;
using System.Linq;
namespace AdikKleve.Alt
{
@@ -45,13 +46,22 @@ namespace AdikKleve.Alt
isDefaultSpitzabrechnung = true;
}
}
var summeFLS = 0m;
if (isDefaultSpitzabrechnung)
if (isDefaultSpitzabrechnung)
{
//UpdateAbrechnungsFelder(pRO);
pRO.InvoiceItems = CreateDefaultSpitzabrechnungInvoiceItems(pRO);
}
if (pRO.InvoiceItems != null)
{
foreach (var ii in pRO.InvoiceItems)
{
summeFLS += ii.UnitCount.Value * ii.RateFactor.Value;
}
}
}
else
{
if (pRO.InvoiceItems != null)
@@ -62,8 +72,11 @@ namespace AdikKleve.Alt
ii.ItemPeriodStart, ii.ItemPeriodEnd,
ii.UnitCount, ii.RateFactor == 0 ? "" : "x " + pRO.RateFactorText2 + " ",
ii.AmountPerUnit);
}
}
summeFLS += ii.UnitCount.Value * ii.RateFactor.Value;
}
}
var id = GetCustomerId(pRO);
if (id == "LWLNEU")
{
@@ -71,6 +84,9 @@ namespace AdikKleve.Alt
pRO.RateFactorText2 = null;
}
}
tcGesamtGeleistet.Text = string.Format("Gesamtforderung für {0:0.00} FLS:", summeFLS);
SetFaxNrAndAnsprechpartner(pRO);
this.bindingSource1.DataSource = pRO;
@@ -89,11 +105,13 @@ namespace AdikKleve.Alt
{
itemList.Add(new InvoiceItemDC
{
ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS {3}x {4:c}",
pRO.AccountingStartDateString, pRO.HourlyRate3EndDateString,
ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS {3}x {4:c}",
pRO.AccountingStartDateString, pRO.HourlyRate3EndDateString,
pRO.GeleisteteFLSMitStundensatz3, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRate3),
GrossAmountTotal = pRO.GeleisteteFLSMitStundensatz3 * pRO.RateFactor * pRO.HourlyRate3
GrossAmountTotal = pRO.GeleisteteFLSMitStundensatz3 * pRO.RateFactor * pRO.HourlyRate3,
UnitCount = pRO.GeleisteteFLSMitStundensatz3,
RateFactor = pRO.RateFactor
});
itemList.Add(new InvoiceItemDC
@@ -102,8 +120,10 @@ namespace AdikKleve.Alt
pRO.HourlyRateOldStartDateString, pRO.HourlyRateOldEndDateString,
pRO.GeleisteteFLSMitStundensatzAlt, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateOld),
GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAlt * pRO.RateFactor * pRO.HourlyRateOld
});
GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAlt * pRO.RateFactor * pRO.HourlyRateOld,
UnitCount = pRO.GeleisteteFLSMitStundensatzAlt,
RateFactor = pRO.RateFactor
});
itemList.Add(new InvoiceItemDC
{
@@ -111,10 +131,12 @@ namespace AdikKleve.Alt
pRO.HourlyRateNewStartDateString, pRO.AccountingEndDateString,
pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew),
GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew
});
GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew,
UnitCount = pRO.GeleisteteFLSMitStundensatzAktuell,
RateFactor = pRO.RateFactor
});
}
}
else if (pRO.DifferentHourlyRateCount == 2)
{
itemList.Add(new InvoiceItemDC
@@ -123,19 +145,23 @@ namespace AdikKleve.Alt
pRO.AccountingStartDateString, pRO.HourlyRateOldEndDateString,
pRO.GeleisteteFLSMitStundensatzAlt, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateOld),
GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAlt * (decimal)pRO.RateFactor * pRO.HourlyRateOld
});
GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAlt * (decimal)pRO.RateFactor * pRO.HourlyRateOld,
UnitCount = pRO.GeleisteteFLSMitStundensatzAlt,
RateFactor = pRO.RateFactor
});
itemList.Add(new InvoiceItemDC
itemList.Add(new InvoiceItemDC
{
ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS {3}x {4:c}",
pRO.HourlyRateNewStartDateString, pRO.AccountingEndDateString,
pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew),
GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew
});
GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew,
UnitCount = pRO.GeleisteteFLSMitStundensatzAktuell,
RateFactor = pRO.RateFactor
});
}
}
else
{
itemList.Add(new InvoiceItemDC
@@ -144,10 +170,12 @@ namespace AdikKleve.Alt
pRO.AccountingStartDateString, pRO.AccountingEndDateString,
pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew),
GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew
});
GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew,
UnitCount = pRO.GeleisteteFLSMitStundensatzAktuell,
RateFactor = pRO.RateFactor
});
}
}
return itemList;
}

4
ReportImp/AdikKleve/SettlementReport.resx
View File

File diff suppressed because one or more lines are too long

55
ReportImp/AdikKleve/SettlementReport2.Designer.cs generated
View File

@@ -31,6 +31,7 @@ namespace AdikKleve
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung));
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
@@ -99,13 +100,12 @@ namespace AdikKleve
this.xrTableRow33 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell52 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell53 = 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.xrTableRow30 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow31 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell();
this.tcGesamtGeleistet = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow32 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -120,12 +120,13 @@ namespace AdikKleve
this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((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.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -217,7 +218,8 @@ namespace AdikKleve
this.xrLabel4.SizeF = new System.Drawing.SizeF(650F, 17F);
this.xrLabel4.StylePriority.UseBackColor = false;
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.Text = "[CustomerReferenceNumberAndDate]";
this.xrLabel4.Text = "[CustomerReferenceNumberAndDate], [ApprovedFLSTotal!0.00] FLS insgesamt bewilligt" +
"";
this.xrLabel4.WordWrap = false;
//
// xrLabel3
@@ -268,7 +270,7 @@ namespace AdikKleve
this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell4});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Weight = 0.13245033112582783D;
this.xrTableRow2.Weight = 0.13245033112582782D;
//
// xrTableCell4
//
@@ -287,7 +289,7 @@ namespace AdikKleve
this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell13});
this.xrTableRow5.Name = "xrTableRow5";
this.xrTableRow5.Weight = 0.13245033112582783D;
this.xrTableRow5.Weight = 0.13245033112582782D;
//
// xrTableCell13
//
@@ -306,7 +308,7 @@ namespace AdikKleve
this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell11});
this.xrTableRow4.Name = "xrTableRow4";
this.xrTableRow4.Weight = 0.13245033112582783D;
this.xrTableRow4.Weight = 0.13245033112582782D;
//
// xrTableCell11
//
@@ -325,7 +327,7 @@ namespace AdikKleve
this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell8});
this.xrTableRow3.Name = "xrTableRow3";
this.xrTableRow3.Weight = 0.13245033112582783D;
this.xrTableRow3.Weight = 0.13245033112582782D;
//
// xrTableCell8
//
@@ -344,7 +346,7 @@ namespace AdikKleve
this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell1});
this.xrTableRow1.Name = "xrTableRow1";
this.xrTableRow1.Weight = 0.13245033112582783D;
this.xrTableRow1.Weight = 0.13245033112582782D;
//
// xrTableCell1
//
@@ -779,7 +781,7 @@ namespace AdikKleve
this.xrTableCell52.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell52.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell52.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.DetailDescription")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.AbrechnungsText")});
this.xrTableCell52.Name = "xrTableCell52";
this.xrTableCell52.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell52.StylePriority.UseBorderColor = false;
@@ -805,10 +807,6 @@ namespace AdikKleve
this.xrTableCell53.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell53.Weight = 0.21685899000901443D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -856,21 +854,20 @@ namespace AdikKleve
// xrTableRow31
//
this.xrTableRow31.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell49,
this.tcGesamtGeleistet,
this.xrTableCell50});
this.xrTableRow31.Name = "xrTableRow31";
this.xrTableRow31.Weight = 0.085D;
//
// xrTableCell49
// tcGesamtGeleistet
//
this.xrTableCell49.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell49.Name = "xrTableCell49";
this.xrTableCell49.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell49.StylePriority.UseBorders = false;
this.xrTableCell49.StylePriority.UseFont = false;
this.xrTableCell49.StylePriority.UsePadding = false;
this.xrTableCell49.Text = "Gesamtforderung:";
this.xrTableCell49.Weight = 0.78314100999098546D;
this.tcGesamtGeleistet.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.tcGesamtGeleistet.Name = "tcGesamtGeleistet";
this.tcGesamtGeleistet.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.tcGesamtGeleistet.StylePriority.UseBorders = false;
this.tcGesamtGeleistet.StylePriority.UseFont = false;
this.tcGesamtGeleistet.StylePriority.UsePadding = false;
this.tcGesamtGeleistet.Weight = 0.78314100999098546D;
//
// xrTableCell50
//
@@ -1028,6 +1025,10 @@ namespace AdikKleve
this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell60.Weight = 0.21685899000901443D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
//
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1049,12 +1050,14 @@ namespace AdikKleve
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "23.2";
xrWatermark1.Id = "Watermark1";
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -1112,7 +1115,7 @@ namespace AdikKleve
private DevExpress.XtraReports.UI.XRTableRow xrTableRow30;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell48;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow31;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell49;
private DevExpress.XtraReports.UI.XRTableCell tcGesamtGeleistet;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell50;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow32;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell51;

8
ReportImp/AdikKleve/SettlementReport2.cs
View File

@@ -32,15 +32,21 @@ namespace AdikKleve
}
decimal rateFactor = 1;
var summeFLS = 0m;
foreach (var ii in pRO.InvoiceItems)
{
if (ii.ItemDescription == "Fehlkontakte")
ii.AbrechnungsText = ii.AbrechnungsText.Replace("FLS", "Fehlkontakte");
if (ii.RateFactor.HasValue)
{
rateFactor = (100 + ii.RateFactor.Value) / 100;
}
summeFLS += ii.UnitCount.Value * rateFactor;
}
pRO.RateFactor = (double)rateFactor;
tcGesamtGeleistet.Text = string.Format("Gesamtforderung für {0:0.00} FLS:", summeFLS);
SetFaxNrAndAnsprechpartner(pRO);

4
ReportImp/AdikKleve/SettlementReport2.resx
View File

File diff suppressed because one or more lines are too long