Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo

This commit is contained in:
Christian
2024-10-28 16:45:41 +01:00
11 changed files with 2335 additions and 3836 deletions

View File

@@ -30,6 +30,7 @@ namespace AutismusKoelnBonn
{
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();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
@@ -121,14 +122,14 @@ namespace AutismusKoelnBonn
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrPictureBox1});
this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F);
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportHeader.HeightF = 147.9167F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
// xrPictureBox1
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(466.3054F, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(236.1249F, 141.3333F);
@@ -157,20 +158,20 @@ namespace AutismusKoelnBonn
//
// xrPageInfo2
//
this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F);
this.xrPageInfo2.Format = "Seite {0} von {1}";
this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(509.0416F, 94.12498F);
this.xrPageInfo2.Name = "xrPageInfo2";
this.xrPageInfo2.SizeF = new System.Drawing.SizeF(153.0834F, 23F);
this.xrPageInfo2.StylePriority.UseFont = false;
this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrPageInfo2.TextFormatString = "Seite {0} von {1}";
//
// xrRichText3
//
this.xrRichText3.BorderColor = System.Drawing.Color.DarkGray;
this.xrRichText3.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Dot;
this.xrRichText3.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrRichText3.Font = new System.Drawing.Font("Verdana", 10F);
this.xrRichText3.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrRichText3.Name = "xrRichText3";
this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString");
@@ -184,7 +185,7 @@ namespace AutismusKoelnBonn
this.xrRichText5.BorderColor = System.Drawing.Color.DarkGray;
this.xrRichText5.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Dot;
this.xrRichText5.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrRichText5.Font = new System.Drawing.Font("Verdana", 10F);
this.xrRichText5.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.xrRichText5.LocationFloat = new DevExpress.Utils.PointFloat(198.9583F, 0F);
this.xrRichText5.Name = "xrRichText5";
this.xrRichText5.SerializableRtfString = resources.GetString("xrRichText5.SerializableRtfString");
@@ -198,7 +199,7 @@ namespace AutismusKoelnBonn
this.xrRichText6.BorderColor = System.Drawing.Color.DarkGray;
this.xrRichText6.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Dot;
this.xrRichText6.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrRichText6.Font = new System.Drawing.Font("Verdana", 10F);
this.xrRichText6.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.xrRichText6.LocationFloat = new DevExpress.Utils.PointFloat(509.0416F, 0F);
this.xrRichText6.Name = "xrRichText6";
this.xrRichText6.SerializableRtfString = resources.GetString("xrRichText6.SerializableRtfString");
@@ -231,14 +232,15 @@ namespace AutismusKoelnBonn
this.xrLabel2,
this.xrLabel8,
this.lblAbrechnungszeitraum});
this.Page1.Font = new System.Drawing.Font("Verdana", 10F);
this.Page1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.Page1.HeightF = 514.5001F;
this.Page1.Name = "Page1";
this.Page1.StylePriority.UseFont = false;
//
// lblAnrede
//
this.lblAnrede.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblAnrede.Font = new DevExpress.Drawing.DXFont("Arial", 11.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(30.29156F, 400F);
this.lblAnrede.Multiline = true;
this.lblAnrede.Name = "lblAnrede";
@@ -251,7 +253,7 @@ namespace AutismusKoelnBonn
// lblBonnHZE
//
this.lblBonnHZE.CanGrow = false;
this.lblBonnHZE.Font = new System.Drawing.Font("Arial", 8F);
this.lblBonnHZE.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.lblBonnHZE.LocationFloat = new DevExpress.Utils.PointFloat(466.3054F, 0F);
this.lblBonnHZE.Name = "lblBonnHZE";
this.lblBonnHZE.Padding = new DevExpress.XtraPrinting.PaddingInfo(6, 0, 0, 0, 100F);
@@ -265,7 +267,7 @@ namespace AutismusKoelnBonn
// lblHeaderKoelnHZE
//
this.lblHeaderKoelnHZE.CanGrow = false;
this.lblHeaderKoelnHZE.Font = new System.Drawing.Font("Arial", 8F);
this.lblHeaderKoelnHZE.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.lblHeaderKoelnHZE.LocationFloat = new DevExpress.Utils.PointFloat(472.4583F, 0F);
this.lblHeaderKoelnHZE.Name = "lblHeaderKoelnHZE";
this.lblHeaderKoelnHZE.Padding = new DevExpress.XtraPrinting.PaddingInfo(1, 0, 0, 0, 100F);
@@ -278,7 +280,7 @@ namespace AutismusKoelnBonn
//
// lblTeamKoelnHZE
//
this.lblTeamKoelnHZE.Font = new System.Drawing.Font("Arial", 8F);
this.lblTeamKoelnHZE.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.lblTeamKoelnHZE.LocationFloat = new DevExpress.Utils.PointFloat(472.4583F, 111.5F);
this.lblTeamKoelnHZE.Name = "lblTeamKoelnHZE";
this.lblTeamKoelnHZE.SerializableRtfString = resources.GetString("lblTeamKoelnHZE.SerializableRtfString");
@@ -288,7 +290,7 @@ namespace AutismusKoelnBonn
//
// lblAbsenderBonn
//
this.lblAbsenderBonn.Font = new System.Drawing.Font("Verdana", 10F);
this.lblAbsenderBonn.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.lblAbsenderBonn.LocationFloat = new DevExpress.Utils.PointFloat(30.29156F, 0F);
this.lblAbsenderBonn.Name = "lblAbsenderBonn";
this.lblAbsenderBonn.SerializableRtfString = resources.GetString("lblAbsenderBonn.SerializableRtfString");
@@ -298,7 +300,7 @@ namespace AutismusKoelnBonn
// lblTeamBonn
//
this.lblTeamBonn.CanGrow = false;
this.lblTeamBonn.Font = new System.Drawing.Font("Arial", 8F);
this.lblTeamBonn.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.lblTeamBonn.LocationFloat = new DevExpress.Utils.PointFloat(467.8752F, 0F);
this.lblTeamBonn.Name = "lblTeamBonn";
this.lblTeamBonn.Padding = new DevExpress.XtraPrinting.PaddingInfo(6, 0, 0, 0, 100F);
@@ -311,7 +313,7 @@ namespace AutismusKoelnBonn
//
// lblTeamMerkenich
//
this.lblTeamMerkenich.Font = new System.Drawing.Font("Arial", 8F);
this.lblTeamMerkenich.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.lblTeamMerkenich.LocationFloat = new DevExpress.Utils.PointFloat(473.3195F, 111.5F);
this.lblTeamMerkenich.Name = "lblTeamMerkenich";
this.lblTeamMerkenich.SerializableRtfString = resources.GetString("lblTeamMerkenich.SerializableRtfString");
@@ -323,7 +325,7 @@ namespace AutismusKoelnBonn
//
this.lbl3.BackColor = System.Drawing.Color.Transparent;
this.lbl3.CanShrink = true;
this.lbl3.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
this.lbl3.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
this.lbl3.LocationFloat = new DevExpress.Utils.PointFloat(31.33326F, 380F);
this.lbl3.Name = "lbl3";
this.lbl3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -339,7 +341,8 @@ namespace AutismusKoelnBonn
//
this.lbl2.BackColor = System.Drawing.Color.Transparent;
this.lbl2.CanShrink = true;
this.lbl2.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbl2.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.lbl2.LocationFloat = new DevExpress.Utils.PointFloat(31.33326F, 360F);
this.lbl2.Multiline = true;
this.lbl2.Name = "lbl2";
@@ -356,7 +359,8 @@ namespace AutismusKoelnBonn
//
this.xrLabel11.BackColor = System.Drawing.Color.Transparent;
this.xrLabel11.CanShrink = true;
this.xrLabel11.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(420.9998F, 291.0416F);
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -370,7 +374,8 @@ namespace AutismusKoelnBonn
//
this.xrLabel10.BackColor = System.Drawing.Color.Transparent;
this.xrLabel10.CanShrink = true;
this.xrLabel10.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(420.9998F, 248.0416F);
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -384,7 +389,8 @@ namespace AutismusKoelnBonn
//
this.xrLabel6.BackColor = System.Drawing.Color.Transparent;
this.xrLabel6.CanShrink = true;
this.xrLabel6.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(563.3748F, 271.0416F);
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -398,7 +404,7 @@ namespace AutismusKoelnBonn
//
// lblAbsenderKoeln
//
this.lblAbsenderKoeln.Font = new System.Drawing.Font("Verdana", 10F);
this.lblAbsenderKoeln.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.lblAbsenderKoeln.LocationFloat = new DevExpress.Utils.PointFloat(30.29156F, 0F);
this.lblAbsenderKoeln.Name = "lblAbsenderKoeln";
this.lblAbsenderKoeln.SerializableRtfString = resources.GetString("lblAbsenderKoeln.SerializableRtfString");
@@ -406,7 +412,7 @@ namespace AutismusKoelnBonn
//
// lblTeamKoeln
//
this.lblTeamKoeln.Font = new System.Drawing.Font("Arial", 8F);
this.lblTeamKoeln.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.lblTeamKoeln.LocationFloat = new DevExpress.Utils.PointFloat(472.4583F, 111.5F);
this.lblTeamKoeln.Name = "lblTeamKoeln";
this.lblTeamKoeln.SerializableRtfString = resources.GetString("lblTeamKoeln.SerializableRtfString");
@@ -416,7 +422,7 @@ namespace AutismusKoelnBonn
// lblHeaderKoeln
//
this.lblHeaderKoeln.CanGrow = false;
this.lblHeaderKoeln.Font = new System.Drawing.Font("Arial", 8F);
this.lblHeaderKoeln.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.lblHeaderKoeln.LocationFloat = new DevExpress.Utils.PointFloat(472.4583F, 0F);
this.lblHeaderKoeln.Name = "lblHeaderKoeln";
this.lblHeaderKoeln.SerializableRtfString = resources.GetString("lblHeaderKoeln.SerializableRtfString");
@@ -437,7 +443,8 @@ namespace AutismusKoelnBonn
//
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
this.xrLabel4.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(563.3748F, 291.0416F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
@@ -454,7 +461,7 @@ namespace AutismusKoelnBonn
//
this.lbl1.BackColor = System.Drawing.Color.Transparent;
this.lbl1.CanShrink = true;
this.lbl1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
this.lbl1.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
this.lbl1.LocationFloat = new DevExpress.Utils.PointFloat(30.29156F, 340F);
this.lbl1.Name = "lbl1";
this.lbl1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -468,7 +475,8 @@ namespace AutismusKoelnBonn
//
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
this.xrLabel2.CanShrink = true;
this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(420.9998F, 271.0416F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -482,7 +490,8 @@ namespace AutismusKoelnBonn
//
this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
this.xrLabel8.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(563.3748F, 248.0416F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -494,7 +503,8 @@ namespace AutismusKoelnBonn
//
// lblAbrechnungszeitraum
//
this.lblAbrechnungszeitraum.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblAbrechnungszeitraum.Font = new DevExpress.Drawing.DXFont("Arial", 11.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(30.29159F, 442.2917F);
this.lblAbrechnungszeitraum.Multiline = true;
this.lblAbrechnungszeitraum.Name = "lblAbrechnungszeitraum";
@@ -547,7 +557,7 @@ namespace AutismusKoelnBonn
this.xrTableCell32.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell32.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.xrTableCell32.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell32.Name = "xrTableCell32";
this.xrTableCell32.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell32.StylePriority.UseBackColor = false;
@@ -567,7 +577,7 @@ namespace AutismusKoelnBonn
this.xrTableCell37.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell37.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.xrTableCell37.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell37.Name = "xrTableCell37";
this.xrTableCell37.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell37.StylePriority.UseBackColor = false;
@@ -587,7 +597,7 @@ namespace AutismusKoelnBonn
this.xrTableCell35.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell35.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.xrTableCell35.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell35.Name = "xrTableCell35";
this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell35.StylePriority.UseBackColor = false;
@@ -607,7 +617,7 @@ namespace AutismusKoelnBonn
this.xrTableCell33.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell33.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.xrTableCell33.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell33.Name = "xrTableCell33";
this.xrTableCell33.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell33.StylePriority.UseBackColor = false;
@@ -627,7 +637,7 @@ namespace AutismusKoelnBonn
this.xrTableCell34.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell34.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.xrTableCell34.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell34.Name = "xrTableCell34";
this.xrTableCell34.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell34.StylePriority.UseBackColor = false;
@@ -660,7 +670,8 @@ namespace AutismusKoelnBonn
//
// xrTable6
//
this.xrTable6.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTable6.Font = new DevExpress.Drawing.DXFont("Verdana", 8.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(31.86131F, 0F);
this.xrTable6.Name = "xrTable6";
this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
@@ -686,7 +697,8 @@ namespace AutismusKoelnBonn
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.ServiceDescription")});
this.xrTableCell40.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell40.Font = new DevExpress.Drawing.DXFont("Arial", 11.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTableCell40.Name = "xrTableCell40";
this.xrTableCell40.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell40.StylePriority.UseBorderColor = false;
@@ -705,7 +717,8 @@ namespace AutismusKoelnBonn
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.AccountingPeriodStart", "{0:MMMM yyyy}")});
this.xrTableCell42.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell42.Font = new DevExpress.Drawing.DXFont("Arial", 11.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTableCell42.Name = "xrTableCell42";
this.xrTableCell42.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell42.StylePriority.UseBorderColor = false;
@@ -723,7 +736,8 @@ namespace AutismusKoelnBonn
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell43.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Hours", "{0:0.00}")});
this.xrTableCell43.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell43.Font = new DevExpress.Drawing.DXFont("Arial", 11.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTableCell43.Name = "xrTableCell43";
this.xrTableCell43.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell43.StylePriority.UseBorderColor = false;
@@ -742,7 +756,8 @@ namespace AutismusKoelnBonn
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.HourlyRate", "{0:c}")});
this.xrTableCell44.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell44.Font = new DevExpress.Drawing.DXFont("Arial", 11.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTableCell44.Name = "xrTableCell44";
this.xrTableCell44.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell44.StylePriority.UseBorderColor = false;
@@ -760,7 +775,8 @@ namespace AutismusKoelnBonn
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell47.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.GrossAmount")});
this.xrTableCell47.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell47.Font = new DevExpress.Drawing.DXFont("Arial", 11.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTableCell47.Name = "xrTableCell47";
this.xrTableCell47.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell47.StylePriority.UseBorderColor = false;
@@ -783,7 +799,7 @@ namespace AutismusKoelnBonn
//
// lblVerwaltung
//
this.lblVerwaltung.Font = new System.Drawing.Font("Arial", 9F);
this.lblVerwaltung.Font = new DevExpress.Drawing.DXFont("Arial", 9F);
this.lblVerwaltung.LocationFloat = new DevExpress.Utils.PointFloat(30.29156F, 210.6979F);
this.lblVerwaltung.Multiline = true;
this.lblVerwaltung.Name = "lblVerwaltung";
@@ -795,19 +811,21 @@ namespace AutismusKoelnBonn
//
// lblMfg
//
this.lblMfg.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblMfg.Font = new DevExpress.Drawing.DXFont("Arial", 11.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.lblMfg.LocationFloat = new DevExpress.Utils.PointFloat(30.29156F, 138.6978F);
this.lblMfg.Multiline = true;
this.lblMfg.Name = "lblMfg";
this.lblMfg.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblMfg.SizeF = new System.Drawing.SizeF(671.097F, 72.00012F);
this.lblMfg.StylePriority.UseFont = false;
this.lblMfg.Text = "Mit freundlichen Grüßen\r\n\r\n\r\nWalter Krebs";
this.lblMfg.Text = "Mit freundlichen Grüßen\r\n\r\n\r\nAva Mehlen";
this.lblMfg.Visible = false;
//
// xrLabel1
//
this.xrLabel1.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 11.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(30.29156F, 48.22909F);
this.xrLabel1.Multiline = true;
this.xrLabel1.Name = "xrLabel1";
@@ -843,7 +861,7 @@ namespace AutismusKoelnBonn
this.xrTableCell1.BorderColor = System.Drawing.Color.Black;
this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell1.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell1.StylePriority.UseBackColor = false;
@@ -862,7 +880,7 @@ namespace AutismusKoelnBonn
this.xrTableCell2.BorderColor = System.Drawing.Color.Black;
this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell2.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell2.StylePriority.UseBackColor = false;
@@ -880,7 +898,7 @@ namespace AutismusKoelnBonn
this.xrTableCell3.BorderColor = System.Drawing.Color.Black;
this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell3.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell3.StylePriority.UseBackColor = false;
@@ -898,7 +916,7 @@ namespace AutismusKoelnBonn
this.xrTableCell4.BorderColor = System.Drawing.Color.Black;
this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell4.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell4.StylePriority.UseBackColor = false;
@@ -918,7 +936,7 @@ namespace AutismusKoelnBonn
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim")});
this.xrTableCell6.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell6.StylePriority.UseBackColor = false;
@@ -945,14 +963,16 @@ namespace AutismusKoelnBonn
this.DetailReport});
this.DataSource = this.bindingSource1;
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.Font = new System.Drawing.Font("Verdana", 10F);
this.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
this.Margins = new System.Drawing.Printing.Margins(68, 34, 40, 139);
this.Margins = new DevExpress.Drawing.DXMargins(68F, 34F, 40F, 139F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "17.1";
this.Version = "23.2";
xrWatermark1.Id = "Watermark1";
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText6)).EndInit();

File diff suppressed because one or more lines are too long

View File

@@ -34,6 +34,7 @@ namespace AutismusKoelnBonn
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.lblBewilligungszeitraum = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -88,7 +89,6 @@ namespace AutismusKoelnBonn
this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
this.lblBewilligungszeitraum = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.lblHeaderKoeln)).BeginInit();
@@ -143,6 +143,23 @@ namespace AutismusKoelnBonn
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
// lblBewilligungszeitraum
//
this.lblBewilligungszeitraum.BackColor = System.Drawing.Color.Transparent;
this.lblBewilligungszeitraum.CanShrink = true;
this.lblBewilligungszeitraum.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.lblBewilligungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(32.94474F, 483.5415F);
this.lblBewilligungszeitraum.Multiline = true;
this.lblBewilligungszeitraum.Name = "lblBewilligungszeitraum";
this.lblBewilligungszeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblBewilligungszeitraum.SizeF = new System.Drawing.SizeF(648.9583F, 20F);
this.lblBewilligungszeitraum.StylePriority.UseBackColor = false;
this.lblBewilligungszeitraum.StylePriority.UseFont = false;
this.lblBewilligungszeitraum.StylePriority.UseTextAlignment = false;
this.lblBewilligungszeitraum.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.lblBewilligungszeitraum.WordWrap = false;
//
// xrTable5
//
this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(31.90305F, 612.9581F);
@@ -666,7 +683,7 @@ namespace AutismusKoelnBonn
this.lblMfg.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblMfg.SizeF = new System.Drawing.SizeF(653.1387F, 72.00015F);
this.lblMfg.StylePriority.UseFont = false;
this.lblMfg.Text = "Mit freundlichen Grüßen\r\n\r\n\r\nWalter Krebs";
this.lblMfg.Text = "Mit freundlichen Grüßen\r\n\r\n\r\nAva Mehlen";
//
// lblVerwaltung
//
@@ -883,23 +900,6 @@ namespace AutismusKoelnBonn
this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell47.Weight = 0.39389530172875176D;
//
// lblBewilligungszeitraum
//
this.lblBewilligungszeitraum.BackColor = System.Drawing.Color.Transparent;
this.lblBewilligungszeitraum.CanShrink = true;
this.lblBewilligungszeitraum.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.lblBewilligungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(32.94474F, 483.5415F);
this.lblBewilligungszeitraum.Multiline = true;
this.lblBewilligungszeitraum.Name = "lblBewilligungszeitraum";
this.lblBewilligungszeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblBewilligungszeitraum.SizeF = new System.Drawing.SizeF(648.9583F, 20F);
this.lblBewilligungszeitraum.StylePriority.UseBackColor = false;
this.lblBewilligungszeitraum.StylePriority.UseFont = false;
this.lblBewilligungszeitraum.StylePriority.UseTextAlignment = false;
this.lblBewilligungszeitraum.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.lblBewilligungszeitraum.WordWrap = false;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.InvoiceCustomerRO);

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@@ -75,6 +75,7 @@
<Compile Include="ServiceInvoiceReport.Designer.cs">
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
</Compile>
<Compile Include="Service\CustomVacationService.cs" />
<Compile Include="SettlementReport2.cs">
<SubType>Component</SubType>
</Compile>

View File

@@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using BeWo.Service.Core;
using BeWo.Service.Plugins;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using Utils = BS.Shared.Core.Utils;
namespace PhoenixBeWo.Service
{
public class CustomVacationService : VacationService
{
public override List<DateTime> GetFeiertage(int year)
{
var list = base.GetFeiertage(year);
list.Remove(new DateTime(year, 12, 24));
return list;
}
}
}

View File

@@ -149,7 +149,7 @@ namespace BeWo.Service.Invoicing
}
private List<InvoiceItemDC> CreateInvoiceItems(Settlement2DC si, IList<ApprovalPeriod> apList)
public virtual List<InvoiceItemDC> CreateInvoiceItems(Settlement2DC si, IList<ApprovalPeriod> apList)
{
List<InvoiceItemDC> iiList = new List<InvoiceItemDC>();
@@ -204,9 +204,15 @@ namespace BeWo.Service.Invoicing
}
if (rf > 0)
{
decimal totalAmount = 0;
// 28.10.2024 Änderung von Summe der pauschalen Leistungen zu Stundensatz x Faktor und Zwischenrundung
decimal totalAmountFW = 0;
decimal totalAmountAF = 0;
int rfFahrzeit = (int)Math.Min(20, rf);
decimal rfAusfall = rf - rfFahrzeit;
DateTime? start = DateTime.MaxValue;
DateTime? end = DateTime.MinValue;
decimal hours = 0;
decimal hr = 0;
foreach (var iii in iiList)
{
@@ -214,21 +220,20 @@ namespace BeWo.Service.Invoicing
start = iii.ItemPeriodStart;
if (iii.ItemPeriodEnd > end)
end = iii.ItemPeriodEnd;
totalAmount += iii.GrossAmountTotal ?? 0;
hours = iii.UnitCount.Value;
hr = iii.AmountPerUnit.Value;
totalAmountFW += Math.Round(Math.Round(hr * rfFahrzeit / 100, 2, MidpointRounding.AwayFromZero) * hours, 2, MidpointRounding.AwayFromZero);
totalAmountAF += Math.Round(Math.Round(hr * rfAusfall / 100, 2, MidpointRounding.AwayFromZero) * hours, 2, MidpointRounding.AwayFromZero);
}
//zzgl. Fahr+Wegezeiten (20 %)
var ii = new InvoiceItemDC();
int rfFahrzeit = (int)Math.Min(20, rf);
rf -= rfFahrzeit;
ii.ItemPeriodStart = start;
ii.ItemPeriodEnd = end;
ii.RateFactor = rfFahrzeit;
ii.AmountPerUnit = (totalAmount * rfFahrzeit) / 100;
ii.AmountPerUnit = totalAmountFW;
ii.UnitCount = 1;
ii.AmountTotal = Math.Round(ii.AmountPerUnit.Value * ii.UnitCount.Value, 2, MidpointRounding.AwayFromZero);
ii.AmountTotal = totalAmountFW;
ii.GrossAmountTotal = ii.AmountTotal;
ii.ItemDescription = "Fahrt- und Wegezeiten";
iiList.Add(ii);
@@ -241,9 +246,9 @@ namespace BeWo.Service.Invoicing
ii.ItemPeriodStart = start;
ii.ItemPeriodEnd = end;
ii.RateFactor = rf;
ii.AmountPerUnit = (totalAmount * rf) / 100;
ii.AmountPerUnit = totalAmountAF;
ii.UnitCount = 1;
ii.AmountTotal = Math.Round(ii.AmountPerUnit.Value * ii.UnitCount.Value, 2, MidpointRounding.AwayFromZero);
ii.AmountTotal = totalAmountAF;
ii.GrossAmountTotal = ii.AmountTotal;
ii.ItemDescription = "Ausfallzeiten Fehlkontakte";
@@ -251,7 +256,6 @@ namespace BeWo.Service.Invoicing
}
}
return iiList.OrderBy(ii => ii.ItemPeriodStart).ToList();
}
@@ -279,9 +283,11 @@ namespace BeWo.Service.Invoicing
{
base.InitApprovalPeriod(si, approvalPeriod);
approvalPeriod.Weeks = Math.Round(approvalPeriod.Days * 0.1427m, 2, MidpointRounding.AwayFromZero);
approvalPeriod.ApprovedTotal = Math.Round(approvalPeriod.Weeks * approvalPeriod.ApprovedPerUnit, 2, MidpointRounding.AwayFromZero);
if (approvalPeriod.ApprovalUnit == AccountingIntervalType.Weekly)
{
approvalPeriod.ApprovedTotal = Math.Round(approvalPeriod.Weeks * approvalPeriod.ApprovedPerUnit, 2, MidpointRounding.AwayFromZero);
}
approvalPeriod.ApprovedAmountTotal = Math.Round(approvalPeriod.ApprovedTotal * approvalPeriod.AmountPerUnit, 2, MidpointRounding.AwayFromZero);
}
}
}

View File

@@ -1215,8 +1215,11 @@ namespace BeWo.Service.Invoicing
var hrspan = hourlyRatesInSpanList.FirstOrDefault(ispan => ispan.Value.StartDate <= dt && dt <= ispan.Value.EndDate);
var rfspan = rateFactorInSpanList.FirstOrDefault(ispan => ispan.Value.StartDate <= dt && dt <= ispan.Value.EndDate);
var scap = c2s.ApprovalPeriodList.FirstOrDefault(iscap => iscap.StartDate <= dt && dt <= iscap.EndDate && (iscap.ApprovedBEPerInterval.HasValue || iscap.ApprovedBETotal.HasValue));
var scap = c2s.ApprovalPeriodList.FirstOrDefault(iscap => iscap.StartDate == dt && (iscap.ApprovedBEPerInterval.HasValue || iscap.ApprovedBETotal.HasValue));
if (scap == null)
{
scap = c2s.ApprovalPeriodList.FirstOrDefault(iscap => iscap.StartDate <= dt && dt <= iscap.EndDate && (iscap.ApprovedBEPerInterval.HasValue || iscap.ApprovedBETotal.HasValue));
}
if (hrspan.Key != null && hrspan.Key.CostRateValue.HasValue)
{
ap.AmountPerUnit = hrspan.Key.CostRateValue.Value;