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

LeWoAachen/Invoicing/CustomInvoiceCreation - Bugfix und Format Tabelle in Rechnung

Browse Source
This commit is contained in:
Alexandra
2024-09-27 13:57:42 +02:00
parent 7e5c160bb6
commit 11a5b74012
2 changed files with 75 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReportImp/LeWoAachen/Invoicing/CustomInvoiceCreation.cs
View File

@@ -17,7 +17,7 @@ namespace LeWoAachen.Invoicing
public override IList<InvoiceItem> CreateSummaryInvoiceItems(IList<InvoiceItem> itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap,
Calculations calc, bool summaryPerMonth, bool addRateFactorToUnitCount)
{
return base.CreateSummaryInvoiceItems(itemList, invoicePeriod, scap, calc, true, true);
return base.CreateSummaryInvoiceItems(itemList, invoicePeriod, scap, calc, true, false);
}
}
}

146
ReportImp/LeWoAachen/ServiceInvoiceReport.Designer.cs generated
View File

@@ -35,7 +35,11 @@ namespace LeWoAachen
this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText();
this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
@@ -76,17 +80,13 @@ namespace LeWoAachen
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText();
this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -121,6 +121,25 @@ namespace LeWoAachen
this.bottomMarginBand1.HeightF = 100.3944F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// xrRichText3
//
this.xrRichText3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(54)))), ((int)(((byte)(95)))), ((int)(((byte)(145)))));
this.xrRichText3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrRichText3.BorderWidth = 5F;
this.xrRichText3.CanGrow = false;
this.xrRichText3.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F);
this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 9.999974F);
this.xrRichText3.Name = "xrRichText3";
this.xrRichText3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString");
this.xrRichText3.SizeF = new System.Drawing.SizeF(701.0231F, 61.26925F);
this.xrRichText3.StylePriority.UseBorderColor = false;
this.xrRichText3.StylePriority.UseBorders = false;
this.xrRichText3.StylePriority.UseBorderWidth = false;
this.xrRichText3.StylePriority.UsePadding = false;
//
// Page1
//
this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -139,6 +158,30 @@ namespace LeWoAachen
this.Page1.Name = "Page1";
this.Page1.StylePriority.UseFont = false;
//
// xrPictureBox1
//
this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(435.2272F, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(281.7729F, 218.2308F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.AutoSize;
//
// xrRichText1
//
this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(438.0002F, 233.8558F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
this.xrRichText1.SizeF = new System.Drawing.SizeF(263.0229F, 134.1859F);
//
// xrRichText2
//
this.xrRichText2.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F);
this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 49.36538F);
this.xrRichText2.Name = "xrRichText2";
this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
this.xrRichText2.SizeF = new System.Drawing.SizeF(263.0229F, 31.06094F);
//
// lblAdresse
//
this.lblAdresse.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
@@ -321,12 +364,12 @@ namespace LeWoAachen
//
// xrTable5
//
this.xrTable5.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
this.xrTable5.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable5.Name = "xrTable5";
this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow23});
this.xrTable5.SizeF = new System.Drawing.SizeF(677F, 25F);
this.xrTable5.SizeF = new System.Drawing.SizeF(717.0001F, 25F);
this.xrTable5.StylePriority.UseFont = false;
//
// xrTableRow23
@@ -358,7 +401,7 @@ namespace LeWoAachen
this.xrTableCell32.StylePriority.UseTextAlignment = false;
this.xrTableCell32.Text = "Zeitraum";
this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell32.Weight = 0.62463077449375981D;
this.xrTableCell32.Weight = 0.60322570524246855D;
//
// xrTableCell37
//
@@ -376,7 +419,7 @@ namespace LeWoAachen
this.xrTableCell37.StylePriority.UseTextAlignment = false;
this.xrTableCell37.Text = "Leistung";
this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell37.Weight = 0.85081236260328186D;
this.xrTableCell37.Weight = 0.70878524629848116D;
//
// xrTableCell35
//
@@ -394,7 +437,7 @@ namespace LeWoAachen
this.xrTableCell35.StylePriority.UseTextAlignment = false;
this.xrTableCell35.Text = "Satz";
this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell35.Weight = 0.23245943032832414D;
this.xrTableCell35.Weight = 0.33736417943855485D;
//
// xrTableCell33
//
@@ -412,7 +455,7 @@ namespace LeWoAachen
this.xrTableCell33.StylePriority.UseTextAlignment = false;
this.xrTableCell33.Text = "Stunden";
this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell33.Weight = 0.2893277257020575D;
this.xrTableCell33.Weight = 0.27941275049231157D;
//
// xrTableCell36
//
@@ -430,7 +473,7 @@ namespace LeWoAachen
this.xrTableCell36.StylePriority.UseTextAlignment = false;
this.xrTableCell36.Text = "Betrag";
this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell36.Weight = 0.26310971709438763D;
this.xrTableCell36.Weight = 0.3610795584917873D;
//
// xrTableCell38
//
@@ -448,7 +491,7 @@ namespace LeWoAachen
this.xrTableCell38.StylePriority.UseTextAlignment = false;
this.xrTableCell38.Text = "pausch Fakt.";
this.xrTableCell38.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell38.Weight = 0.42042083402151886D;
this.xrTableCell38.Weight = 0.36589380042925757D;
//
// xrTableCell34
//
@@ -466,7 +509,7 @@ namespace LeWoAachen
this.xrTableCell34.StylePriority.UseTextAlignment = false;
this.xrTableCell34.Text = "Gesamt";
this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell34.Weight = 0.31923915575667006D;
this.xrTableCell34.Weight = 0.41261164375508064D;
//
// DetailReport2
//
@@ -488,12 +531,12 @@ namespace LeWoAachen
//
// xrTable6
//
this.xrTable6.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
this.xrTable6.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable6.Name = "xrTable6";
this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow25});
this.xrTable6.SizeF = new System.Drawing.SizeF(677F, 25F);
this.xrTable6.SizeF = new System.Drawing.SizeF(717.0001F, 25F);
this.xrTable6.StylePriority.UseFont = false;
//
// xrTableRow25
@@ -539,7 +582,7 @@ namespace LeWoAachen
this.xrTableCell42.StylePriority.UsePadding = false;
this.xrTableCell42.StylePriority.UseTextAlignment = false;
this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell42.Weight = 0.85081229498678679D;
this.xrTableCell42.Weight = 0.73393623656325D;
//
// xrTableCell43
//
@@ -547,7 +590,7 @@ namespace LeWoAachen
this.xrTableCell43.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell43.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.HourlyRate", "{0:0.00}")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.HourlyRate")});
this.xrTableCell43.Name = "xrTableCell43";
this.xrTableCell43.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell43.StylePriority.UseBorderColor = false;
@@ -556,7 +599,8 @@ namespace LeWoAachen
this.xrTableCell43.StylePriority.UseTextAlignment = false;
this.xrTableCell43.Text = "xrTableCell43";
this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell43.Weight = 0.23245943032832414D;
this.xrTableCell43.TextFormatString = "{0:0.00} €";
this.xrTableCell43.Weight = 0.34933548875186082D;
//
// xrTableCell44
//
@@ -581,7 +625,7 @@ namespace LeWoAachen
this.xrTableCell45.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell45.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.NetAmount", "{0:0.00}")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.NetAmount")});
this.xrTableCell45.Name = "xrTableCell45";
this.xrTableCell45.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell45.StylePriority.UseBorderColor = false;
@@ -590,7 +634,8 @@ namespace LeWoAachen
this.xrTableCell45.StylePriority.UseTextAlignment = false;
this.xrTableCell45.Text = "xrTableCell45";
this.xrTableCell45.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell45.Weight = 0.26310971709438763D;
this.xrTableCell45.TextFormatString = "{0:0.00} €";
this.xrTableCell45.Weight = 0.37389177127990275D;
//
// xrTableCell46
//
@@ -606,7 +651,7 @@ namespace LeWoAachen
this.xrTableCell46.StylePriority.UsePadding = false;
this.xrTableCell46.StylePriority.UseTextAlignment = false;
this.xrTableCell46.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell46.Weight = 0.42042083402151886D;
this.xrTableCell46.Weight = 0.37887712419473252D;
//
// xrTableCell47
//
@@ -622,7 +667,7 @@ namespace LeWoAachen
this.xrTableCell47.StylePriority.UsePadding = false;
this.xrTableCell47.StylePriority.UseTextAlignment = false;
this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell47.Weight = 0.31923915575667006D;
this.xrTableCell47.Weight = 0.42725366679745197D;
//
// GroupFooter1
//
@@ -640,7 +685,7 @@ namespace LeWoAachen
this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim", "Gesamtsumme: {0}")});
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(420.9999F, 0F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(461.1668F, 0F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(255.8333F, 25F);
@@ -654,49 +699,6 @@ namespace LeWoAachen
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// xrRichText3
//
this.xrRichText3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(54)))), ((int)(((byte)(95)))), ((int)(((byte)(145)))));
this.xrRichText3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrRichText3.BorderWidth = 5F;
this.xrRichText3.CanGrow = false;
this.xrRichText3.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F);
this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 9.999974F);
this.xrRichText3.Name = "xrRichText3";
this.xrRichText3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString");
this.xrRichText3.SizeF = new System.Drawing.SizeF(701.0231F, 61.26925F);
this.xrRichText3.StylePriority.UseBorderColor = false;
this.xrRichText3.StylePriority.UseBorders = false;
this.xrRichText3.StylePriority.UseBorderWidth = false;
this.xrRichText3.StylePriority.UsePadding = false;
//
// xrRichText2
//
this.xrRichText2.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F);
this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 49.36538F);
this.xrRichText2.Name = "xrRichText2";
this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
this.xrRichText2.SizeF = new System.Drawing.SizeF(263.0229F, 31.06094F);
//
// xrPictureBox1
//
this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(435.2272F, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(281.7729F, 218.2308F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.AutoSize;
//
// xrRichText1
//
this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(438.0002F, 233.8558F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
this.xrRichText1.SizeF = new System.Drawing.SizeF(263.0229F, 134.1859F);
//
// ServiceInvoiceReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -716,13 +718,13 @@ namespace LeWoAachen
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "23.2";
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}