TagwerkReports/Finanzauswertung - neue Spalten, Format Rechnung

This commit is contained in:
2024-07-04 13:06:28 +02:00
parent 051e943f4f
commit 72e592b49a
4 changed files with 546 additions and 657 deletions

View File

@@ -55,6 +55,17 @@ namespace TagwerkReports
cellRateFactor.Visible = false;
}
if (pRO.SupportConceptFinanceList != null)
{
foreach (var scRo in pRO.SupportConceptFinanceList)
{
if (scRo.CostBearerName.StartsWith("LVR"))
{
scRo.CostBearerName = "LVR";
}
}
}
if (pRO.GruppierungLeistungskategorie && pRO.SupportConceptFinanceList != null)
{
GroupHeader1.Visible = true;

View File

@@ -50,11 +50,14 @@ namespace TagwerkReports
DevExpress.XtraReports.UI.XRSummary xrSummary18 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary19 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary20 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -73,6 +76,8 @@ namespace TagwerkReports
this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -87,6 +92,8 @@ namespace TagwerkReports
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -101,7 +108,6 @@ namespace TagwerkReports
this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
@@ -117,6 +123,8 @@ namespace TagwerkReports
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -128,19 +136,12 @@ namespace TagwerkReports
this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).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
@@ -204,6 +205,24 @@ namespace TagwerkReports
this.xrTableCell6.Text = "[CustomerName]\r\n[SupportConceptTimeSpanString]";
this.xrTableCell6.Weight = 0.68755917031429226D;
//
// xrTableCell42
//
this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.Costbearer2Supportconcept.SupportConcept.Customer.Debit" +
"orNumber")});
this.xrTableCell42.Multiline = true;
this.xrTableCell42.Name = "xrTableCell42";
this.xrTableCell42.Weight = 0.26079791344260389D;
//
// xrTableCell43
//
this.xrTableCell43.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.Costbearer2Supportconcept.SupportConcept.Customer.CostC" +
"enter")});
this.xrTableCell43.Multiline = true;
this.xrTableCell43.Name = "xrTableCell43";
this.xrTableCell43.Weight = 0.26079849227401497D;
//
// xrTableCell7
//
this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -222,7 +241,7 @@ namespace TagwerkReports
this.xrTableCell8.StylePriority.UseTextAlignment = false;
this.xrTableCell8.Text = "xrTableCell8";
this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell8.Weight = 0.52159672369923982D;
this.xrTableCell8.Weight = 0.47417835310504119D;
//
// xrTableCell9
//
@@ -232,7 +251,7 @@ namespace TagwerkReports
this.xrTableCell9.StylePriority.UseTextAlignment = false;
this.xrTableCell9.Text = "xrTableCell9";
this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell9.Weight = 0.49788732305516581D;
this.xrTableCell9.Weight = 0.47417878894333426D;
//
// xrTableCell10
//
@@ -242,7 +261,7 @@ namespace TagwerkReports
this.xrTableCell10.StylePriority.UseTextAlignment = false;
this.xrTableCell10.Text = "xrTableCell10";
this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell10.Weight = 0.33192506978043712D;
this.xrTableCell10.Weight = 0.40305197448646729D;
//
// xrTableCell14
//
@@ -396,6 +415,22 @@ namespace TagwerkReports
this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell31.Weight = 0.25716736547266744D;
//
// xrTableCell48
//
this.xrTableCell48.Multiline = true;
this.xrTableCell48.Name = "xrTableCell48";
this.xrTableCell48.StylePriority.UseTextAlignment = false;
this.xrTableCell48.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell48.Weight = 0.25716736547266744D;
//
// xrTableCell46
//
this.xrTableCell46.Multiline = true;
this.xrTableCell46.Name = "xrTableCell46";
this.xrTableCell46.StylePriority.UseTextAlignment = false;
this.xrTableCell46.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell46.Weight = 0.51433508767859948D;
//
// xrTableCell32
//
this.xrTableCell32.CanGrow = false;
@@ -410,7 +445,7 @@ namespace TagwerkReports
xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell32.Summary = xrSummary1;
this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell32.Weight = 0.5143353205131147D;
this.xrTableCell32.Weight = 0.46757708365119371D;
//
// xrTableCell33
//
@@ -426,7 +461,7 @@ namespace TagwerkReports
xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell33.Summary = xrSummary2;
this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell33.Weight = 0.49095630201126939D;
this.xrTableCell33.Weight = 0.46757779002679356D;
//
// xrTableCell34
//
@@ -442,7 +477,7 @@ namespace TagwerkReports
xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell34.Summary = xrSummary3;
this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell34.Weight = 0.32730420295300966D;
this.xrTableCell34.Weight = 0.39744095179940642D;
//
// xrTableCell35
//
@@ -604,6 +639,20 @@ namespace TagwerkReports
this.xrTableCell1.Text = "KlientIn/Hilfeplan";
this.xrTableCell1.Weight = 0.71223169297947841D;
//
// xrTableCell44
//
this.xrTableCell44.Multiline = true;
this.xrTableCell44.Name = "xrTableCell44";
this.xrTableCell44.Text = "Debitor";
this.xrTableCell44.Weight = 0.27015684648668642D;
//
// xrTableCell45
//
this.xrTableCell45.Multiline = true;
this.xrTableCell45.Name = "xrTableCell45";
this.xrTableCell45.Text = "Kosten-stelle";
this.xrTableCell45.Weight = 0.27015684648668636D;
//
// xrTableCell2
//
this.xrTableCell2.Name = "xrTableCell2";
@@ -618,7 +667,7 @@ namespace TagwerkReports
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.Text = "Gesamt laut Bewilligung";
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell3.Weight = 0.540313745165342D;
this.xrTableCell3.Weight = 0.49119431510760853D;
//
// xrTableCell4
//
@@ -626,7 +675,7 @@ namespace TagwerkReports
this.xrTableCell4.StylePriority.UseTextAlignment = false;
this.xrTableCell4.Text = "Bereits gezahlt";
this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell4.Weight = 0.51575397130178713D;
this.xrTableCell4.Weight = 0.4911942937480715D;
//
// xrTableCell5
//
@@ -634,7 +683,7 @@ namespace TagwerkReports
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "Noch offen";
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell5.Weight = 0.34383601359473903D;
this.xrTableCell5.Weight = 0.41751512120618822D;
//
// xrTableCell13
//
@@ -724,10 +773,6 @@ namespace TagwerkReports
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.Text = "xrLabel1";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FinanceRO);
//
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -746,7 +791,7 @@ namespace TagwerkReports
// xrPageInfo2
//
this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(1002F, 25F);
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(1001F, 25F);
this.xrPageInfo2.Name = "xrPageInfo2";
this.xrPageInfo2.SizeF = new System.Drawing.SizeF(140F, 23F);
this.xrPageInfo2.StyleName = "PageInfo";
@@ -875,6 +920,18 @@ namespace TagwerkReports
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.Weight = 0.6504408587281989D;
//
// xrTableCell47
//
this.xrTableCell47.Multiline = true;
this.xrTableCell47.Name = "xrTableCell47";
this.xrTableCell47.Weight = 0.24671915781149523D;
//
// xrTableCell49
//
this.xrTableCell49.Multiline = true;
this.xrTableCell49.Name = "xrTableCell49";
this.xrTableCell49.Weight = 0.24671915781149523D;
//
// xrTableCell16
//
this.xrTableCell16.CanGrow = false;
@@ -897,7 +954,7 @@ namespace TagwerkReports
xrSummary11.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
this.xrTableCell17.Summary = xrSummary11;
this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell17.Weight = 0.49343819978796849D;
this.xrTableCell17.Weight = 0.44857978274625215D;
//
// xrTableCell18
//
@@ -913,7 +970,7 @@ namespace TagwerkReports
xrSummary12.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
this.xrTableCell18.Summary = xrSummary12;
this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell18.Weight = 0.47100878133600715D;
this.xrTableCell18.Weight = 0.44858018884612005D;
//
// xrTableCell19
//
@@ -929,7 +986,7 @@ namespace TagwerkReports
xrSummary13.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
this.xrTableCell19.Summary = xrSummary13;
this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell19.Weight = 0.31400632328005007D;
this.xrTableCell19.Weight = 0.38129333281165356D;
//
// xrTableCell20
//
@@ -1039,65 +1096,9 @@ namespace TagwerkReports
this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell27.Weight = 0.31400600828810976D;
//
// xrTableCell44
// bindingSource1
//
this.xrTableCell44.Multiline = true;
this.xrTableCell44.Name = "xrTableCell44";
this.xrTableCell44.Text = "Debitor";
this.xrTableCell44.Weight = 0.27015684648668642D;
//
// xrTableCell45
//
this.xrTableCell45.Multiline = true;
this.xrTableCell45.Name = "xrTableCell45";
this.xrTableCell45.Text = "Kosten-stelle";
this.xrTableCell45.Weight = 0.27015684648668636D;
//
// xrTableCell42
//
this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.Costbearer2Supportconcept.SupportConcept.Customer.Debit" +
"orNumber")});
this.xrTableCell42.Multiline = true;
this.xrTableCell42.Name = "xrTableCell42";
this.xrTableCell42.Weight = 0.26079791344260389D;
//
// xrTableCell43
//
this.xrTableCell43.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.Costbearer2Supportconcept.SupportConcept.Customer.CostC" +
"enter")});
this.xrTableCell43.Multiline = true;
this.xrTableCell43.Name = "xrTableCell43";
this.xrTableCell43.Weight = 0.26079849227401497D;
//
// xrTableCell46
//
this.xrTableCell46.Multiline = true;
this.xrTableCell46.Name = "xrTableCell46";
this.xrTableCell46.StylePriority.UseTextAlignment = false;
this.xrTableCell46.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell46.Weight = 0.51433508767859948D;
//
// xrTableCell47
//
this.xrTableCell47.Multiline = true;
this.xrTableCell47.Name = "xrTableCell47";
this.xrTableCell47.Weight = 0.24671915781149523D;
//
// xrTableCell48
//
this.xrTableCell48.Multiline = true;
this.xrTableCell48.Name = "xrTableCell48";
this.xrTableCell48.StylePriority.UseTextAlignment = false;
this.xrTableCell48.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell48.Weight = 0.25716736547266744D;
//
// xrTableCell49
//
this.xrTableCell49.Multiline = true;
this.xrTableCell49.Name = "xrTableCell49";
this.xrTableCell49.Weight = 0.24671915781149523D;
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FinanceRO);
//
// Finanzauswertung
//
@@ -1121,11 +1122,13 @@ namespace TagwerkReports
this.PageInfo,
this.DataField});
this.Version = "23.2";
xrWatermark1.Id = "Watermark1";
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}

File diff suppressed because it is too large Load Diff

View File

@@ -67,7 +67,14 @@
<ItemGroup>
<Compile Include="CustomReportCreator.cs" />
<Compile Include="Export\CustomDataExporter.cs" />
<Compile Include="Export\CustomExportAndPrintHelper.cs" />
<Compile Include="Export\FibuExporter.cs" />
<Compile Include="Finanzauswertung.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Finanzauswertung.designer.cs">
<DependentUpon>Finanzauswertung.cs</DependentUpon>
</Compile>
<Compile Include="InvoiceCustomerReport.cs">
<SubType>Component</SubType>
</Compile>
@@ -110,6 +117,10 @@
<Compile Include="Validation\ServiceRecordValidator.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Finanzauswertung.resx">
<DependentUpon>Finanzauswertung.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="InvoiceCustomerReport.resx">
<DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
</EmbeddedResource>