diff --git a/ReportImp/AbwWeeger/AbwWeeger.csproj b/ReportImp/AbwWeeger/AbwWeeger.csproj
index cb0530c35..a40affba3 100644
--- a/ReportImp/AbwWeeger/AbwWeeger.csproj
+++ b/ReportImp/AbwWeeger/AbwWeeger.csproj
@@ -63,8 +63,6 @@
-
-
Component
diff --git a/ReportImp/BetreutesWohnenAmRheinReports/SettlementReport.Designer.cs b/ReportImp/BetreutesWohnenAmRheinReports/SettlementReport.Designer.cs
index 29fa9a592..49f18f400 100644
--- a/ReportImp/BetreutesWohnenAmRheinReports/SettlementReport.Designer.cs
+++ b/ReportImp/BetreutesWohnenAmRheinReports/SettlementReport.Designer.cs
@@ -33,6 +33,7 @@ namespace BeWo.BetreutesWohnenAmRheinReports
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung));
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+ this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
@@ -107,7 +108,6 @@ namespace BeWo.BetreutesWohnenAmRheinReports
this.xrTableRow29 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
@@ -142,9 +142,24 @@ namespace BeWo.BetreutesWohnenAmRheinReports
this.xrLabel_RecipientDivision,
this.xrLabel_RecipientContactPerson,
this.xrLabel1});
- this.ReportHeader.HeightF = 702F;
+ this.ReportHeader.HeightF = 686.375F;
this.ReportHeader.Name = "ReportHeader";
//
+ // xrLabel8
+ //
+ this.xrLabel8.BackColor = System.Drawing.Color.Transparent;
+ this.xrLabel8.CanShrink = true;
+ this.xrLabel8.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 448.9583F);
+ this.xrLabel8.Multiline = true;
+ this.xrLabel8.Name = "xrLabel8";
+ this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel8.SizeF = new System.Drawing.SizeF(683.5403F, 17F);
+ this.xrLabel8.StylePriority.UseBackColor = false;
+ this.xrLabel8.StylePriority.UseFont = false;
+ this.xrLabel8.Text = "Einrichtungsummer: 2000088651";
+ this.xrLabel8.WordWrap = false;
+ //
// xrPictureBox1
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
@@ -166,7 +181,7 @@ namespace BeWo.BetreutesWohnenAmRheinReports
//
// xrTable1
//
- this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 615.9583F);
+ this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 601.375F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow9,
@@ -338,7 +353,7 @@ namespace BeWo.BetreutesWohnenAmRheinReports
// xrLabel6
//
this.xrLabel6.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 540.9583F);
+ this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 526.375F);
this.xrLabel6.Multiline = true;
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -349,7 +364,7 @@ namespace BeWo.BetreutesWohnenAmRheinReports
// xrLabel5
//
this.xrLabel5.Font = new System.Drawing.Font("Verdana", 10F);
- this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 506.9583F);
+ this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 492.375F);
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F);
@@ -361,7 +376,7 @@ namespace BeWo.BetreutesWohnenAmRheinReports
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
this.xrLabel4.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 436.125F);
+ this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 431.9583F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -376,7 +391,7 @@ namespace BeWo.BetreutesWohnenAmRheinReports
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
this.xrLabel3.CanShrink = true;
this.xrLabel3.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 420.125F);
+ this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 415.9583F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(683.5403F, 16F);
@@ -390,7 +405,7 @@ namespace BeWo.BetreutesWohnenAmRheinReports
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
this.xrLabel2.CanShrink = true;
this.xrLabel2.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 395.125F);
+ this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 390.9583F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(400F, 17F);
@@ -401,7 +416,7 @@ namespace BeWo.BetreutesWohnenAmRheinReports
//
// xrTable2
//
- this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(400F, 395.125F);
+ this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(400F, 390.9583F);
this.xrTable2.Name = "xrTable2";
this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow7});
@@ -604,7 +619,7 @@ namespace BeWo.BetreutesWohnenAmRheinReports
//
// bottomMarginBand1
//
- this.bottomMarginBand1.HeightF = 50F;
+ this.bottomMarginBand1.HeightF = 39.95819F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// DetailReport
@@ -955,21 +970,6 @@ namespace BeWo.BetreutesWohnenAmRheinReports
this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell44.Weight = 0.25000002347506012D;
//
- // xrLabel8
- //
- this.xrLabel8.BackColor = System.Drawing.Color.Transparent;
- this.xrLabel8.CanShrink = true;
- this.xrLabel8.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 453.125F);
- this.xrLabel8.Multiline = true;
- this.xrLabel8.Name = "xrLabel8";
- this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel8.SizeF = new System.Drawing.SizeF(683.5403F, 17F);
- this.xrLabel8.StylePriority.UseBackColor = false;
- this.xrLabel8.StylePriority.UseFont = false;
- this.xrLabel8.Text = "Einrichtungsummer: 2000088651";
- this.xrLabel8.WordWrap = false;
- //
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -984,7 +984,7 @@ namespace BeWo.BetreutesWohnenAmRheinReports
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
- this.Margins = new System.Drawing.Printing.Margins(75, 39, 20, 50);
+ this.Margins = new System.Drawing.Printing.Margins(75, 39, 20, 40);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
diff --git a/ReportImp/BetreutesWohnenAmRheinReports/SettlementReport2.designer.cs b/ReportImp/BetreutesWohnenAmRheinReports/SettlementReport2.designer.cs
index 02b703368..c9759e660 100644
--- a/ReportImp/BetreutesWohnenAmRheinReports/SettlementReport2.designer.cs
+++ b/ReportImp/BetreutesWohnenAmRheinReports/SettlementReport2.designer.cs
@@ -33,6 +33,7 @@ namespace BeWo.BetreutesWohnenAmRheinReports.Neu
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung));
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+ this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
@@ -107,7 +108,6 @@ namespace BeWo.BetreutesWohnenAmRheinReports.Neu
this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
- this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
@@ -142,10 +142,25 @@ namespace BeWo.BetreutesWohnenAmRheinReports.Neu
this.xrTable1,
this.xrPictureBox1});
this.ReportHeader.Font = new System.Drawing.Font("Times New Roman", 9.75F);
- this.ReportHeader.HeightF = 668.75F;
+ this.ReportHeader.HeightF = 655.2084F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
+ // xrLabel9
+ //
+ this.xrLabel9.BackColor = System.Drawing.Color.Transparent;
+ this.xrLabel9.CanShrink = true;
+ this.xrLabel9.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(3.178914E-05F, 434F);
+ this.xrLabel9.Multiline = true;
+ this.xrLabel9.Name = "xrLabel9";
+ this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel9.SizeF = new System.Drawing.SizeF(683.5403F, 17F);
+ this.xrLabel9.StylePriority.UseBackColor = false;
+ this.xrLabel9.StylePriority.UseFont = false;
+ this.xrLabel9.Text = "Einrichtungsummer: 2000088651";
+ this.xrLabel9.WordWrap = false;
+ //
// xrLabel8
//
this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -277,7 +292,7 @@ namespace BeWo.BetreutesWohnenAmRheinReports.Neu
// xrLabel5
//
this.xrLabel5.Font = new System.Drawing.Font("Verdana", 10F);
- this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 485.75F);
+ this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(3.178914E-05F, 472.2083F);
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F);
@@ -287,7 +302,7 @@ namespace BeWo.BetreutesWohnenAmRheinReports.Neu
// xrLabel6
//
this.xrLabel6.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 518.75F);
+ this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(3.178914E-05F, 505.2083F);
this.xrLabel6.Multiline = true;
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -297,7 +312,7 @@ namespace BeWo.BetreutesWohnenAmRheinReports.Neu
//
// xrTable1
//
- this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 583.75F);
+ this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(3.178914E-05F, 570.2084F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow9,
@@ -606,7 +621,7 @@ namespace BeWo.BetreutesWohnenAmRheinReports.Neu
//
// bottomMarginBand1
//
- this.bottomMarginBand1.HeightF = 50F;
+ this.bottomMarginBand1.HeightF = 38.91665F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// DetailReport
@@ -957,21 +972,6 @@ namespace BeWo.BetreutesWohnenAmRheinReports.Neu
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
//
- // xrLabel9
- //
- this.xrLabel9.BackColor = System.Drawing.Color.Transparent;
- this.xrLabel9.CanShrink = true;
- this.xrLabel9.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(3.178914E-05F, 434F);
- this.xrLabel9.Multiline = true;
- this.xrLabel9.Name = "xrLabel9";
- this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel9.SizeF = new System.Drawing.SizeF(683.5403F, 17F);
- this.xrLabel9.StylePriority.UseBackColor = false;
- this.xrLabel9.StylePriority.UseFont = false;
- this.xrLabel9.Text = "Einrichtungsummer: 2000088651";
- this.xrLabel9.WordWrap = false;
- //
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -985,7 +985,7 @@ namespace BeWo.BetreutesWohnenAmRheinReports.Neu
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
- this.Margins = new System.Drawing.Printing.Margins(75, 38, 20, 50);
+ this.Margins = new System.Drawing.Printing.Margins(75, 38, 20, 39);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
diff --git a/Service/Invoicing/LWLBeWo67SettlementInvoiceCreation.cs b/Service/Invoicing/LWLBeWo67SettlementInvoiceCreation.cs
index 3a56e17e9..e4c528c94 100644
--- a/Service/Invoicing/LWLBeWo67SettlementInvoiceCreation.cs
+++ b/Service/Invoicing/LWLBeWo67SettlementInvoiceCreation.cs
@@ -79,10 +79,12 @@ namespace BeWo.Service.Invoicing
if (iRecord.GroupOid == null || !groupBookingDict.ContainsKey(iRecord.GroupOid.Value))
{
decimal rd = iRecord.RoundedDuration;
- if (iRecord.ServiceDescription.ServiceCategory.Percentage != 100)
+ var prozent = iRecord.ServiceDescription.ServiceCategory.Percentage;
+ if (iRecord.ServiceDescription.Percentage.HasValue)
{
- rd = (rd * iRecord.ServiceDescription.ServiceCategory.Percentage) / 100;
+ prozent = iRecord.ServiceDescription.Percentage.Value;
}
+ rd = (rd * prozent) / 100;
var ap = apList.FirstOrDefault(iap => iap.PeriodStartDate <= iRecord.Start && (iap.PeriodEndDate == DateTime.MaxValue || iRecord.Start < iap.PeriodEndDate.AddDays(1)));
@@ -100,14 +102,9 @@ namespace BeWo.Service.Invoicing
}
flmCleared += rd;
-
-
ap.RecordedMinutes += durationToAdd;
}
-
-
-
if (iRecord.GroupOid != null && !groupBookingDict.ContainsKey(iRecord.GroupOid.Value))
{
groupBookingDict.Add(iRecord.GroupOid.Value, true);
diff --git a/Service/Invoicing/LWLSettlementInvoiceCreation.cs b/Service/Invoicing/LWLSettlementInvoiceCreation.cs
index 21c5fd96b..bb82c8a34 100644
--- a/Service/Invoicing/LWLSettlementInvoiceCreation.cs
+++ b/Service/Invoicing/LWLSettlementInvoiceCreation.cs
@@ -93,11 +93,12 @@ namespace BeWo.Service.Invoicing
if (iRecord.GroupOid == null || !groupBookingDict.ContainsKey(iRecord.GroupOid.Value))
{
decimal rd = iRecord.RoundedDuration;
- if (iRecord.ServiceDescription.ServiceCategory.Percentage != 100)
+ var prozent = iRecord.ServiceDescription.ServiceCategory.Percentage;
+ if (iRecord.ServiceDescription.Percentage.HasValue)
{
- rd = (rd * iRecord.ServiceDescription.ServiceCategory.Percentage) / 100;
+ prozent = iRecord.ServiceDescription.Percentage.Value;
}
-
+ rd = (rd * prozent) / 100;
var ap = apList.FirstOrDefault(
iap =>
diff --git a/Service/Invoicing/SettlementInvoiceCreation.cs b/Service/Invoicing/SettlementInvoiceCreation.cs
index d73fea4f6..0aa3b6d30 100644
--- a/Service/Invoicing/SettlementInvoiceCreation.cs
+++ b/Service/Invoicing/SettlementInvoiceCreation.cs
@@ -409,10 +409,12 @@ namespace BeWo.Service.Invoicing
if (iRecord.GroupOid == null || !groupBookingDict.ContainsKey(iRecord.GroupOid.Value))
{
decimal rd = iRecord.RoundedDuration;
- if (iRecord.ServiceDescription.ServiceCategory.Percentage != 100)
+ var prozent = iRecord.ServiceDescription.ServiceCategory.Percentage;
+ if (iRecord.ServiceDescription.Percentage.HasValue)
{
- rd = (rd*iRecord.ServiceDescription.ServiceCategory.Percentage)/100;
+ prozent = iRecord.ServiceDescription.Percentage.Value;
}
+ rd = (rd * prozent) / 100;
decimal duration = rd/60;
if (si.RecordedBillableFLSBrutto == null)
@@ -772,10 +774,13 @@ namespace BeWo.Service.Invoicing
foreach (var ar in accountingPeriod.ServiceRecordsInPeriod)
{
var rd = ar.RoundedDuration;
- if (ar.ServiceDescription.Category.Percentage != 100)
+ var prozent = ar.ServiceDescription.Category.Percentage;
+ if (ar.ServiceDescription.Percentage.HasValue)
{
- rd = (rd*ar.ServiceDescription.Category.Percentage)/100;
+ prozent = ar.ServiceDescription.Percentage.Value;
}
+ rd = (rd * prozent) / 100;
+
minutesTotal += rd;
}