diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index 1486f5f29..9643dfa4d 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -43,13 +43,13 @@
de-DE
BeWoPlaner
ownSoft GmbH
- 2.0.1.232
+ 2.0.1.233
true
publish.htm
false
true
- 232
- 2.0.1.232
+ 234
+ 2.0.1.%2a
false
true
true
diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs
index 2373dc680..b0af4794e 100644
--- a/BeWo/BeWoApp.xaml.cs
+++ b/BeWo/BeWoApp.xaml.cs
@@ -49,8 +49,8 @@ namespace BeWo
public static LoginControl LoginControl;
public static MainControl MainControl;
- public static string ShortVersion = "3.19";
- public static string Version = "Version 3.19";
+ public static string ShortVersion = "3.20";
+ public static string Version = "Version 3.20";
public static int RenderTier = 0;
diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml b/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml
index 786c6d75f..6a06abf2f 100644
--- a/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml
+++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml
@@ -250,7 +250,7 @@
-
+
diff --git a/Controls/Controls.csproj b/Controls/Controls.csproj
index d07155d42..615be4556 100644
--- a/Controls/Controls.csproj
+++ b/Controls/Controls.csproj
@@ -75,12 +75,18 @@
false
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
3.0
diff --git a/ReportImp/ChristianWilke/Properties/licenses.licx b/ReportImp/ChristianWilke/Properties/licenses.licx
index e69de29bb..f98ef57fd 100644
--- a/ReportImp/ChristianWilke/Properties/licenses.licx
+++ b/ReportImp/ChristianWilke/Properties/licenses.licx
@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/ReportImp/ChristianWilke/ServiceInvoiceReport.Designer.cs b/ReportImp/ChristianWilke/ServiceInvoiceReport.Designer.cs
index bc65b17d6..2035032fd 100644
--- a/ReportImp/ChristianWilke/ServiceInvoiceReport.Designer.cs
+++ b/ReportImp/ChristianWilke/ServiceInvoiceReport.Designer.cs
@@ -28,854 +28,865 @@ namespace ChristianWilke
///
private void InitializeComponent()
{
- this.components = new System.ComponentModel.Container();
- this.Detail = new DevExpress.XtraReports.UI.DetailBand();
- this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
- this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
- this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
- this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
- this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
- this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
- this.lblAbrechnungszeitraum = new DevExpress.XtraReports.UI.XRLabel();
- this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
- this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
- this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
- this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
- this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
- this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
- this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell();
- this.DetailReport2 = new DevExpress.XtraReports.UI.DetailReportBand();
- this.Detail3 = new DevExpress.XtraReports.UI.DetailBand();
- this.xrTable6 = new DevExpress.XtraReports.UI.XRTable();
- this.xrTableRow25 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
- this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
- this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
- 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.xrTable5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
- //
- // Detail
- //
- this.Detail.HeightF = 0F;
- this.Detail.Name = "Detail";
- this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
- this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
- //
- // ReportHeader
- //
- this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F);
- this.ReportHeader.HeightF = 0F;
- this.ReportHeader.Name = "ReportHeader";
- this.ReportHeader.StylePriority.UseFont = false;
- //
- // ruleRateFactorNull
- //
- this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
- this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
- this.ruleRateFactorNull.Name = "ruleRateFactorNull";
- //
- // topMarginBand1
- //
- this.topMarginBand1.HeightF = 222.5F;
- this.topMarginBand1.Name = "topMarginBand1";
- //
- // bottomMarginBand1
- //
- this.bottomMarginBand1.HeightF = 120F;
- this.bottomMarginBand1.Name = "bottomMarginBand1";
- //
- // Page1
- //
- this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
- this.xrLabel17,
- this.xrLabel16,
- this.xrLabel4,
- this.xrLabel8,
- this.xrLabel6,
- this.xrLabel13,
- this.xrLabel10,
- this.xrLabel7,
- this.xrLabel3,
- this.xrLabel2,
- this.xrLabel5,
- this.lblAbrechnungszeitraum,
- this.xrTable2});
- this.Page1.Font = new System.Drawing.Font("Verdana", 10F);
- this.Page1.HeightF = 399.9167F;
- this.Page1.Name = "Page1";
- this.Page1.StylePriority.UseFont = false;
- //
- // xrLabel17
- //
- this.xrLabel17.BackColor = System.Drawing.Color.Transparent;
- this.xrLabel17.CanShrink = true;
- this.xrLabel17.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold);
- this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 281.8751F);
- this.xrLabel17.Multiline = true;
- this.xrLabel17.Name = "xrLabel17";
- this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel17.SizeF = new System.Drawing.SizeF(650F, 17F);
- this.xrLabel17.StylePriority.UseBackColor = false;
- this.xrLabel17.StylePriority.UseFont = false;
- this.xrLabel17.Text = "Betreff: Rechnung";
- this.xrLabel17.WordWrap = false;
- //
- // xrLabel16
- //
- this.xrLabel16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerReferenceNumber")});
- this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(298.9583F, 178.0834F);
- this.xrLabel16.Name = "xrLabel16";
- this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel16.SizeF = new System.Drawing.SizeF(149.2916F, 17F);
- this.xrLabel16.StylePriority.UseFont = false;
- //
- // xrLabel4
- //
- this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(555.9168F, 178.0834F);
- this.xrLabel4.Name = "xrLabel4";
- this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel4.SizeF = new System.Drawing.SizeF(94.08334F, 17F);
- this.xrLabel4.StylePriority.UseFont = false;
- this.xrLabel4.StylePriority.UseTextAlignment = false;
- this.xrLabel4.Text = "[InvoiceDate]";
- this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
- //
- // xrLabel8
- //
- this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 178.0834F);
- this.xrLabel8.Name = "xrLabel8";
- this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel8.SizeF = new System.Drawing.SizeF(175F, 17F);
- this.xrLabel8.StylePriority.UseFont = false;
- this.xrLabel8.Text = "L&W";
- //
- // xrLabel6
- //
- this.xrLabel6.Font = new System.Drawing.Font("Verdana", 8F);
- this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(579.8749F, 161.0833F);
- this.xrLabel6.Name = "xrLabel6";
- this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel6.SizeF = new System.Drawing.SizeF(70.125F, 16.99998F);
- this.xrLabel6.StylePriority.UseFont = false;
- this.xrLabel6.StylePriority.UseTextAlignment = false;
- this.xrLabel6.Text = "Datum";
- this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
- //
- // xrLabel13
- //
- this.xrLabel13.Font = new System.Drawing.Font("Verdana", 8F);
- this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(298.9583F, 161.0833F);
- this.xrLabel13.Name = "xrLabel13";
- this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel13.SizeF = new System.Drawing.SizeF(69.08334F, 16.99998F);
- this.xrLabel13.StylePriority.UseFont = false;
- this.xrLabel13.Text = "Ihr Zeichen";
- //
- // xrLabel10
- //
- this.xrLabel10.Font = new System.Drawing.Font("Verdana", 8F);
- this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 161.0833F);
- this.xrLabel10.Name = "xrLabel10";
- this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel10.SizeF = new System.Drawing.SizeF(94.08334F, 16.99998F);
- this.xrLabel10.StylePriority.UseFont = false;
- this.xrLabel10.Text = "Mein Zeichen";
- //
- // xrLabel7
- //
- this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
- this.xrLabel7.Multiline = true;
- this.xrLabel7.Name = "xrLabel7";
- this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel7.SizeF = new System.Drawing.SizeF(317F, 111.5F);
- this.xrLabel7.StylePriority.UseFont = false;
- this.xrLabel7.Text = "[RecipientOrganisation]\r\n[RecipientContactPerson]\r\n[RecipientDivision]\r\n[Recipien" +
- "tStreet]\r\n[RecipientPostCodeAndTown]";
- //
- // xrLabel3
- //
- 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, 261.8751F);
- this.xrLabel3.Name = "xrLabel3";
- this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 20F);
- this.xrLabel3.StylePriority.UseBackColor = false;
- this.xrLabel3.StylePriority.UseFont = false;
- this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [CustomerSalutation] [CustomerName]";
- this.xrLabel3.WordWrap = false;
- //
- // xrLabel2
- //
- 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, 241.875F);
- this.xrLabel2.Name = "xrLabel2";
- this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel2.SizeF = new System.Drawing.SizeF(650F, 20F);
- this.xrLabel2.StylePriority.UseBackColor = false;
- this.xrLabel2.StylePriority.UseFont = false;
- this.xrLabel2.Text = "Rechnung Nr. [InvoiceNumber]";
- this.xrLabel2.WordWrap = false;
- //
- // xrLabel5
- //
- this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 343.3333F);
- 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);
- this.xrLabel5.StylePriority.UseFont = false;
- this.xrLabel5.Text = "Sehr geehrte Damen und Herren,";
- //
- // lblAbrechnungszeitraum
- //
- this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 368.3333F);
- this.lblAbrechnungszeitraum.Multiline = true;
- this.lblAbrechnungszeitraum.Name = "lblAbrechnungszeitraum";
- this.lblAbrechnungszeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.lblAbrechnungszeitraum.SizeF = new System.Drawing.SizeF(649.9999F, 31.58334F);
- this.lblAbrechnungszeitraum.StylePriority.UseFont = false;
- this.lblAbrechnungszeitraum.Text = "hiermit berechnen wir für den ... folgende erbrachte Tätigkeiten:";
- //
- // xrTable2
- //
- this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(362.5F, 0F);
- this.xrTable2.Name = "xrTable2";
- this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
- this.xrTableRow2,
- this.xrTableRow5,
- this.xrTableRow4,
- this.xrTableRow3,
- this.xrTableRow1,
- this.xrTableRow6,
- this.xrTableRow8});
- this.xrTable2.SizeF = new System.Drawing.SizeF(287.5001F, 134F);
- //
- // xrTableRow2
- //
- this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell4});
- this.xrTableRow2.Name = "xrTableRow2";
- this.xrTableRow2.Weight = 0.13245033112582783D;
- //
- // xrTableCell4
- //
- this.xrTableCell4.CanShrink = true;
- this.xrTableCell4.Name = "xrTableCell4";
- this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTableCell4.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
- this.xrTableCell4.StylePriority.UseFont = false;
- this.xrTableCell4.StylePriority.UseTextAlignment = false;
- this.xrTableCell4.Text = "Ihr(e) Ansprechpartner(in):";
- this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
- this.xrTableCell4.Weight = 1D;
- //
- // xrTableRow5
- //
- this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell13});
- this.xrTableRow5.Name = "xrTableRow5";
- this.xrTableRow5.Weight = 0.13245033112582783D;
- //
- // xrTableCell13
- //
- this.xrTableCell13.CanShrink = true;
- this.xrTableCell13.Name = "xrTableCell13";
- this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTableCell13.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
- this.xrTableCell13.StylePriority.UseFont = false;
- this.xrTableCell13.StylePriority.UseTextAlignment = false;
- this.xrTableCell13.Text = "[SenderContactPerson]";
- this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
- this.xrTableCell13.Weight = 1D;
- //
- // xrTableRow4
- //
- this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell11});
- this.xrTableRow4.Name = "xrTableRow4";
- this.xrTableRow4.Weight = 0.13245033112582783D;
- //
- // xrTableCell11
- //
- this.xrTableCell11.CanShrink = true;
- this.xrTableCell11.Name = "xrTableCell11";
- this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTableCell11.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
- this.xrTableCell11.StylePriority.UseFont = false;
- this.xrTableCell11.StylePriority.UseTextAlignment = false;
- this.xrTableCell11.Text = "[SenderContactPersonDivision]";
- this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
- this.xrTableCell11.Weight = 1D;
- //
- // xrTableRow3
- //
- this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell8});
- this.xrTableRow3.Name = "xrTableRow3";
- this.xrTableRow3.Weight = 0.13245033112582783D;
- //
- // xrTableCell8
- //
- this.xrTableCell8.CanShrink = true;
- this.xrTableCell8.Name = "xrTableCell8";
- this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTableCell8.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
- this.xrTableCell8.StylePriority.UseFont = false;
- this.xrTableCell8.StylePriority.UseTextAlignment = false;
- this.xrTableCell8.Text = "[SenderContactPersonMail]";
- this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
- this.xrTableCell8.Weight = 1D;
- //
- // xrTableRow1
- //
- this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell1});
- this.xrTableRow1.Name = "xrTableRow1";
- this.xrTableRow1.Weight = 0.13245033112582783D;
- //
- // xrTableCell1
- //
- this.xrTableCell1.CanShrink = true;
- this.xrTableCell1.Name = "xrTableCell1";
- this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTableCell1.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
- this.xrTableCell1.StylePriority.UseFont = false;
- this.xrTableCell1.StylePriority.UseTextAlignment = false;
- this.xrTableCell1.Text = "[SenderContactPersonPhone]";
- this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
- this.xrTableCell1.Weight = 1D;
- //
- // xrTableRow6
- //
- this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell2});
- this.xrTableRow6.Name = "xrTableRow6";
- this.xrTableRow6.Weight = 0.11258278145695365D;
- //
- // xrTableCell2
- //
- this.xrTableCell2.CanShrink = true;
- this.xrTableCell2.Name = "xrTableCell2";
- this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTableCell2.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
- this.xrTableCell2.StylePriority.UseFont = false;
- this.xrTableCell2.StylePriority.UseTextAlignment = false;
- this.xrTableCell2.Text = "[SenderContactPersonFax]";
- this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
- this.xrTableCell2.Weight = 1D;
- //
- // xrTableRow8
- //
- this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell5});
- this.xrTableRow8.Name = "xrTableRow8";
- this.xrTableRow8.Weight = 0.11258278145695365D;
- //
- // xrTableCell5
- //
- this.xrTableCell5.Name = "xrTableCell5";
- this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTableCell5.Weight = 1D;
- //
- // xrLabel15
- //
- this.xrLabel15.Font = new System.Drawing.Font("Verdana", 10F);
- this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 127.0833F);
- this.xrLabel15.Name = "xrLabel15";
- this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel15.SizeF = new System.Drawing.SizeF(175F, 17F);
- this.xrLabel15.StylePriority.UseFont = false;
- this.xrLabel15.Text = "Mit freundlichen Grüßen";
- //
- // xrTable4
- //
- this.xrTable4.Font = new System.Drawing.Font("Verdana", 10F);
- this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 71.875F);
- this.xrTable4.Name = "xrTable4";
- this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
- this.xrTableRow10,
- this.xrTableRow14});
- this.xrTable4.SizeF = new System.Drawing.SizeF(650F, 26F);
- this.xrTable4.StylePriority.UseFont = false;
- //
- // xrTableRow10
- //
- this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell9});
- this.xrTableRow10.Name = "xrTableRow10";
- this.xrTableRow10.Weight = 0.38095238095238093D;
- //
- // xrTableCell9
- //
- this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")});
- this.xrTableCell9.Name = "xrTableCell9";
- this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTableCell9.StylePriority.UsePadding = false;
- this.xrTableCell9.Text = "xrTableCell1";
- this.xrTableCell9.Weight = 3D;
- //
- // xrTableRow14
- //
- this.xrTableRow14.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell12});
- this.xrTableRow14.Name = "xrTableRow14";
- this.xrTableRow14.Weight = 0.23809523809523808D;
- //
- // xrTableCell12
- //
- this.xrTableCell12.Name = "xrTableCell12";
- this.xrTableCell12.Weight = 3D;
- //
- // xrLabel14
- //
- this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "CreatorName")});
- this.xrLabel14.Font = new System.Drawing.Font("Verdana", 10F);
- this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 196.2499F);
- this.xrLabel14.Name = "xrLabel14";
- this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel14.SizeF = new System.Drawing.SizeF(225F, 17F);
- this.xrLabel14.StylePriority.UseFont = false;
- this.xrLabel14.Text = "[CreatorName]";
- //
- // DetailReport
- //
- this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
- this.Detail1,
- this.DetailReport2});
- this.DetailReport.DataMember = "ServiceInvoicePeriods";
- this.DetailReport.DataSource = this.bindingSource1;
- this.DetailReport.Level = 0;
- this.DetailReport.Name = "DetailReport";
- //
- // Detail1
- //
- this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
- this.xrTable5});
- this.Detail1.HeightF = 25F;
- this.Detail1.Name = "Detail1";
- //
- // xrTable5
- //
- 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);
- //
- // xrTableRow23
- //
- this.xrTableRow23.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell32,
- this.xrTableCell37,
- this.xrTableCell35,
- this.xrTableCell33,
- this.xrTableCell36,
- this.xrTableCell38,
- this.xrTableCell34});
- this.xrTableRow23.Name = "xrTableRow23";
- this.xrTableRow23.Weight = 1D;
- //
- // xrTableCell32
- //
- this.xrTableCell32.BackColor = System.Drawing.Color.Gainsboro;
- this.xrTableCell32.BorderColor = System.Drawing.Color.DarkGray;
- this.xrTableCell32.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
- | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableCell32.Name = "xrTableCell32";
- this.xrTableCell32.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
- this.xrTableCell32.StylePriority.UseBackColor = false;
- this.xrTableCell32.StylePriority.UseBorderColor = false;
- this.xrTableCell32.StylePriority.UseBorders = false;
- this.xrTableCell32.StylePriority.UsePadding = false;
- this.xrTableCell32.StylePriority.UseTextAlignment = false;
- this.xrTableCell32.Text = "Zeitraum";
- this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
- this.xrTableCell32.Weight = 0.62463077449375981D;
- //
- // xrTableCell37
- //
- this.xrTableCell37.BackColor = System.Drawing.Color.Gainsboro;
- this.xrTableCell37.BorderColor = System.Drawing.Color.DarkGray;
- this.xrTableCell37.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
- | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableCell37.Name = "xrTableCell37";
- this.xrTableCell37.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
- this.xrTableCell37.StylePriority.UseBackColor = false;
- this.xrTableCell37.StylePriority.UseBorderColor = false;
- this.xrTableCell37.StylePriority.UseBorders = false;
- this.xrTableCell37.StylePriority.UsePadding = false;
- this.xrTableCell37.StylePriority.UseTextAlignment = false;
- this.xrTableCell37.Text = "Leistung";
- this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
- this.xrTableCell37.Weight = 0.85081236260328186D;
- //
- // xrTableCell35
- //
- this.xrTableCell35.BackColor = System.Drawing.Color.Gainsboro;
- this.xrTableCell35.BorderColor = System.Drawing.Color.DarkGray;
- this.xrTableCell35.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
- | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableCell35.Name = "xrTableCell35";
- this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
- this.xrTableCell35.StylePriority.UseBackColor = false;
- this.xrTableCell35.StylePriority.UseBorderColor = false;
- this.xrTableCell35.StylePriority.UseBorders = false;
- this.xrTableCell35.StylePriority.UsePadding = false;
- this.xrTableCell35.StylePriority.UseTextAlignment = false;
- this.xrTableCell35.Text = "Satz";
- this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell35.Weight = 0.23245943032832414D;
- //
- // xrTableCell33
- //
- this.xrTableCell33.BackColor = System.Drawing.Color.Gainsboro;
- this.xrTableCell33.BorderColor = System.Drawing.Color.DarkGray;
- this.xrTableCell33.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
- | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableCell33.Name = "xrTableCell33";
- this.xrTableCell33.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
- this.xrTableCell33.StylePriority.UseBackColor = false;
- this.xrTableCell33.StylePriority.UseBorderColor = false;
- this.xrTableCell33.StylePriority.UseBorders = false;
- this.xrTableCell33.StylePriority.UsePadding = false;
- this.xrTableCell33.StylePriority.UseTextAlignment = false;
- this.xrTableCell33.Text = "Stunden";
- this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell33.Weight = 0.2893277257020575D;
- //
- // xrTableCell36
- //
- this.xrTableCell36.BackColor = System.Drawing.Color.Gainsboro;
- this.xrTableCell36.BorderColor = System.Drawing.Color.DarkGray;
- this.xrTableCell36.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
- | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableCell36.Name = "xrTableCell36";
- this.xrTableCell36.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
- this.xrTableCell36.StylePriority.UseBackColor = false;
- this.xrTableCell36.StylePriority.UseBorderColor = false;
- this.xrTableCell36.StylePriority.UseBorders = false;
- this.xrTableCell36.StylePriority.UsePadding = false;
- this.xrTableCell36.StylePriority.UseTextAlignment = false;
- this.xrTableCell36.Text = "Betrag";
- this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell36.Weight = 0.26310971709438763D;
- //
- // xrTableCell38
- //
- this.xrTableCell38.BackColor = System.Drawing.Color.Gainsboro;
- this.xrTableCell38.BorderColor = System.Drawing.Color.DarkGray;
- this.xrTableCell38.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
- | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableCell38.Name = "xrTableCell38";
- this.xrTableCell38.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
- this.xrTableCell38.StylePriority.UseBackColor = false;
- this.xrTableCell38.StylePriority.UseBorderColor = false;
- this.xrTableCell38.StylePriority.UseBorders = false;
- this.xrTableCell38.StylePriority.UsePadding = false;
- this.xrTableCell38.StylePriority.UseTextAlignment = false;
- this.xrTableCell38.Text = "pausch Fakt.";
- this.xrTableCell38.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell38.Weight = 0.42042083402151886D;
- //
- // xrTableCell34
- //
- this.xrTableCell34.BackColor = System.Drawing.Color.Gainsboro;
- this.xrTableCell34.BorderColor = System.Drawing.Color.DarkGray;
- this.xrTableCell34.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
- | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableCell34.Name = "xrTableCell34";
- this.xrTableCell34.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
- this.xrTableCell34.StylePriority.UseBackColor = false;
- this.xrTableCell34.StylePriority.UseBorderColor = false;
- this.xrTableCell34.StylePriority.UseBorders = false;
- this.xrTableCell34.StylePriority.UsePadding = false;
- this.xrTableCell34.StylePriority.UseTextAlignment = false;
- this.xrTableCell34.Text = "Gesamt";
- this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell34.Weight = 0.31923915575667006D;
- //
- // DetailReport2
- //
- this.DetailReport2.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
- this.Detail3,
- this.GroupFooter1});
- this.DetailReport2.DataMember = "ServiceInvoicePeriods.ServiceInvoiceItems";
- this.DetailReport2.DataSource = this.bindingSource1;
- this.DetailReport2.Level = 0;
- this.DetailReport2.Name = "DetailReport2";
- this.DetailReport2.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand;
- //
- // Detail3
- //
- this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
- this.xrTable6});
- this.Detail3.HeightF = 25F;
- this.Detail3.Name = "Detail3";
- //
- // xrTable6
- //
- this.xrTable6.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- 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.StylePriority.UseFont = false;
- //
- // xrTableRow25
- //
- this.xrTableRow25.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell40,
- this.xrTableCell42,
- this.xrTableCell43,
- this.xrTableCell44,
- this.xrTableCell45,
- this.xrTableCell46,
- this.xrTableCell47});
- this.xrTableRow25.Name = "xrTableRow25";
- this.xrTableRow25.Weight = 1D;
- //
- // xrTableCell40
- //
- this.xrTableCell40.BorderColor = System.Drawing.Color.DarkGray;
- this.xrTableCell40.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Duration")});
- this.xrTableCell40.Name = "xrTableCell40";
- this.xrTableCell40.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
- this.xrTableCell40.StylePriority.UseBorderColor = false;
- this.xrTableCell40.StylePriority.UseBorders = false;
- this.xrTableCell40.StylePriority.UsePadding = false;
- this.xrTableCell40.StylePriority.UseTextAlignment = false;
- this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
- this.xrTableCell40.Weight = 0.62463084211025488D;
- //
- // xrTableCell42
- //
- this.xrTableCell42.BorderColor = System.Drawing.Color.DarkGray;
- this.xrTableCell42.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.ServiceDescription")});
- this.xrTableCell42.Name = "xrTableCell42";
- this.xrTableCell42.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
- this.xrTableCell42.StylePriority.UseBorderColor = false;
- this.xrTableCell42.StylePriority.UseBorders = false;
- this.xrTableCell42.StylePriority.UsePadding = false;
- this.xrTableCell42.StylePriority.UseTextAlignment = false;
- this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
- this.xrTableCell42.Weight = 0.85081229498678679D;
- //
- // xrTableCell43
- //
- this.xrTableCell43.BorderColor = System.Drawing.Color.DarkGray;
- 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}")});
- this.xrTableCell43.Name = "xrTableCell43";
- this.xrTableCell43.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
- this.xrTableCell43.StylePriority.UseBorderColor = false;
- this.xrTableCell43.StylePriority.UseBorders = false;
- this.xrTableCell43.StylePriority.UsePadding = false;
- this.xrTableCell43.StylePriority.UseTextAlignment = false;
- this.xrTableCell43.Text = "xrTableCell43";
- this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell43.Weight = 0.23245943032832414D;
- //
- // xrTableCell44
- //
- this.xrTableCell44.BorderColor = System.Drawing.Color.DarkGray;
- this.xrTableCell44.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Hours", "{0:0.##}")});
- this.xrTableCell44.Name = "xrTableCell44";
- this.xrTableCell44.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
- this.xrTableCell44.StylePriority.UseBorderColor = false;
- this.xrTableCell44.StylePriority.UseBorders = false;
- this.xrTableCell44.StylePriority.UsePadding = false;
- this.xrTableCell44.StylePriority.UseTextAlignment = false;
- this.xrTableCell44.Text = "xrTableCell44";
- this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell44.Weight = 0.2893277257020575D;
- //
- // xrTableCell45
- //
- this.xrTableCell45.BorderColor = System.Drawing.Color.DarkGray;
- 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}")});
- this.xrTableCell45.Name = "xrTableCell45";
- this.xrTableCell45.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
- this.xrTableCell45.StylePriority.UseBorderColor = false;
- this.xrTableCell45.StylePriority.UseBorders = false;
- this.xrTableCell45.StylePriority.UsePadding = false;
- this.xrTableCell45.StylePriority.UseTextAlignment = false;
- this.xrTableCell45.Text = "xrTableCell45";
- this.xrTableCell45.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell45.Weight = 0.26310971709438763D;
- //
- // xrTableCell46
- //
- this.xrTableCell46.BorderColor = System.Drawing.Color.DarkGray;
- this.xrTableCell46.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableCell46.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.RateFactor")});
- this.xrTableCell46.Name = "xrTableCell46";
- this.xrTableCell46.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
- this.xrTableCell46.StylePriority.UseBorderColor = false;
- this.xrTableCell46.StylePriority.UseBorders = false;
- this.xrTableCell46.StylePriority.UsePadding = false;
- this.xrTableCell46.StylePriority.UseTextAlignment = false;
- this.xrTableCell46.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell46.Weight = 0.42042083402151886D;
- //
- // xrTableCell47
- //
- this.xrTableCell47.BorderColor = System.Drawing.Color.DarkGray;
- this.xrTableCell47.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
- | 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.Name = "xrTableCell47";
- this.xrTableCell47.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
- this.xrTableCell47.StylePriority.UseBorderColor = false;
- this.xrTableCell47.StylePriority.UseBorders = false;
- this.xrTableCell47.StylePriority.UsePadding = false;
- this.xrTableCell47.StylePriority.UseTextAlignment = false;
- this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell47.Weight = 0.31923915575667006D;
- //
- // GroupFooter1
- //
- this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
- this.xrLabel11,
- this.xrLabel1,
- this.xrTable4,
- this.xrLabel14,
- this.xrLabel15});
- this.GroupFooter1.HeightF = 223.2499F;
- this.GroupFooter1.Name = "GroupFooter1";
- //
- // xrLabel11
- //
- this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 37.5F);
- this.xrLabel11.Name = "xrLabel11";
- this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel11.SizeF = new System.Drawing.SizeF(573.9583F, 17F);
- this.xrLabel11.StylePriority.UseFont = false;
- this.xrLabel11.Text = "Rechnung ist bei Zugang fällig. Vielen Dank!";
- //
- // xrLabel1
- //
- this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim", "Gesamtsumme: {0}")});
- this.xrLabel1.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Bold);
- this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(420.9999F, 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);
- this.xrLabel1.StylePriority.UseFont = false;
- this.xrLabel1.StylePriority.UsePadding = false;
- this.xrLabel1.StylePriority.UseTextAlignment = false;
- this.xrLabel1.Text = "xrLabel1";
- this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- //
- // bindingSource1
- //
- this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
- //
- // ServiceInvoiceReport
- //
- this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
- this.Detail,
- this.ReportHeader,
- this.topMarginBand1,
- this.bottomMarginBand1,
- this.Page1,
- this.DetailReport});
- this.DataSource = this.bindingSource1;
- this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
- this.Font = new System.Drawing.Font("Verdana", 10F);
- this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
- this.ruleRateFactorNull});
- this.Margins = new System.Drawing.Printing.Margins(75, 75, 222, 120);
- this.PageHeight = 1169;
- this.PageWidth = 827;
- this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
- this.Version = "17.1";
- ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).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)).EndInit();
-
+ this.components = new System.ComponentModel.Container();
+ 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.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
+ this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+ this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+ this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
+ this.lblAbrechnungszeitraum = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
+ this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
+ this.DetailReport2 = new DevExpress.XtraReports.UI.DetailReportBand();
+ this.Detail3 = new DevExpress.XtraReports.UI.DetailBand();
+ this.xrTable6 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow25 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+ this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
+ this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+ this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
+ //
+ // Detail
+ //
+ this.Detail.HeightF = 0F;
+ this.Detail.Name = "Detail";
+ this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+ this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+ //
+ // ReportHeader
+ //
+ this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
+ this.ReportHeader.HeightF = 0F;
+ this.ReportHeader.Name = "ReportHeader";
+ this.ReportHeader.StylePriority.UseFont = false;
+ //
+ // ruleRateFactorNull
+ //
+ this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
+ this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
+ this.ruleRateFactorNull.Name = "ruleRateFactorNull";
+ //
+ // topMarginBand1
+ //
+ this.topMarginBand1.HeightF = 222.5F;
+ this.topMarginBand1.Name = "topMarginBand1";
+ //
+ // bottomMarginBand1
+ //
+ this.bottomMarginBand1.HeightF = 120F;
+ this.bottomMarginBand1.Name = "bottomMarginBand1";
+ //
+ // Page1
+ //
+ this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTable5,
+ this.xrLabel17,
+ this.xrLabel16,
+ this.xrLabel4,
+ this.xrLabel8,
+ this.xrLabel6,
+ this.xrLabel13,
+ this.xrLabel10,
+ this.xrLabel7,
+ this.xrLabel3,
+ this.xrLabel2,
+ this.xrLabel5,
+ this.lblAbrechnungszeitraum,
+ this.xrTable2});
+ this.Page1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
+ this.Page1.HeightF = 430.9166F;
+ this.Page1.Name = "Page1";
+ this.Page1.StylePriority.UseFont = false;
+ //
+ // xrLabel17
+ //
+ this.xrLabel17.BackColor = System.Drawing.Color.Transparent;
+ this.xrLabel17.CanShrink = true;
+ this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
+ this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 281.8751F);
+ this.xrLabel17.Multiline = true;
+ this.xrLabel17.Name = "xrLabel17";
+ this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel17.SizeF = new System.Drawing.SizeF(676.8331F, 17F);
+ this.xrLabel17.StylePriority.UseBackColor = false;
+ this.xrLabel17.StylePriority.UseFont = false;
+ this.xrLabel17.Text = "Betreff: Rechnung";
+ this.xrLabel17.WordWrap = false;
+ //
+ // xrLabel16
+ //
+ this.xrLabel16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerReferenceNumber")});
+ this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(298.9583F, 178.0834F);
+ this.xrLabel16.Name = "xrLabel16";
+ this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel16.SizeF = new System.Drawing.SizeF(149.2916F, 17F);
+ this.xrLabel16.StylePriority.UseFont = false;
+ //
+ // xrLabel4
+ //
+ this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(555.9168F, 178.0834F);
+ this.xrLabel4.Name = "xrLabel4";
+ this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel4.SizeF = new System.Drawing.SizeF(94.08334F, 17F);
+ this.xrLabel4.StylePriority.UseFont = false;
+ this.xrLabel4.StylePriority.UseTextAlignment = false;
+ this.xrLabel4.Text = "[InvoiceDate]";
+ this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ //
+ // xrLabel8
+ //
+ this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 178.0834F);
+ this.xrLabel8.Name = "xrLabel8";
+ this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel8.SizeF = new System.Drawing.SizeF(175F, 17F);
+ this.xrLabel8.StylePriority.UseFont = false;
+ this.xrLabel8.Text = "L&W";
+ //
+ // xrLabel6
+ //
+ this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Verdana", 8F);
+ this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(579.8749F, 161.0833F);
+ this.xrLabel6.Name = "xrLabel6";
+ this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel6.SizeF = new System.Drawing.SizeF(70.125F, 16.99998F);
+ this.xrLabel6.StylePriority.UseFont = false;
+ this.xrLabel6.StylePriority.UseTextAlignment = false;
+ this.xrLabel6.Text = "Datum";
+ this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ //
+ // xrLabel13
+ //
+ this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Verdana", 8F);
+ this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(298.9583F, 161.0833F);
+ this.xrLabel13.Name = "xrLabel13";
+ this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel13.SizeF = new System.Drawing.SizeF(69.08334F, 16.99998F);
+ this.xrLabel13.StylePriority.UseFont = false;
+ this.xrLabel13.Text = "Ihr Zeichen";
+ //
+ // xrLabel10
+ //
+ this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Verdana", 8F);
+ this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 161.0833F);
+ this.xrLabel10.Name = "xrLabel10";
+ this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel10.SizeF = new System.Drawing.SizeF(94.08334F, 16.99998F);
+ this.xrLabel10.StylePriority.UseFont = false;
+ this.xrLabel10.Text = "Mein Zeichen";
+ //
+ // xrLabel7
+ //
+ this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrLabel7.Multiline = true;
+ this.xrLabel7.Name = "xrLabel7";
+ this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel7.SizeF = new System.Drawing.SizeF(317F, 111.5F);
+ this.xrLabel7.StylePriority.UseFont = false;
+ this.xrLabel7.Text = "[RecipientOrganisation]\r\n[RecipientContactPerson]\r\n[RecipientDivision]\r\n[Recipien" +
+ "tStreet]\r\n[RecipientPostCodeAndTown]";
+ //
+ // xrLabel3
+ //
+ this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
+ this.xrLabel3.CanShrink = true;
+ this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+ new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+ this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 261.8751F);
+ this.xrLabel3.Name = "xrLabel3";
+ this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel3.SizeF = new System.Drawing.SizeF(677.0001F, 20F);
+ this.xrLabel3.StylePriority.UseBackColor = false;
+ this.xrLabel3.StylePriority.UseFont = false;
+ this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [CustomerSalutation] [CustomerName]";
+ this.xrLabel3.WordWrap = false;
+ //
+ // xrLabel2
+ //
+ this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
+ this.xrLabel2.CanShrink = true;
+ this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, 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(0F, 241.875F);
+ this.xrLabel2.Name = "xrLabel2";
+ this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel2.SizeF = new System.Drawing.SizeF(676.8331F, 19.99998F);
+ this.xrLabel2.StylePriority.UseBackColor = false;
+ this.xrLabel2.StylePriority.UseFont = false;
+ this.xrLabel2.Text = "Rechnung Nr. [InvoiceNumber]";
+ this.xrLabel2.WordWrap = false;
+ //
+ // xrLabel5
+ //
+ this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 343.3333F);
+ 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);
+ this.xrLabel5.StylePriority.UseFont = false;
+ this.xrLabel5.Text = "Sehr geehrte Damen und Herren,";
+ //
+ // lblAbrechnungszeitraum
+ //
+ this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 368.3333F);
+ this.lblAbrechnungszeitraum.Multiline = true;
+ this.lblAbrechnungszeitraum.Name = "lblAbrechnungszeitraum";
+ this.lblAbrechnungszeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.lblAbrechnungszeitraum.SizeF = new System.Drawing.SizeF(676.8332F, 31.58334F);
+ this.lblAbrechnungszeitraum.StylePriority.UseFont = false;
+ this.lblAbrechnungszeitraum.Text = "hiermit berechnen wir für den ... folgende erbrachte Tätigkeiten:";
+ //
+ // xrTable2
+ //
+ this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(362.5F, 0F);
+ this.xrTable2.Name = "xrTable2";
+ this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow2,
+ this.xrTableRow5,
+ this.xrTableRow4,
+ this.xrTableRow3,
+ this.xrTableRow1,
+ this.xrTableRow6,
+ this.xrTableRow8});
+ this.xrTable2.SizeF = new System.Drawing.SizeF(287.5001F, 134F);
+ //
+ // xrTableRow2
+ //
+ this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell4});
+ this.xrTableRow2.Name = "xrTableRow2";
+ this.xrTableRow2.Weight = 0.13245033112582783D;
+ //
+ // xrTableCell4
+ //
+ this.xrTableCell4.CanShrink = true;
+ this.xrTableCell4.Name = "xrTableCell4";
+ this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell4.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+ this.xrTableCell4.StylePriority.UseFont = false;
+ this.xrTableCell4.StylePriority.UseTextAlignment = false;
+ this.xrTableCell4.Text = "Ihr(e) Ansprechpartner(in):";
+ this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ this.xrTableCell4.Weight = 1D;
+ //
+ // xrTableRow5
+ //
+ this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell13});
+ this.xrTableRow5.Name = "xrTableRow5";
+ this.xrTableRow5.Weight = 0.13245033112582783D;
+ //
+ // xrTableCell13
+ //
+ this.xrTableCell13.CanShrink = true;
+ this.xrTableCell13.Name = "xrTableCell13";
+ this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell13.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+ this.xrTableCell13.StylePriority.UseFont = false;
+ this.xrTableCell13.StylePriority.UseTextAlignment = false;
+ this.xrTableCell13.Text = "[SenderContactPerson]";
+ this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ this.xrTableCell13.Weight = 1D;
+ //
+ // xrTableRow4
+ //
+ this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell11});
+ this.xrTableRow4.Name = "xrTableRow4";
+ this.xrTableRow4.Weight = 0.13245033112582783D;
+ //
+ // xrTableCell11
+ //
+ this.xrTableCell11.CanShrink = true;
+ this.xrTableCell11.Name = "xrTableCell11";
+ this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell11.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+ this.xrTableCell11.StylePriority.UseFont = false;
+ this.xrTableCell11.StylePriority.UseTextAlignment = false;
+ this.xrTableCell11.Text = "[SenderContactPersonDivision]";
+ this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ this.xrTableCell11.Weight = 1D;
+ //
+ // xrTableRow3
+ //
+ this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell8});
+ this.xrTableRow3.Name = "xrTableRow3";
+ this.xrTableRow3.Weight = 0.13245033112582783D;
+ //
+ // xrTableCell8
+ //
+ this.xrTableCell8.CanShrink = true;
+ this.xrTableCell8.Name = "xrTableCell8";
+ this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell8.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+ this.xrTableCell8.StylePriority.UseFont = false;
+ this.xrTableCell8.StylePriority.UseTextAlignment = false;
+ this.xrTableCell8.Text = "[SenderContactPersonMail]";
+ this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ this.xrTableCell8.Weight = 1D;
+ //
+ // xrTableRow1
+ //
+ this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell1});
+ this.xrTableRow1.Name = "xrTableRow1";
+ this.xrTableRow1.Weight = 0.13245033112582783D;
+ //
+ // xrTableCell1
+ //
+ this.xrTableCell1.CanShrink = true;
+ this.xrTableCell1.Name = "xrTableCell1";
+ this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell1.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+ this.xrTableCell1.StylePriority.UseFont = false;
+ this.xrTableCell1.StylePriority.UseTextAlignment = false;
+ this.xrTableCell1.Text = "[SenderContactPersonPhone]";
+ this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ this.xrTableCell1.Weight = 1D;
+ //
+ // xrTableRow6
+ //
+ this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell2});
+ this.xrTableRow6.Name = "xrTableRow6";
+ this.xrTableRow6.Weight = 0.11258278145695365D;
+ //
+ // xrTableCell2
+ //
+ this.xrTableCell2.CanShrink = true;
+ this.xrTableCell2.Name = "xrTableCell2";
+ this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell2.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+ this.xrTableCell2.StylePriority.UseFont = false;
+ this.xrTableCell2.StylePriority.UseTextAlignment = false;
+ this.xrTableCell2.Text = "[SenderContactPersonFax]";
+ this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ this.xrTableCell2.Weight = 1D;
+ //
+ // xrTableRow8
+ //
+ this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell5});
+ this.xrTableRow8.Name = "xrTableRow8";
+ this.xrTableRow8.Weight = 0.11258278145695365D;
+ //
+ // xrTableCell5
+ //
+ this.xrTableCell5.Name = "xrTableCell5";
+ this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell5.Weight = 1D;
+ //
+ // DetailReport
+ //
+ this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.Detail1,
+ this.DetailReport2,
+ this.ReportFooter});
+ this.DetailReport.DataMember = "ServiceInvoicePeriods";
+ this.DetailReport.DataSource = this.bindingSource1;
+ this.DetailReport.Level = 0;
+ this.DetailReport.Name = "DetailReport";
+ //
+ // Detail1
+ //
+ this.Detail1.HeightF = 0F;
+ this.Detail1.Name = "Detail1";
+ //
+ // DetailReport2
+ //
+ this.DetailReport2.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.Detail3,
+ this.GroupFooter1});
+ this.DetailReport2.DataMember = "ServiceInvoicePeriods.ServiceInvoiceItems";
+ this.DetailReport2.DataSource = this.bindingSource1;
+ this.DetailReport2.Level = 0;
+ this.DetailReport2.Name = "DetailReport2";
+ //
+ // Detail3
+ //
+ this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTable6});
+ this.Detail3.HeightF = 25F;
+ this.Detail3.Name = "Detail3";
+ //
+ // xrTable6
+ //
+ 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(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.StylePriority.UseFont = false;
+ //
+ // xrTableRow25
+ //
+ this.xrTableRow25.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell40,
+ this.xrTableCell42,
+ this.xrTableCell43,
+ this.xrTableCell44,
+ this.xrTableCell45,
+ this.xrTableCell46,
+ this.xrTableCell47});
+ this.xrTableRow25.Name = "xrTableRow25";
+ this.xrTableRow25.Weight = 1D;
+ //
+ // xrTableCell40
+ //
+ this.xrTableCell40.BorderColor = System.Drawing.Color.DarkGray;
+ this.xrTableCell40.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Duration")});
+ this.xrTableCell40.Name = "xrTableCell40";
+ this.xrTableCell40.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+ this.xrTableCell40.StylePriority.UseBorderColor = false;
+ this.xrTableCell40.StylePriority.UseBorders = false;
+ this.xrTableCell40.StylePriority.UsePadding = false;
+ this.xrTableCell40.StylePriority.UseTextAlignment = false;
+ this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell40.Weight = 0.62463084211025488D;
+ //
+ // xrTableCell42
+ //
+ this.xrTableCell42.BorderColor = System.Drawing.Color.DarkGray;
+ this.xrTableCell42.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.ServiceDescription")});
+ this.xrTableCell42.Name = "xrTableCell42";
+ this.xrTableCell42.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+ this.xrTableCell42.StylePriority.UseBorderColor = false;
+ this.xrTableCell42.StylePriority.UseBorders = false;
+ this.xrTableCell42.StylePriority.UsePadding = false;
+ this.xrTableCell42.StylePriority.UseTextAlignment = false;
+ this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell42.Weight = 0.85081229498678679D;
+ //
+ // xrTableCell43
+ //
+ this.xrTableCell43.BorderColor = System.Drawing.Color.DarkGray;
+ 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}")});
+ this.xrTableCell43.Name = "xrTableCell43";
+ this.xrTableCell43.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+ this.xrTableCell43.StylePriority.UseBorderColor = false;
+ this.xrTableCell43.StylePriority.UseBorders = false;
+ this.xrTableCell43.StylePriority.UsePadding = false;
+ this.xrTableCell43.StylePriority.UseTextAlignment = false;
+ this.xrTableCell43.Text = "xrTableCell43";
+ this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell43.Weight = 0.23245943032832414D;
+ //
+ // xrTableCell44
+ //
+ this.xrTableCell44.BorderColor = System.Drawing.Color.DarkGray;
+ this.xrTableCell44.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Hours", "{0:0.##}")});
+ this.xrTableCell44.Name = "xrTableCell44";
+ this.xrTableCell44.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+ this.xrTableCell44.StylePriority.UseBorderColor = false;
+ this.xrTableCell44.StylePriority.UseBorders = false;
+ this.xrTableCell44.StylePriority.UsePadding = false;
+ this.xrTableCell44.StylePriority.UseTextAlignment = false;
+ this.xrTableCell44.Text = "xrTableCell44";
+ this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell44.Weight = 0.2893277257020575D;
+ //
+ // xrTableCell45
+ //
+ this.xrTableCell45.BorderColor = System.Drawing.Color.DarkGray;
+ 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}")});
+ this.xrTableCell45.Name = "xrTableCell45";
+ this.xrTableCell45.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+ this.xrTableCell45.StylePriority.UseBorderColor = false;
+ this.xrTableCell45.StylePriority.UseBorders = false;
+ this.xrTableCell45.StylePriority.UsePadding = false;
+ this.xrTableCell45.StylePriority.UseTextAlignment = false;
+ this.xrTableCell45.Text = "xrTableCell45";
+ this.xrTableCell45.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell45.Weight = 0.26310971709438763D;
+ //
+ // xrTableCell46
+ //
+ this.xrTableCell46.BorderColor = System.Drawing.Color.DarkGray;
+ this.xrTableCell46.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell46.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.RateFactor")});
+ this.xrTableCell46.Name = "xrTableCell46";
+ this.xrTableCell46.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+ this.xrTableCell46.StylePriority.UseBorderColor = false;
+ this.xrTableCell46.StylePriority.UseBorders = false;
+ this.xrTableCell46.StylePriority.UsePadding = false;
+ this.xrTableCell46.StylePriority.UseTextAlignment = false;
+ this.xrTableCell46.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell46.Weight = 0.42042083402151886D;
+ //
+ // xrTableCell47
+ //
+ this.xrTableCell47.BorderColor = System.Drawing.Color.DarkGray;
+ this.xrTableCell47.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | 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.Name = "xrTableCell47";
+ this.xrTableCell47.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+ this.xrTableCell47.StylePriority.UseBorderColor = false;
+ this.xrTableCell47.StylePriority.UseBorders = false;
+ this.xrTableCell47.StylePriority.UsePadding = false;
+ this.xrTableCell47.StylePriority.UseTextAlignment = false;
+ this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell47.Weight = 0.31923915575667006D;
+ //
+ // GroupFooter1
+ //
+ this.GroupFooter1.HeightF = 0F;
+ this.GroupFooter1.Name = "GroupFooter1";
+ //
+ // ReportFooter
+ //
+ this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrLabel15,
+ this.xrLabel14,
+ this.xrTable4,
+ this.xrLabel1,
+ this.xrLabel11});
+ this.ReportFooter.HeightF = 218.9583F;
+ this.ReportFooter.Name = "ReportFooter";
+ //
+ // xrLabel15
+ //
+ this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
+ this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 122.0833F);
+ this.xrLabel15.Name = "xrLabel15";
+ this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel15.SizeF = new System.Drawing.SizeF(175F, 17F);
+ this.xrLabel15.StylePriority.UseFont = false;
+ this.xrLabel15.Text = "Mit freundlichen Grüßen";
+ //
+ // xrLabel14
+ //
+ this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "CreatorName")});
+ this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
+ this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 191.2499F);
+ this.xrLabel14.Name = "xrLabel14";
+ this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel14.SizeF = new System.Drawing.SizeF(225F, 17F);
+ this.xrLabel14.StylePriority.UseFont = false;
+ this.xrLabel14.Text = "[CreatorName]";
+ //
+ // xrTable4
+ //
+ this.xrTable4.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
+ this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 71.875F);
+ this.xrTable4.Name = "xrTable4";
+ this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow10,
+ this.xrTableRow14});
+ this.xrTable4.SizeF = new System.Drawing.SizeF(650F, 26F);
+ this.xrTable4.StylePriority.UseFont = false;
+ //
+ // xrTableRow10
+ //
+ this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell9});
+ this.xrTableRow10.Name = "xrTableRow10";
+ this.xrTableRow10.Weight = 0.38095238095238093D;
+ //
+ // xrTableCell9
+ //
+ this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")});
+ this.xrTableCell9.Name = "xrTableCell9";
+ this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell9.StylePriority.UsePadding = false;
+ this.xrTableCell9.Text = "xrTableCell1";
+ this.xrTableCell9.Weight = 3D;
+ //
+ // xrTableRow14
+ //
+ this.xrTableRow14.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell12});
+ this.xrTableRow14.Name = "xrTableRow14";
+ this.xrTableRow14.Weight = 0.23809523809523808D;
+ //
+ // xrTableCell12
+ //
+ this.xrTableCell12.Name = "xrTableCell12";
+ this.xrTableCell12.Weight = 3D;
+ //
+ // xrLabel1
+ //
+ 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("Verdana", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+ this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(420.9999F, 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);
+ this.xrLabel1.StylePriority.UseFont = false;
+ this.xrLabel1.StylePriority.UsePadding = false;
+ this.xrLabel1.StylePriority.UseTextAlignment = false;
+ this.xrLabel1.Text = "xrLabel1";
+ this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ //
+ // xrLabel11
+ //
+ this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 37.5F);
+ this.xrLabel11.Name = "xrLabel11";
+ this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel11.SizeF = new System.Drawing.SizeF(573.9583F, 17F);
+ this.xrLabel11.StylePriority.UseFont = false;
+ this.xrLabel11.Text = "Rechnung ist bei Zugang fällig. Vielen Dank!";
+ //
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
+ //
+ // xrTable5
+ //
+ this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 405.9166F);
+ this.xrTable5.Name = "xrTable5";
+ this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow23});
+ this.xrTable5.SizeF = new System.Drawing.SizeF(677F, 25F);
+ //
+ // xrTableRow23
+ //
+ this.xrTableRow23.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell32,
+ this.xrTableCell37,
+ this.xrTableCell35,
+ this.xrTableCell33,
+ this.xrTableCell36,
+ this.xrTableCell38,
+ this.xrTableCell34});
+ this.xrTableRow23.Name = "xrTableRow23";
+ this.xrTableRow23.Weight = 1D;
+ //
+ // xrTableCell32
+ //
+ this.xrTableCell32.BackColor = System.Drawing.Color.Gainsboro;
+ this.xrTableCell32.BorderColor = System.Drawing.Color.DarkGray;
+ this.xrTableCell32.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell32.Name = "xrTableCell32";
+ this.xrTableCell32.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+ this.xrTableCell32.StylePriority.UseBackColor = false;
+ this.xrTableCell32.StylePriority.UseBorderColor = false;
+ this.xrTableCell32.StylePriority.UseBorders = false;
+ this.xrTableCell32.StylePriority.UsePadding = false;
+ this.xrTableCell32.StylePriority.UseTextAlignment = false;
+ this.xrTableCell32.Text = "Zeitraum";
+ this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell32.Weight = 0.62463077449375981D;
+ //
+ // xrTableCell37
+ //
+ this.xrTableCell37.BackColor = System.Drawing.Color.Gainsboro;
+ this.xrTableCell37.BorderColor = System.Drawing.Color.DarkGray;
+ this.xrTableCell37.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell37.Name = "xrTableCell37";
+ this.xrTableCell37.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+ this.xrTableCell37.StylePriority.UseBackColor = false;
+ this.xrTableCell37.StylePriority.UseBorderColor = false;
+ this.xrTableCell37.StylePriority.UseBorders = false;
+ this.xrTableCell37.StylePriority.UsePadding = false;
+ this.xrTableCell37.StylePriority.UseTextAlignment = false;
+ this.xrTableCell37.Text = "Leistung";
+ this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell37.Weight = 0.85081236260328186D;
+ //
+ // xrTableCell35
+ //
+ this.xrTableCell35.BackColor = System.Drawing.Color.Gainsboro;
+ this.xrTableCell35.BorderColor = System.Drawing.Color.DarkGray;
+ this.xrTableCell35.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell35.Name = "xrTableCell35";
+ this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+ this.xrTableCell35.StylePriority.UseBackColor = false;
+ this.xrTableCell35.StylePriority.UseBorderColor = false;
+ this.xrTableCell35.StylePriority.UseBorders = false;
+ this.xrTableCell35.StylePriority.UsePadding = false;
+ this.xrTableCell35.StylePriority.UseTextAlignment = false;
+ this.xrTableCell35.Text = "Satz";
+ this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell35.Weight = 0.23245943032832414D;
+ //
+ // xrTableCell33
+ //
+ this.xrTableCell33.BackColor = System.Drawing.Color.Gainsboro;
+ this.xrTableCell33.BorderColor = System.Drawing.Color.DarkGray;
+ this.xrTableCell33.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell33.Name = "xrTableCell33";
+ this.xrTableCell33.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+ this.xrTableCell33.StylePriority.UseBackColor = false;
+ this.xrTableCell33.StylePriority.UseBorderColor = false;
+ this.xrTableCell33.StylePriority.UseBorders = false;
+ this.xrTableCell33.StylePriority.UsePadding = false;
+ this.xrTableCell33.StylePriority.UseTextAlignment = false;
+ this.xrTableCell33.Text = "Stunden";
+ this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell33.Weight = 0.2893277257020575D;
+ //
+ // xrTableCell36
+ //
+ this.xrTableCell36.BackColor = System.Drawing.Color.Gainsboro;
+ this.xrTableCell36.BorderColor = System.Drawing.Color.DarkGray;
+ this.xrTableCell36.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell36.Name = "xrTableCell36";
+ this.xrTableCell36.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+ this.xrTableCell36.StylePriority.UseBackColor = false;
+ this.xrTableCell36.StylePriority.UseBorderColor = false;
+ this.xrTableCell36.StylePriority.UseBorders = false;
+ this.xrTableCell36.StylePriority.UsePadding = false;
+ this.xrTableCell36.StylePriority.UseTextAlignment = false;
+ this.xrTableCell36.Text = "Betrag";
+ this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell36.Weight = 0.26310971709438763D;
+ //
+ // xrTableCell38
+ //
+ this.xrTableCell38.BackColor = System.Drawing.Color.Gainsboro;
+ this.xrTableCell38.BorderColor = System.Drawing.Color.DarkGray;
+ this.xrTableCell38.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell38.Name = "xrTableCell38";
+ this.xrTableCell38.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+ this.xrTableCell38.StylePriority.UseBackColor = false;
+ this.xrTableCell38.StylePriority.UseBorderColor = false;
+ this.xrTableCell38.StylePriority.UseBorders = false;
+ this.xrTableCell38.StylePriority.UsePadding = false;
+ this.xrTableCell38.StylePriority.UseTextAlignment = false;
+ this.xrTableCell38.Text = "pausch Fakt.";
+ this.xrTableCell38.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell38.Weight = 0.42042083402151886D;
+ //
+ // xrTableCell34
+ //
+ this.xrTableCell34.BackColor = System.Drawing.Color.Gainsboro;
+ this.xrTableCell34.BorderColor = System.Drawing.Color.DarkGray;
+ this.xrTableCell34.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell34.Name = "xrTableCell34";
+ this.xrTableCell34.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+ this.xrTableCell34.StylePriority.UseBackColor = false;
+ this.xrTableCell34.StylePriority.UseBorderColor = false;
+ this.xrTableCell34.StylePriority.UseBorders = false;
+ this.xrTableCell34.StylePriority.UsePadding = false;
+ this.xrTableCell34.StylePriority.UseTextAlignment = false;
+ this.xrTableCell34.Text = "Gesamt";
+ this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell34.Weight = 0.31923915575667006D;
+ //
+ // ServiceInvoiceReport
+ //
+ this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.Detail,
+ this.ReportHeader,
+ this.topMarginBand1,
+ this.bottomMarginBand1,
+ this.Page1,
+ this.DetailReport});
+ this.DataSource = this.bindingSource1;
+ this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
+ this.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
+ this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
+ this.ruleRateFactorNull});
+ this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 222.5F, 120F);
+ this.PageHeight = 1169;
+ this.PageWidth = 827;
+ this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
+ this.Version = "23.2";
+ xrWatermark1.Id = "Watermark1";
+ this.Watermarks.Add(xrWatermark1);
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+
}
@@ -905,24 +916,8 @@ namespace ChristianWilke
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow8;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
- private DevExpress.XtraReports.UI.XRLabel xrLabel15;
- private DevExpress.XtraReports.UI.XRTable xrTable4;
- private DevExpress.XtraReports.UI.XRTableRow xrTableRow10;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
- private DevExpress.XtraReports.UI.XRTableRow xrTableRow14;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
- private DevExpress.XtraReports.UI.XRLabel xrLabel14;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
private DevExpress.XtraReports.UI.DetailBand Detail1;
- private DevExpress.XtraReports.UI.XRTable xrTable5;
- private DevExpress.XtraReports.UI.XRTableRow xrTableRow23;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell32;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell37;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell33;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell36;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell38;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell34;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport2;
private DevExpress.XtraReports.UI.DetailBand Detail3;
private DevExpress.XtraReports.UI.XRTable xrTable6;
@@ -936,14 +931,31 @@ namespace ChristianWilke
private DevExpress.XtraReports.UI.XRTableCell xrTableCell47;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
- private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.XRLabel xrLabel16;
private DevExpress.XtraReports.UI.XRLabel xrLabel4;
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.XRLabel xrLabel13;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
- private DevExpress.XtraReports.UI.XRLabel xrLabel17;
- private DevExpress.XtraReports.UI.XRLabel xrLabel11;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel17;
+ private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel15;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel14;
+ private DevExpress.XtraReports.UI.XRTable xrTable4;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow10;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow14;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel11;
+ private DevExpress.XtraReports.UI.XRTable xrTable5;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow23;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell32;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell37;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell33;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell36;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell38;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell34;
}
}
diff --git a/ReportImp/ChristianWilke/ServiceInvoiceReport.resx b/ReportImp/ChristianWilke/ServiceInvoiceReport.resx
index d25f3eba2..c7e0d4bdf 100644
--- a/ReportImp/ChristianWilke/ServiceInvoiceReport.resx
+++ b/ReportImp/ChristianWilke/ServiceInvoiceReport.resx
@@ -1,123 +1,120 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 17, 17
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
\ No newline at end of file
diff --git a/ReportImp/DiakonieKKKleve/Finanzauswertung.cs b/ReportImp/DiakonieKKKleve/Finanzauswertung.cs
index fe9275bd0..9548824bb 100644
--- a/ReportImp/DiakonieKKKleve/Finanzauswertung.cs
+++ b/ReportImp/DiakonieKKKleve/Finanzauswertung.cs
@@ -255,17 +255,27 @@ namespace BeWo.DiakonieKKKleve
var gruppenRecords = new List();
var einzelRecords = new List();
var hbRecords = new List();
+ bool hatGruppeImZeitraum = false;
+ bool hatHBimZeitraum = false;
foreach (var sr in f.ServiceRecords)
{
if (sr.ServiceDescription.Name.Contains("Gruppe"))
{
+ if (!hatGruppeImZeitraum && sr.Start >= start && sr.Start < end.Date.AddDays(1))
+ {
+ hatGruppeImZeitraum = true;
+ }
gruppenRecords.Add(sr);
}
else
{
if (!sr.ServiceDescription.Name.ToLower().Contains("telefon"))
{
+ if (!hatHBimZeitraum && sr.Start >= start && sr.Start < end.Date.AddDays(1))
+ {
+ hatHBimZeitraum = true;
+ }
hbRecords.Add(sr);
}
einzelRecords.Add(sr);
@@ -291,7 +301,7 @@ namespace BeWo.DiakonieKKKleve
roSoziGruppe.SupportConceptFinanceList.Add(roGruppe);
}
- if (hbRecords.Count > 0)
+ if (hatHBimZeitraum)
{
var roHBP = new FinanceRO.SupportConceptFinanceRO();
roHBP.BillableHours = f.BillableHours;
diff --git a/ReportImp/DiakonieKKKleve/Invoicing/DiakoneKKKleveSoziotherapieInvoiceCreation.cs b/ReportImp/DiakonieKKKleve/Invoicing/DiakoneKKKleveSoziotherapieInvoiceCreation.cs
index 4ab9ac35e..ed0c13f28 100644
--- a/ReportImp/DiakonieKKKleve/Invoicing/DiakoneKKKleveSoziotherapieInvoiceCreation.cs
+++ b/ReportImp/DiakonieKKKleve/Invoicing/DiakoneKKKleveSoziotherapieInvoiceCreation.cs
@@ -23,6 +23,7 @@ namespace DiakonieKKKleve.Invoicing
ErstelleHausbesuchspauschale = true;
}
+
public bool ErstelleTherapieeinheiten { get; set; }
public bool ErstelleHausbesuchspauschale { get; set; }
@@ -79,6 +80,7 @@ namespace DiakonieKKKleve.Invoicing
{
var ii = base.CreateInvoiceItem(iServiceRecord, scap, calc);
+
//if (iServiceRecord.CostBearer.Name.Contains("Techniker Krankenkasse"))
// {
// ii.RateFactor = null;
@@ -202,12 +204,12 @@ namespace DiakonieKKKleve.Invoicing
{
//Dictionary differentDays = new Dictionary();
IList items = new List();
- decimal hausbesuchspauschale = 7.8m;
+ decimal hausbesuchspauschale = GetHausbesuchspauschale(scap.CostBearer2SupportConcept, invoicePeriod.StartDate);
- if (invoicePeriod.StartDateTime >= new DateTime(2022, 4, 1))
- {
- hausbesuchspauschale = 8.02m;
- }
+ //if (invoicePeriod.StartDateTime >= new DateTime(2022, 4, 1))
+ //{
+ // hausbesuchspauschale = 8.02m;
+ //}
int countHausbesuch = 0;
@@ -225,36 +227,36 @@ namespace DiakonieKKKleve.Invoicing
CostRatePeriodDC crp = null;
List crpDcs;
- foreach (var ServiceDescription in desc)
- {
- if (scap.CostBearer2SupportConcept.CostBearer.Organisation.Name.Contains("Barmer"))
- {
- if (ServiceDescription.Name.Contains("Hausbesuchpauschale") && ServiceDescription.Name.Contains("Barmer"))
- {
- crpDcs = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(ServiceDescription.CostRatePeriods);
- crp = crpDcs.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, invoicePeriod.StartDate);
- }
- }
- else
- {
- if (ServiceDescription.Name.Contains("Hausbesuchpauschale") && !ServiceDescription.Name.Contains("Barmer"))
- {
- crpDcs = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(ServiceDescription.CostRatePeriods);
- crp = crpDcs.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, invoicePeriod.StartDate);
- }
- }
+ // foreach (var ServiceDescription in desc)
+ // {
+ //if (scap.CostBearer2SupportConcept.CostBearer.Organisation.Name.Contains("Barmer"))
+ //{
+ // if (ServiceDescription.Name.Contains("Hausbesuchpauschale") && ServiceDescription.Name.Contains("Barmer"))
+ // {
+ // crpDcs = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(ServiceDescription.CostRatePeriods);
+ // crp = crpDcs.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, invoicePeriod.StartDate);
+ // }
+ //}
+ //else
+ //{
+ // if (ServiceDescription.Name.Contains("Hausbesuchpauschale") && !ServiceDescription.Name.Contains("Barmer"))
+ // {
+ // crpDcs = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(ServiceDescription.CostRatePeriods);
+ // crp = crpDcs.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, invoicePeriod.StartDate);
+ // }
+ //}
- if (crp != null && crp.CostRateValue.HasValue)
- {
- hausbesuchspauschale = crp.CostRateValue ?? 0;
- }
+ // if (crp != null && crp.CostRateValue.HasValue)
+ // {
+ // hausbesuchspauschale = crp.CostRateValue ?? 0;
+ // }
- foreach (var oscap in scap.CostBearer2SupportConcept.ApprovalPeriodList)
- {
- if (!String.IsNullOrEmpty(oscap.ServiceCategory.Name) && oscap.ServiceCategory.Name.Contains("Hausbesuchspauschale"))
- hausbesuchspauschale = oscap.ApprovedFixedAmount ?? hausbesuchspauschale;
- }
- }
+ // foreach (var oscap in scap.CostBearer2SupportConcept.ApprovalPeriodList)
+ // {
+ // if (!String.IsNullOrEmpty(oscap.ServiceCategory.Name) && oscap.ServiceCategory.Name.Contains("Hausbesuchspauschale"))
+ // hausbesuchspauschale = oscap.ApprovedFixedAmount ?? hausbesuchspauschale;
+ //}
+ // }
var invoiceItem = new InvoiceItem();
//decimal anzahlHausbesuche = differentDays.Count;
@@ -278,8 +280,37 @@ namespace DiakonieKKKleve.Invoicing
return items;
}
+ private decimal GetHausbesuchspauschale(CostBearer2SupportConcept c2s, DateTime dt)
+ {
+ String preisName = "Hausbesuchspauschale Primärkassen";
- public override IList CreateSummaryInvoiceItems(IList itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, BS.Shared.Services.Calculations calc, bool summaryPerMonth, bool addRateFactorToUnitCount)
+ if (c2s.CostBearer.Organisation.Function != null)
+ {
+ if (c2s.CostBearer.Organisation.Function.Value.Contains("Ersatzkasse"))
+ {
+ preisName = "Hausbesuchspauschale Ersatzkassen";
+ }
+ }
+
+ return base.GetPreis(preisName, dt);
+ }
+
+ private decimal GetGruppenPreis(CostBearer2SupportConcept c2s, DateTime dt)
+ {
+ String preisName = "Gruppentherapie Primärkassen";
+
+ if (c2s.CostBearer.Organisation.Function != null)
+ {
+ if (c2s.CostBearer.Organisation.Function.Value.Contains("Ersatzkasse"))
+ {
+ preisName = "Gruppentherapie Ersatzkassen";
+ }
+ }
+
+ return base.GetPreis(preisName, dt);
+ }
+
+ public override IList CreateSummaryInvoiceItems(IList itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, BS.Shared.Services.Calculations calc, bool summaryPerMonth, bool addRateFactorToUnitCount)
{
return base.CreateSummaryInvoiceItems(itemList, invoicePeriod, scap, calc, true, true);
}
diff --git a/ReportImp/DiakonieLennepReports/Export/WilkenExporter.cs b/ReportImp/DiakonieLennepReports/Export/WilkenExporter.cs
index 892584377..6d8fa2b9a 100644
--- a/ReportImp/DiakonieLennepReports/Export/WilkenExporter.cs
+++ b/ReportImp/DiakonieLennepReports/Export/WilkenExporter.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Data;
using System.IO;
+using System.Linq;
using System.Text;
using BeWo.Data.Access;
using BeWo.Data.Entities;
@@ -14,17 +15,170 @@ namespace DiakonieLennepReports.Export
{
public class WilkenExporter
{
+ private static int COUNTER = 10001; // fortlaufende Zeilennummer über alle drei Dateien
+ private static DataTable stammDaten;
+
public static QueryDC CreateQuery(QueryDC query)
{
DateTime dt = DateTime.Now;
DateTime.TryParse(query.Parameter[0].Value.ToString(), out dt);
- query.FileName = String.Format("Wilken Export {0:yyyyMM}.csv", dt);
- query.QueryResult = GetAbrechnungenString(dt);
+ if (query.Title == "Wilken Export Stammdaten")
+ {
+ query.FileName = String.Format("1192_{0:yyyyMMdd}_{0:hhmmss}_DEGSP.TXT", DateTime.Now);
+ query.QueryResult = GetDebitorenString(dt);
+ // var personenDaten = GetPersonendatenString(stammDaten);
+ }
+ //else if (query.Title == "Wilken Export Personendaten")
+ //{
+ // query.FileName = String.Format("1192_{0:yyyyMMdd}_{0:hhmmss}_DEPKF.TXT", DateTime.Now);
+ // query.QueryResult = GetPersonendatenString(dt);
+ //}
+ else
+ {
+ query.FileName = String.Format("Wilken Export {0:yyyyMM}.csv", dt);
+ query.QueryResult = GetAbrechnungenString(dt);
+ }
return query;
}
+ public static String GetDebitorenString(DateTime date)
+ {
+ // hier werden alle Stammdaten (Klienten und Kostenträger) aus dem BeWoPlaner zusammengetragen und jedes Mal neu übergeben,
+ // könnte man ändern bei Historientabelle ändern, dass nur geänderte und neue Datensätze übergeben werden
+
+ //SCHLUESSEL;OBJEKTTYP;SATZKENNUNG;DATENHERKUNFT;KONZERN;MANDANT;WERK;
+ //GP_GESCHAEFTSPARTNERNUMMER;ROLLE_ROLLENNUMMER;ROLLE_ROLLE;PERSON_PERSONENTYP;PERSON_NAME;PERSON_VORNAME;PERSON_KURZNAME;
+ //GP_MATCHCODE1;ADR_STRASSE;ADR_STRASSE_PLZ;ADR_STRASSE_ORT;ADR_STRASSE_HAUSNUMMER_VON;ADR_STRASSE_ZUSATZ_VON;
+ //ADR_STRASSE_UNTERNUMMER_VON;ADR_STRASSE_HAUSNUMMER_BIS;ADR_STRASSE_ZUSATZ_BIS;ADR_STRASSE_UNTERNUMMER_BIS;ADR_POSTFACH_PLZ;
+ //ADR_POSTFACH_ORT;ADR_POSTFACH;ADR_LAND;ADR_POSTLEITZAHLVERWENDUNG;ADR_POSTALISCHER_NAME;PERSON_ANREDE;PERSON_TELEFON;PERSON_TELEFAX;
+ //PERSON_EMAIL;PERSON_GEBURTSDATUM;PERSON_TITEL;GP_SPRACHE;ROLLE_SKONTOLINIE;GP_UID_LAND;GP_UID_NUMMER;BV_KONTOINHABER;BV_IBAN;BV_BIC;
+ //BV_LAND;BV_GUELTIG_AB;BV_GUELTIG_BIS;BV_KZ_KEINE_MEHRFACH_ANLAGE;BV_LAUFENDENUMMER;BV_KZ_ZAHLART_UEBERWEISUNG;
+ //BV_KZ_UEBERWEISUNG_MASCHINELL;BV_KZ_ZAHLART_BANKEINZUG;BV_KZ_BANKEINZUG_MASCHINELL;
+ //MANDAT_IBAN;MANDAT_MANDATSREFERENZNUMMER;MANDAT_GUELTIG_AB;MANDAT_ART;MANDAT_STATUS;MANDAT_LASTSCHRIFTVERFAHREN
+
+ //BeWoPlaner240403121530; GSP; GSP; BeWoPlaner; E; 290;9600;
+
+ StringBuilder sb = new StringBuilder();
+ sb.Append("SCHLUESSEL;OBJEKTTYP;SATZKENNUNG;DATENHERKUNFT;KONZERN;MANDANT;WERK;GP_GESCHAEFTSPARTNERNUMMER;ROLLE_ROLLENNUMMER;ROLLE_ROLLE;PERSON_PERSONENTYP;PERSON_NAME;PERSON_VORNAME;PERSON_KURZNAME;GP_MATCHCODE1;ADR_STRASSE;ADR_STRASSE_PLZ;ADR_STRASSE_ORT;ADR_STRASSE_HAUSNUMMER_VON;ADR_STRASSE_ZUSATZ_VON;ADR_STRASSE_UNTERNUMMER_VON;ADR_STRASSE_HAUSNUMMER_BIS;ADR_STRASSE_ZUSATZ_BIS;ADR_STRASSE_UNTERNUMMER_BIS;ADR_POSTFACH_PLZ;ADR_POSTFACH_ORT;ADR_POSTFACH;ADR_LAND;ADR_POSTLEITZAHLVERWENDUNG;ADR_POSTALISCHER_NAME;PERSON_ANREDE;PERSON_TELEFON;PERSON_TELEFAX;PERSON_EMAIL;PERSON_GEBURTSDATUM;PERSON_TITEL;GP_SPRACHE;ROLLE_SKONTOLINIE;GP_UID_LAND;GP_UID_NUMMER;BV_KONTOINHABER;BV_IBAN;BV_BIC;BV_LAND;BV_GUELTIG_AB;BV_GUELTIG_BIS;BV_KZ_KEINE_MEHRFACH_ANLAGE;BV_LAUFENDENUMMER;BV_KZ_ZAHLART_UEBERWEISUNG;BV_KZ_UEBERWEISUNG_MASCHINELL;BV_KZ_ZAHLART_BANKEINZUG;BV_KZ_BANKEINZUG_MASCHINELL;MANDAT_IBAN;MANDAT_MANDATSREFERENZNUMMER;MANDAT_GUELTIG_AB;MANDAT_ART;MANDAT_STATUS;MANDAT_LASTSCHRIFTVERFAHREN");
+ DateTime creationDate = DateTime.Now;
+ int counter = COUNTER;
+
+ var dt = ExecuteQuery(GetKlientenSql(date), date);
+
+ foreach (DataRow row in dt.Rows)
+ {
+ if (sb.Length > 0)
+ {
+ sb.AppendLine();
+ }
+ sb.Append(String.Format("BeWoPlaner{0:yyMMddhhmmss}290{1};", creationDate, counter));
+ sb.Append("GSP;GSP;BeWoPlaner;E;290;9600;");
+ for (int i = 0; i < row.ItemArray.Length; i++)
+ {
+ if (i > 0)
+ {
+ sb.Append(";");
+ }
+ var item = row[i];
+ if (i == 23 && item != null)
+ {
+ var sex = row[i].ToString();
+ if (sex == "0")
+ {
+ sb.Append("002");
+ }
+ else if(sex == "1")
+ {
+ sb.Append("001");
+ }
+ else
+ {
+ sb.Append("999");
+ }
+ }
+ else
+ {
+ sb.Append(item);
+ }
+ }
+ counter += 1;
+ }
+ dt = ExecuteQuery(GetOrganisationenSql(date), date);
+
+ foreach (DataRow row in dt.Rows)
+ {
+ if (sb.Length > 0)
+ {
+ sb.AppendLine();
+ }
+ sb.Append(String.Format("BeWoPlaner{0:yyMMddhhmmss}290{1};", creationDate, counter));
+ sb.Append("GSP;GSP;BeWoPlaner;E;290;9600;");
+ for (int i = 0; i < row.ItemArray.Length; i++)
+ {
+ if (i > 0)
+ {
+ sb.Append(";");
+ }
+ var item = row[i];
+
+ sb.Append(item);
+ }
+ counter += 1;
+ }
+ COUNTER = counter;
+ return sb.ToString();
+ }
+
+ public static String GetPersonenkontenString(DataTable data)
+ {
+ // hier werden zu den oben übergebenen Stammdaten sogenannte Personenkonten erzeugt, die dann bebucht werden
+ // sprich es wird zu jedem Debitorenkonto das Personenkonto erzeugt und übergeben
+ // es werden alle Stammdaten (Klienten und Kostenträger) aus dem BeWoPlaner zusammengetragen und jedes Mal neu übergeben,
+ // könnte man ändern bei Historientabelle ändern, dass nur geänderte und neue Datensätze übergeben werden
+
+ //SCHLUESSEL;OBJEKTTYP;SATZKENNUNG;DATENHERKUNFT;KONZERN;MANDANT;WERK;
+ //SATZART;KONTONUMMER;STARTDATUM;STOPPDATUM;HAUPTKONTO;VERDICHTUNGHAUPTKONTO;REFERENZHAUPTKONTO;VORRANGIGERZAHLWEG;
+ //KZAUTOMATISCHERAUSGLEICH;MAHNSPERRE;MAHNSPERREBEFRISTETBIS;KENNZEICHENZAHLSPERRE;ZAHLSPERREBEFRISTETBIS
+
+ //BeWoPlaner240403121530; GSP; GSP; BeWoPlaner; E; 290;9600;
+
+ StringBuilder sb = new StringBuilder();
+ sb.Append("SCHLUESSEL;OBJEKTTYP;SATZKENNUNG;DATENHERKUNFT;KONZERN;MANDANT;WERK;SATZART;KONTONUMMER;STARTDATUM;STOPPDATUM;HAUPTKONTO;VERDICHTUNGHAUPTKONTO;REFERENZHAUPTKONTO;VORRANGIGERZAHLWEG;KZAUTOMATISCHERAUSGLEICH;MAHNSPERRE;MAHNSPERREBEFRISTETBIS;KENNZEICHENZAHLSPERRE;ZAHLSPERREBEFRISTETBIS");
+ DateTime creationDate = DateTime.Now;
+ int counter = COUNTER;
+ int no = 0;
+
+ foreach (DataRow row in data.Rows)
+ {
+ no += 1;
+ if (no == 1)
+ {
+ break;
+ }
+ if (sb.Length > 0)
+ {
+ var item = row[23];
+ if (item != null)
+ {
+ sb.AppendLine();
+ counter += 1;
+ sb.Append(String.Format("BeWoPlaner{0:yyMMddhhmmss}290{1};", creationDate, counter));
+ sb.Append("GSP;PKF;BeWoPlaner;E;290;9600;D");
+ sb.Append(item);
+ sb.Append(";");
+ sb.Append("01.01.0001;;");
+ sb.Append("141000;;");
+ sb.Append("R;;;;;;;;");
+ }
+ }
+ }
+ COUNTER = counter;
+ return sb.ToString();
+ }
+
+
public static String GetAbrechnungenString(DateTime date)
{
StringBuilder sb = new StringBuilder();
@@ -61,7 +215,7 @@ namespace DiakonieLennepReports.Export
DateTime creationDate = DateTime.Now;
DateTime lastDate = new DateTime(date.Year, date.Month, 1);
lastDate = lastDate.AddMonths(1).AddDays(-1);
- int counter = 10000;
+ int counter = COUNTER;
StringBuilder sb = new StringBuilder();
foreach (DataRow row in dt.Rows)
@@ -90,6 +244,7 @@ namespace DiakonieLennepReports.Export
sb.Append("0;");
}
+ COUNTER = counter;
return sb.ToString();
}
@@ -128,6 +283,164 @@ namespace DiakonieLennepReports.Export
return sql;
}
+ private static String GetKlientenSql(DateTime date)
+ {
+ //SCHLUESSEL;OBJEKTTYP;SATZKENNUNG;DATENHERKUNFT;KONZERN;MANDANT;WERK;
+ //GP_GESCHAEFTSPARTNERNUMMER;ROLLE_ROLLENNUMMER;ROLLE_ROLLE;PERSON_PERSONENTYP;PERSON_NAME;PERSON_VORNAME;PERSON_KURZNAME;
+ //GP_MATCHCODE1;ADR_STRASSE;ADR_STRASSE_PLZ;ADR_STRASSE_ORT;ADR_STRASSE_HAUSNUMMER_VON;ADR_STRASSE_ZUSATZ_VON;
+ //ADR_STRASSE_UNTERNUMMER_VON;ADR_STRASSE_HAUSNUMMER_BIS;ADR_STRASSE_ZUSATZ_BIS;ADR_STRASSE_UNTERNUMMER_BIS;ADR_POSTFACH_PLZ;
+ //ADR_POSTFACH_ORT;ADR_POSTFACH;ADR_LAND;ADR_POSTLEITZAHLVERWENDUNG;ADR_POSTALISCHER_NAME;PERSON_ANREDE;PERSON_TELEFON;PERSON_TELEFAX;
+ //PERSON_EMAIL;PERSON_GEBURTSDATUM;PERSON_TITEL;GP_SPRACHE;ROLLE_SKONTOLINIE;GP_UID_LAND;GP_UID_NUMMER;BV_KONTOINHABER;BV_IBAN;BV_BIC;
+ //BV_LAND;BV_GUELTIG_AB;BV_GUELTIG_BIS;BV_KZ_KEINE_MEHRFACH_ANLAGE;BV_LAUFENDENUMMER;BV_KZ_ZAHLART_UEBERWEISUNG;
+ //BV_KZ_UEBERWEISUNG_MASCHINELL;BV_KZ_ZAHLART_BANKEINZUG;BV_KZ_BANKEINZUG_MASCHINELL;
+ //MANDAT_IBAN;MANDAT_MANDATSREFERENZNUMMER;MANDAT_GUELTIG_AB;MANDAT_ART;MANDAT_STATUS;MANDAT_LASTSCHRIFTVERFAHREN
+
+ // Achtung c.PersonOid sollte Debitorennummer werden
+
+ String sql = @"
+ SELECT
+ distinct
+ CONCAT('001192', c.PersonOid) AS Debitor,
+ CONCAT('001192', c.PersonOid) AS DebitorRolle,
+ 'D',
+ 'N',
+ p.`LastName`,
+ p.`FirstName`,
+ null,
+ p.`LastName`,
+ a.Street,
+ a.PostalCode,
+ a.Town,
+ '',
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ 'DE',
+ 1,
+ CONCAT(p.`FirstName`, ' ', p.`LastName`),
+ p.Sex,
+ null,
+ null,
+ null,
+ null,
+ null,
+ 'DE',
+ '014',
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null
+ FROM `customer` c
+ INNER JOIN `person` p ON p.`Oid` = c.`PersonOid`
+ INNER JOIN supportconcept sc on sc.CustomerOID = c.Oid
+ INNER JOIN costbearer2supportconcept cb2sc on cb2sc.SupportConceptOID = sc.Oid
+ LEFT JOIN Address a on p.addressOid = a.oid
+ WHERE c.isactive=1 AND c.Insts >= ':Monat_Start' AND c.Insts < ':Monat_End'
+ order by p.`LastName`, p.FirstName
+ ";
+ return sql;
+ }
+
+ private static String GetOrganisationenSql(DateTime date)
+ {
+ //SCHLUESSEL;OBJEKTTYP;SATZKENNUNG;DATENHERKUNFT;KONZERN;MANDANT;WERK;
+ //GP_GESCHAEFTSPARTNERNUMMER;ROLLE_ROLLENNUMMER;ROLLE_ROLLE;PERSON_PERSONENTYP;PERSON_NAME;PERSON_VORNAME;PERSON_KURZNAME;
+ //GP_MATCHCODE1;ADR_STRASSE;ADR_STRASSE_PLZ;ADR_STRASSE_ORT;ADR_STRASSE_HAUSNUMMER_VON;ADR_STRASSE_ZUSATZ_VON;
+ //ADR_STRASSE_UNTERNUMMER_VON;ADR_STRASSE_HAUSNUMMER_BIS;ADR_STRASSE_ZUSATZ_BIS;ADR_STRASSE_UNTERNUMMER_BIS;ADR_POSTFACH_PLZ;
+ //ADR_POSTFACH_ORT;ADR_POSTFACH;ADR_LAND;ADR_POSTLEITZAHLVERWENDUNG;ADR_POSTALISCHER_NAME;PERSON_ANREDE;PERSON_TELEFON;PERSON_TELEFAX;
+ //PERSON_EMAIL;PERSON_GEBURTSDATUM;PERSON_TITEL;GP_SPRACHE;ROLLE_SKONTOLINIE;GP_UID_LAND;GP_UID_NUMMER;BV_KONTOINHABER;BV_IBAN;BV_BIC;
+ //BV_LAND;BV_GUELTIG_AB;BV_GUELTIG_BIS;BV_KZ_KEINE_MEHRFACH_ANLAGE;BV_LAUFENDENUMMER;BV_KZ_ZAHLART_UEBERWEISUNG;
+ //BV_KZ_UEBERWEISUNG_MASCHINELL;BV_KZ_ZAHLART_BANKEINZUG;BV_KZ_BANKEINZUG_MASCHINELL;
+ //MANDAT_IBAN;MANDAT_MANDATSREFERENZNUMMER;MANDAT_GUELTIG_AB;MANDAT_ART;MANDAT_STATUS;MANDAT_LASTSCHRIFTVERFAHREN
+
+ // Achtung c.PersonOid sollte Debitorennummer werden
+
+ String sql = @"
+ SELECT
+ distinct
+ CONCAT('001193', cb.Oid) AS Debitor,
+ CONCAT('001193', cb.Oid) AS DebitorRolle,
+ 'D',
+ 'J',
+ org.`Name`,
+ '',
+ null,
+ org.`Name`,
+ a.Street,
+ a.PostalCode,
+ a.Town,
+ '',
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ 'DE',
+ 1,
+ org.`Name`,
+ '004',
+ null,
+ null,
+ null,
+ null,
+ null,
+ 'DE',
+ '014',
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null
+ FROM `costbearer` cb
+ INNER JOIN `organisation` org ON org.`CostbearerOid` = cb.`CostbearerOid`
+ LEFT JOIN Address a on org.addressOid = a.oid
+ WHERE cb.isactive=1
+ order by p.`LastName`, p.FirstName
+ ";
+ return sql;
+ }
+
public static DataTable ExecuteQuery(String sql, DateTime dt)
{
var newsql = sql;
diff --git a/ReportImp/Humanitas/Finanzauswertung.cs b/ReportImp/Humanitas/Finanzauswertung.cs
index 987fb9e37..711af91e3 100644
--- a/ReportImp/Humanitas/Finanzauswertung.cs
+++ b/ReportImp/Humanitas/Finanzauswertung.cs
@@ -132,10 +132,32 @@ namespace Humanitas
var calc = Calculations.GetInstance(c2S.CostBearer.ID);
var relDC = MapperFactory.SupportConceptCostBearerRelDC_CostBearer2SupportConcept.MapToNewDC(c2S);
+ var fkRecords = new List();
+ var flsRecords = new List();
+
+ foreach (var sr in scRo.ServiceRecords)
+ {
+ sr.Employee = new CompactEmployeeDC { ValueListEntries = new Dictionary() }; // hack, damit später bei der Berechnung des Betrags in der InvoiceCreation kein Fehler kommt
+ //sr.CostBearer = c2S.CostBearer;
+ sr.SupportConcept = scRo.Costbearer2Supportconcept.SupportConcept;
+ sr.Customer = sr.SupportConcept.Customer;
+
+ if (sr.ServiceDescription.Name.ToLower().Contains("fehlkontakt") || sr.ServiceDescription.Category.Name.ToLower().Contains("fehlkontakt") || (sr.ServiceDescription.ProzentAbrechnung.HasValue && sr.ServiceDescription.ProzentAbrechnung.Value < 100))
+ {
+ fkRecords.Add(sr);
+ }
+ else
+ {
+ flsRecords.Add(sr);
+ }
+ }
+
if (fro.ReportEndDate.HasValue && fro.ReportEndDate < DateTime.MaxValue.AddDays(-1))
{
scRo.ApprovedHours = calc.GetApprovedHoursTillNow(relDC, fro.ReportEndDate.Value) ?? 0;
//ro.ApprovedHours = calc.GetApprovedHoursTillNow(relDC, null) ?? 0;
+ scRo.StundenNichtFehlkontakte = calc.GetBillableDurationInMinutes(flsRecords.Where(sr => sr.Start.Value.Date < fro.ReportEndDate.Value.AddDays(1)).ToList()) / 60;
+ scRo.StundenFehlkontakte = calc.GetBillableDurationInMinutes(fkRecords.Where(sr => sr.Start.Value.Date < fro.ReportEndDate.Value.AddDays(1)).ToList()) / 60;
scRo.BillableHours =
calc.GetBillableDurationInMinutes(scRo.ServiceRecords.Where(sr => sr.Start.Value.Date < fro.ReportEndDate.Value.AddDays(1)).ToList()) / 60;
}
@@ -143,11 +165,14 @@ namespace Humanitas
{
scRo.ApprovedHours = calc.GetApprovedHoursTillNow(relDC, null) ?? 0;
scRo.BillableHours = calc.GetBillableDurationInMinutes(scRo.ServiceRecords) / 60;
+ scRo.StundenNichtFehlkontakte = calc.GetBillableDurationInMinutes(flsRecords) / 60;
+ scRo.StundenFehlkontakte = calc.GetBillableDurationInMinutes(fkRecords) / 60;
+ scRo.BillableHours = scRo.StundenNichtFehlkontakte + scRo.StundenFehlkontakte;
}
if (fro.ReportStartDate.HasValue && fro.ReportEndDate.HasValue)
{
-
+
scRo.ApprovedHoursInReportTimeSpan = calc.GetApprovedHoursForPeriod(relDC, fro.ReportStartDate.Value, fro.ReportEndDate.Value);
//ro.BillableHoursInReportTimeSpan =
@@ -160,16 +185,20 @@ namespace Humanitas
MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(c2S.CostBearer.CostRatePeriods);
scRo.AmountInReportTimeSpan = 0;
- foreach (var serviceRecordtemp in c2S.ServiceRecords)
+ scRo.AmountNichtFehlkontakteInReportTimeSpan = 0;
+ scRo.AmountFehlkontakteInReportTimeSpan = 0;
+
+ foreach (var dc in flsRecords)
{
- if (serviceRecordtemp.Start >= fro.ReportStartDate && serviceRecordtemp.Start.Value.Date <= fro.ReportEndDate.Value.Date)
+ if (dc.Start >= fro.ReportStartDate && dc.Start.Value.Date <= fro.ReportEndDate.Value.Date)
{
- var dc = MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDC(serviceRecordtemp);
+ //var dc = MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDC(serviceRecordtemp);
var billable = calc.GetBillableDurationInMinutes(dc) / 60;
- scRo.BillableHoursInReportTimeSpan += billable;
+ scRo.StundenNichtFehlkontakteInReportTimeSpan += billable;
+ //scRo.BillableHoursInReportTimeSpan += billable;
- var rfcr = costRateDcs.GetCostRatePeriodForDate(CostRatePeriodType.RateFactor, serviceRecordtemp.Start.Value);
+ var rfcr = costRateDcs.GetCostRatePeriodForDate(CostRatePeriodType.RateFactor, dc.Start.Value);
if (rfcr != null && rfcr.CostRateValue.HasValue)
{
var billableRateFactor = billable * (rfcr.CostRateValue.Value + 100m) / 100m;
@@ -180,7 +209,7 @@ namespace Humanitas
decimal stundensatz = 0;
- var hcr = costRateDcs.GetCostRatePeriodForDate(CostRatePeriodType.HourlyRate, serviceRecordtemp.Start.Value);
+ var hcr = costRateDcs.GetCostRatePeriodForDate(CostRatePeriodType.HourlyRate, dc.Start.Value);
if (hcr != null && hcr.CostRateValue.HasValue)
{
stundensatz = hcr.CostRateValue.Value;
@@ -188,10 +217,40 @@ namespace Humanitas
var betrag = billable * stundensatz;
- scRo.AmountInReportTimeSpan += betrag;
+ scRo.AmountNichtFehlkontakteInReportTimeSpan += betrag;
+ //scRo.AmountInReportTimeSpan += betrag;
}
}
+ //Fehlkontakte
+ foreach (var srDc in fkRecords)
+ {
+ if (srDc.Start >= fro.ReportStartDate && srDc.Start.Value.Date <= fro.ReportEndDate)
+ {
+ var billable = calc.GetBillableDurationInMinutes(srDc, false) / 60;
+ scRo.StundenFehlkontakteInReportTimeSpan += billable;
+ decimal stundensatz = 0;
+
+ var hcr = costRateDcs.GetCostRatePeriodForDate(CostRatePeriodType.HourlyRate, srDc.Start.Value);
+ if (hcr != null && hcr.CostRateValue.HasValue)
+ {
+ stundensatz = hcr.CostRateValue.Value;
+ }
+
+ if (srDc.ServiceDescription.ProzentAbrechnung.HasValue && srDc.ServiceDescription.ProzentAbrechnung.Value < 100)
+ {
+ stundensatz *= (srDc.ServiceDescription.ProzentAbrechnung.Value / 100);
+ }
+
+ var betrag = billable * stundensatz;
+
+ scRo.AmountFehlkontakteInReportTimeSpan += betrag;
+ }
+ }
+
+ scRo.BillableHoursInReportTimeSpan = scRo.StundenNichtFehlkontakteInReportTimeSpan + scRo.StundenFehlkontakteInReportTimeSpan;
+ scRo.AmountInReportTimeSpan = (scRo.AmountNichtFehlkontakteInReportTimeSpan ?? 0) + (scRo.AmountFehlkontakteInReportTimeSpan ?? 0);
+
var rfcrEnd = costRateDcs.GetCostRatePeriodForDate(CostRatePeriodType.RateFactor, fro.ReportEndDate.Value);
if (rfcrEnd != null && rfcrEnd.CostRateValue.HasValue)
diff --git a/ReportImp/Humanitas/Finanzauswertung.designer.cs b/ReportImp/Humanitas/Finanzauswertung.designer.cs
index d4125c076..5c7ac32aa 100644
--- a/ReportImp/Humanitas/Finanzauswertung.designer.cs
+++ b/ReportImp/Humanitas/Finanzauswertung.designer.cs
@@ -38,8 +38,9 @@ namespace Humanitas
DevExpress.XtraReports.UI.XRSummary xrSummary6 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary7 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary8 = new DevExpress.XtraReports.UI.XRSummary();
- DevExpress.XtraReports.UI.XRSummary xrSummary9 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary10 = new DevExpress.XtraReports.UI.XRSummary();
+ DevExpress.XtraReports.UI.XRSummary xrSummary11 = new DevExpress.XtraReports.UI.XRSummary();
+ DevExpress.XtraReports.UI.XRSummary xrSummary9 = new DevExpress.XtraReports.UI.XRSummary();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
@@ -143,6 +144,9 @@ namespace Humanitas
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.TESTPARAMTER = new DevExpress.XtraReports.Parameters.Parameter();
this.parameter1 = new DevExpress.XtraReports.Parameters.Parameter();
+ this.xrTableCell73 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell74 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell75 = new DevExpress.XtraReports.UI.XRTableCell();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
@@ -161,7 +165,7 @@ namespace Humanitas
//
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable2});
- this.Detail1.Font = new System.Drawing.Font("Arial", 9F);
+ this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 9F);
this.Detail1.HeightF = 25F;
this.Detail1.KeepTogetherWithDetailReports = true;
this.Detail1.Name = "Detail1";
@@ -176,7 +180,7 @@ namespace Humanitas
this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2});
- this.xrTable2.SizeF = new System.Drawing.SizeF(2650F, 25F);
+ this.xrTable2.SizeF = new System.Drawing.SizeF(2730F, 25F);
this.xrTable2.StylePriority.UseBorders = false;
this.xrTable2.StylePriority.UseFont = false;
this.xrTable2.StylePriority.UsePadding = false;
@@ -198,6 +202,7 @@ namespace Humanitas
this.cellBewilligteFLSImBereich,
this.cellGeleistetImBereich,
this.cellRateFactor,
+ this.xrTableCell74,
this.xrTableCell26,
this.xrTableCell35,
this.xrTableCell38,
@@ -315,7 +320,7 @@ namespace Humanitas
// cellGeleistetImBereich
//
this.cellGeleistetImBereich.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.SupportConceptFinance.BillableHoursInReportTimeSpan", "{0:0.00}")});
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.SupportConceptFinance.StundenNichtFehlkontakteInReportTimeSpan", "{0:0.00}")});
this.cellGeleistetImBereich.Name = "cellGeleistetImBereich";
this.cellGeleistetImBereich.StylePriority.UseTextAlignment = false;
this.cellGeleistetImBereich.Text = "cellGeleistetImBereich";
@@ -464,7 +469,7 @@ namespace Humanitas
//
// lblTitel
//
- this.lblTitel.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
+ this.lblTitel.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
this.lblTitel.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F);
this.lblTitel.Name = "lblTitel";
this.lblTitel.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -486,7 +491,7 @@ namespace Humanitas
//
// GroupFooter1
//
- this.GroupFooter1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.GroupFooter1.HeightF = 0F;
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.StylePriority.UseFont = false;
@@ -504,13 +509,13 @@ namespace Humanitas
this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTable1.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
+ this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
- this.xrTable1.SizeF = new System.Drawing.SizeF(2650F, 50F);
+ this.xrTable1.SizeF = new System.Drawing.SizeF(2730F, 50F);
this.xrTable1.StylePriority.UseBorders = false;
this.xrTable1.StylePriority.UseFont = false;
this.xrTable1.StylePriority.UsePadding = false;
@@ -532,6 +537,7 @@ namespace Humanitas
this.cellBewilligtImZeitraumHeader,
this.cellGeleistetImZeitraumHeader,
this.cellRateFactorHeader,
+ this.xrTableCell73,
this.xrTableCell25,
this.xrTableCell34,
this.xrTableCell37,
@@ -768,7 +774,7 @@ namespace Humanitas
//
this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable3});
- this.GroupFooter2.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
+ this.GroupFooter2.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
this.GroupFooter2.HeightF = 25F;
this.GroupFooter2.Level = 1;
this.GroupFooter2.Name = "GroupFooter2";
@@ -783,7 +789,7 @@ namespace Humanitas
this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow3});
- this.xrTable3.SizeF = new System.Drawing.SizeF(2650F, 25F);
+ this.xrTable3.SizeF = new System.Drawing.SizeF(2730F, 25F);
this.xrTable3.StylePriority.UseBorders = false;
this.xrTable3.StylePriority.UseFont = false;
this.xrTable3.StylePriority.UsePadding = false;
@@ -805,6 +811,7 @@ namespace Humanitas
this.xrTableCell22,
this.xrTableCell23,
this.xrTableCell24,
+ this.xrTableCell75,
this.xrTableCell27,
this.xrTableCell36,
this.xrTableCell39,
@@ -939,7 +946,7 @@ namespace Humanitas
//
this.xrTableCell23.CanGrow = false;
this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.SupportConceptFinance.BillableHoursInReportTimeSpan")});
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.SupportConceptFinance.StundenNichtFehlkontakteInReportTimeSpan")});
this.xrTableCell23.Name = "xrTableCell23";
this.xrTableCell23.StylePriority.UseTextAlignment = false;
xrSummary7.FormatString = "{0:0.00}";
@@ -969,9 +976,9 @@ namespace Humanitas
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.SupportConceptFinance.BillableAmountInReportTimeSpan")});
this.xrTableCell27.Name = "xrTableCell27";
this.xrTableCell27.StylePriority.UseTextAlignment = false;
- xrSummary9.FormatString = "{0:c}";
- xrSummary9.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
- this.xrTableCell27.Summary = xrSummary9;
+ xrSummary10.FormatString = "{0:c}";
+ xrSummary10.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+ this.xrTableCell27.Summary = xrSummary10;
this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell27.Weight = 0.35450516989897335D;
//
@@ -995,9 +1002,9 @@ namespace Humanitas
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.Abschlagszahlungen")});
this.xrTableCell60.Name = "xrTableCell60";
this.xrTableCell60.StylePriority.UseTextAlignment = false;
- xrSummary10.FormatString = "{0:c}";
- xrSummary10.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
- this.xrTableCell60.Summary = xrSummary10;
+ xrSummary11.FormatString = "{0:c}";
+ xrSummary11.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+ this.xrTableCell60.Summary = xrSummary11;
this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell60.Weight = 0.44313146230871536D;
//
@@ -1093,7 +1100,7 @@ namespace Humanitas
this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.Title.BorderWidth = 1F;
- this.Title.Font = new System.Drawing.Font("Times New Roman", 24F);
+ this.Title.Font = new DevExpress.Drawing.DXFont("Times New Roman", 24F);
this.Title.ForeColor = System.Drawing.Color.Black;
this.Title.Name = "Title";
//
@@ -1103,7 +1110,7 @@ namespace Humanitas
this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.FieldCaption.BorderWidth = 1F;
- this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
+ this.FieldCaption.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.FieldCaption.ForeColor = System.Drawing.Color.Black;
this.FieldCaption.Name = "FieldCaption";
//
@@ -1113,7 +1120,7 @@ namespace Humanitas
this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.PageInfo.BorderWidth = 1F;
- this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F);
+ this.PageInfo.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F);
this.PageInfo.ForeColor = System.Drawing.Color.Black;
this.PageInfo.Name = "PageInfo";
//
@@ -1123,7 +1130,7 @@ namespace Humanitas
this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.DataField.BorderWidth = 1F;
- this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F);
+ this.DataField.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F);
this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
this.DataField.Name = "DataField";
//
@@ -1158,6 +1165,39 @@ namespace Humanitas
this.parameter1.Type = typeof(bool);
this.parameter1.ValueInfo = "False";
//
+ // xrTableCell73
+ //
+ this.xrTableCell73.Multiline = true;
+ this.xrTableCell73.Name = "xrTableCell73";
+ this.xrTableCell73.StylePriority.UseTextAlignment = false;
+ this.xrTableCell73.Text = "Fehl-\r\nkontakte";
+ this.xrTableCell73.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell73.Weight = 0.3545051698989734D;
+ //
+ // xrTableCell74
+ //
+ this.xrTableCell74.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.SupportConceptFinance.StundenFehlkontakteInReportTimeSpan")});
+ this.xrTableCell74.Multiline = true;
+ this.xrTableCell74.Name = "xrTableCell74";
+ this.xrTableCell74.StylePriority.UseTextAlignment = false;
+ this.xrTableCell74.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell74.TextFormatString = "{0:0.00}";
+ this.xrTableCell74.Weight = 0.35450516989897335D;
+ //
+ // xrTableCell75
+ //
+ this.xrTableCell75.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.SupportConceptFinance.StundenFehlkontakteInReportTimeSpan")});
+ this.xrTableCell75.Multiline = true;
+ this.xrTableCell75.Name = "xrTableCell75";
+ this.xrTableCell75.StylePriority.UseTextAlignment = false;
+ xrSummary9.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+ this.xrTableCell75.Summary = xrSummary9;
+ this.xrTableCell75.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell75.TextFormatString = "{0:0.00}";
+ this.xrTableCell75.Weight = 0.35450516989897335D;
+ //
// Finanzauswertung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1169,9 +1209,9 @@ namespace Humanitas
this.bottomMarginBand1});
this.DataSource = this.bindingSource1;
this.Landscape = true;
- this.Margins = new System.Drawing.Printing.Margins(50, 50, 50, 30);
+ this.Margins = new DevExpress.Drawing.DXMargins(50F, 34F, 50F, 30F);
this.PageHeight = 827;
- this.PageWidth = 2760;
+ this.PageWidth = 2860;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.Custom;
this.Parameters.AddRange(new DevExpress.XtraReports.Parameters.Parameter[] {
this.TESTPARAMTER,
@@ -1181,7 +1221,7 @@ namespace Humanitas
this.FieldCaption,
this.PageInfo,
this.DataField});
- this.Version = "17.1";
+ this.Version = "23.2";
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
@@ -1295,5 +1335,8 @@ namespace Humanitas
private DevExpress.XtraReports.UI.XRTableCell xrTableCell71;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell70;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell72;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell74;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell73;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell75;
}
}
diff --git a/ReportImp/Humanitas/Finanzauswertung.resx b/ReportImp/Humanitas/Finanzauswertung.resx
index d25f3eba2..d58980a38 100644
--- a/ReportImp/Humanitas/Finanzauswertung.resx
+++ b/ReportImp/Humanitas/Finanzauswertung.resx
@@ -117,7 +117,4 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 17, 17
-
\ No newline at end of file
diff --git a/ReportImp/Humanitas/Properties/licenses.licx b/ReportImp/Humanitas/Properties/licenses.licx
index e69de29bb..d59547a61 100644
--- a/ReportImp/Humanitas/Properties/licenses.licx
+++ b/ReportImp/Humanitas/Properties/licenses.licx
@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a