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

MH: TeamPfeil Stundensätze korrekt dargestellt

Browse Source
This commit is contained in:
HirschleM
2026-07-31 13:18:44 +02:00
parent 52c6a3785c
commit e7d09d58b6
3 changed files with 47 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ReportImp/TeamPfeil/ServiceInvoiceReport.Designer.cs generated
View File

@@ -28,7 +28,6 @@ namespace TeamPfeil
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServiceInvoiceReport));
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
@@ -49,7 +48,8 @@ namespace TeamPfeil
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.Label_InvoiceMonth = new DevExpress.XtraReports.UI.XRLabel();
this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.bindingSource1 = new System.Windows.Forms.BindingSource();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
@@ -128,6 +128,7 @@ namespace TeamPfeil
// Page1
//
this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel1,
this.lblZeNummer,
this.xrLabel_Text,
this.xrLabel_InvoiceDate,
@@ -226,15 +227,25 @@ namespace TeamPfeil
//
// xrRichText1
//
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0.1667764F, 369.6945F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0.1667659F, 369.6945F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
this.xrRichText1.SizeF = new System.Drawing.SizeF(666.8332F, 217.1664F);
this.xrRichText1.SizeF = new System.Drawing.SizeF(667F, 129.6684F);
this.xrRichText1.StylePriority.UseFont = false;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// xrLabel1
//
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 510.8212F);
this.xrLabel1.Multiline = true;
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(667F, 114.2343F);
this.xrLabel1.Text = "Davon \t\t\t [NotBillableNote]\r\n\r\nWir bitten um Zahlung innerhalb von 10 Tagen ohne " +
"Abzug.\r\nDer Rechnungsbetrag ist gemäß § 4 16 h) UStG umsatzsteuerfrei.\r\n";
//
// ServiceInvoiceReport
//
@@ -250,7 +261,7 @@ namespace TeamPfeil
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.Font = new DevExpress.Drawing.DXFont("Segoe UI", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 220F, 115F);
this.Margins = new DevExpress.Drawing.DXMargins(75F, 73F, 220F, 115F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
@@ -285,5 +296,6 @@ namespace TeamPfeil
private DevExpress.XtraReports.UI.XRRichText xrRichText3;
private DevExpress.XtraReports.UI.XRRichText xrRichText1;
private DevExpress.XtraReports.UI.XRLabel lblZeNummer;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
}
}

36
ReportImp/TeamPfeil/ServiceInvoiceReport.cs
View File

@@ -61,30 +61,50 @@ namespace TeamPfeil
lblZeNummer.Text = pRO.OrganisationDebitorNumber;
}
pRO.CreatorDivision = "";
pRO.NotBillableNote = "";
decimal hours = 0;
decimal rate = 0;
decimal amount = 0;
decimal amount = 0;
if (pRO.ServiceInvoicePeriods != null)
{
foreach (var sip in pRO.ServiceInvoicePeriods)
{
if (sip.ServiceInvoiceItems != null)
{
//pRO.NetClaim = string.Format("{0:0.00}", sip.ServiceInvoiceItems[0].HourlyRate);
foreach (var ii in sip.ServiceInvoiceItems)
{
hours += (decimal)ii.Hours;
rate = ii.HourlyRate.Value;
amount += ii.NetAmount.Value;
if (pRO.NotBillableNote.Length > 0)
{
pRO.NotBillableNote += "\n \t \t \t ";
}
pRO.NotBillableNote += string.Format("{0:0.##} h x {1:0.00} € {2} = {3:c}", ii.Hours, ii.HourlyRate, ii.ServiceDescription, ii.NetAmount);
}
}
}
pRO.CreatorDivision = String.Format("{0:0.##}", hours);
pRO.CustomerCostCenter = String.Format("{0:n2}", rate);
pRO.NotBillableNote += String.Format("{0:n2}", amount);
}
pRO.CreatorDivision = string.Format("{0:0.00}", hours);
//if (pRO.ServiceInvoicePeriods != null)
//{
// foreach (var sip in pRO.ServiceInvoicePeriods)
// {
// if (sip.ServiceInvoiceItems != null)
// {
// foreach (var ii in sip.ServiceInvoiceItems)
// {
// hours += (decimal)ii.Hours;
// rate = ii.HourlyRate.Value;
// amount += ii.NetAmount.Value;
// }
// }
// }
// pRO.CreatorDivision = String.Format("{0:0.##}", hours);
// pRO.NotBillableNote += String.Format("{0:n2}", amount);
//}
this.bindingSource1.DataSource = pRO;
}

4
ReportImp/TeamPfeil/ServiceInvoiceReport.resx
View File

File diff suppressed because one or more lines are too long