diff --git a/BeWo/SchulbegleitenderDienst/SBDUtils/SBDUtils.cs b/BeWo/SchulbegleitenderDienst/SBDUtils/SBDUtils.cs
index fdcdcd81f..5b0b5197f 100644
--- a/BeWo/SchulbegleitenderDienst/SBDUtils/SBDUtils.cs
+++ b/BeWo/SchulbegleitenderDienst/SBDUtils/SBDUtils.cs
@@ -40,14 +40,15 @@ namespace BeWo.SchulbegleitenderDienst.SBDUtils
}
else
{
- if(viewModel.Customer.SubstitutionNeed == SubstitutionNeed.SubstitutionNeeded || viewModel.Customer.SubstitutionNeed == SubstitutionNeed.SubstitutionWanted)
- {
+ //if(viewModel.Customer.SubstitutionNeed == SubstitutionNeed.SubstitutionNeeded || viewModel.Customer.SubstitutionNeed == SubstitutionNeed.SubstitutionWanted)
+ //{
+
customerSubstitutionList.Add(viewModel);
- }
- else
- {
- unwantedSubstitutionList.Add(viewModel);
- }
+ //}
+ //else
+ //{
+ // unwantedSubstitutionList.Add(viewModel);
+ //}
}
}
diff --git a/BeWo/View/NotizenView.xaml b/BeWo/View/NotizenView.xaml
index c893b930f..2718e5569 100644
--- a/BeWo/View/NotizenView.xaml
+++ b/BeWo/View/NotizenView.xaml
@@ -249,8 +249,11 @@
-
-
+
+
+
+
+
diff --git a/ReportImp/ChristianLuft/ChristianLuft.csproj b/ReportImp/ChristianLuft/ChristianLuft.csproj
index f89a627b8..398309d63 100644
--- a/ReportImp/ChristianLuft/ChristianLuft.csproj
+++ b/ReportImp/ChristianLuft/ChristianLuft.csproj
@@ -8,15 +8,16 @@
Library
Properties
ChristianLuft
- ChristianLuft
- v4.6.1
+ 5495240031_Reports
+ v4.5
512
+
true
full
false
- bin\Debug\
+ ..\..\Host\bin\
DEBUG;TRACE
prompt
4
@@ -24,14 +25,21 @@
pdbonly
true
- bin\Release\
+ ..\..\Host\bin\
TRACE
prompt
4
+
+
+
+
+
+
+
@@ -41,6 +49,25 @@
+
+ Component
+
+
+ ServiceInvoiceReport.cs
+
+
+
+
+
+ ServiceInvoiceReport.cs
+ Designer
+
+
+
+
+ {40D8B312-EA64-49E3-A31A-5E57ED4D5654}
+ Report
+
\ No newline at end of file
diff --git a/ReportImp/ChristianLuft/Properties/licenses.licx b/ReportImp/ChristianLuft/Properties/licenses.licx
new file mode 100644
index 000000000..c7fd819d5
--- /dev/null
+++ b/ReportImp/ChristianLuft/Properties/licenses.licx
@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/ReportImp/ChristianLuft/ServiceInvoiceReport.Designer.cs b/ReportImp/ChristianLuft/ServiceInvoiceReport.Designer.cs
new file mode 100644
index 000000000..a31fd277e
--- /dev/null
+++ b/ReportImp/ChristianLuft/ServiceInvoiceReport.Designer.cs
@@ -0,0 +1,566 @@
+using BeWo.Report.ReportObjects;
+namespace BeWo.Report.DefaultReports
+{
+ partial class ServiceInvoiceReport
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServiceInvoiceReport));
+ this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+ this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+ this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
+ this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
+ this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText();
+ this.xrRichText4 = new DevExpress.XtraReports.UI.XRRichText();
+ 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.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
+ this.lblAdresse = 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.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
+ this.lblBemerkungen = 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.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.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+ this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+ ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).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.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrRichText2,
+ this.xrRichText1,
+ this.xrRichText3,
+ this.xrRichText4});
+ this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F);
+ this.ReportHeader.HeightF = 210F;
+ this.ReportHeader.Name = "ReportHeader";
+ this.ReportHeader.StylePriority.UseFont = false;
+ //
+ // xrRichText2
+ //
+ this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 37.5F);
+ this.xrRichText2.Name = "xrRichText2";
+ this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
+ this.xrRichText2.SizeF = new System.Drawing.SizeF(332.9577F, 66.14584F);
+ //
+ // xrRichText1
+ //
+ this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(484.3748F, 0F);
+ this.xrRichText1.Name = "xrRichText1";
+ this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
+ this.xrRichText1.SizeF = new System.Drawing.SizeF(242.6249F, 168.75F);
+ //
+ // xrRichText3
+ //
+ this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(0.0005086263F, 0F);
+ this.xrRichText3.Name = "xrRichText3";
+ this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString");
+ this.xrRichText3.SizeF = new System.Drawing.SizeF(239.4997F, 37.5F);
+ //
+ // xrRichText4
+ //
+ this.xrRichText4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 175F);
+ this.xrRichText4.Name = "xrRichText4";
+ this.xrRichText4.SerializableRtfString = resources.GetString("xrRichText4.SerializableRtfString");
+ this.xrRichText4.SizeF = new System.Drawing.SizeF(727.0002F, 25F);
+ //
+ // ruleRateFactorNull
+ //
+ this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
+ this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
+ this.ruleRateFactorNull.Name = "ruleRateFactorNull";
+ //
+ // topMarginBand1
+ //
+ this.topMarginBand1.HeightF = 30F;
+ this.topMarginBand1.Name = "topMarginBand1";
+ //
+ // bottomMarginBand1
+ //
+ this.bottomMarginBand1.HeightF = 50F;
+ this.bottomMarginBand1.Name = "bottomMarginBand1";
+ //
+ // Page1
+ //
+ this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrLabel7,
+ this.xrLabel6,
+ this.lblAdresse,
+ this.xrLabel3,
+ this.xrLabel2,
+ this.xrLabel5,
+ this.xrLabel8});
+ this.Page1.HeightF = 416.5833F;
+ this.Page1.Name = "Page1";
+ this.Page1.StylePriority.UseFont = false;
+ //
+ // xrLabel7
+ //
+ this.xrLabel7.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrLabel7.ForeColor = System.Drawing.Color.Gray;
+ this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(484.3748F, 146.1458F);
+ this.xrLabel7.Name = "xrLabel7";
+ this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel7.SizeF = new System.Drawing.SizeF(217F, 17F);
+ this.xrLabel7.StylePriority.UseFont = false;
+ this.xrLabel7.StylePriority.UseForeColor = false;
+ this.xrLabel7.Text = "Datum";
+ //
+ // xrLabel6
+ //
+ this.xrLabel6.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrLabel6.ForeColor = System.Drawing.Color.Gray;
+ this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0.0005086263F, 146.1458F);
+ this.xrLabel6.Name = "xrLabel6";
+ this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel6.SizeF = new System.Drawing.SizeF(317F, 17F);
+ this.xrLabel6.StylePriority.UseFont = false;
+ this.xrLabel6.StylePriority.UseForeColor = false;
+ this.xrLabel6.Text = "Betreuung/Klient";
+ //
+ // lblAdresse
+ //
+ this.lblAdresse.CanGrow = false;
+ this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.lblAdresse.Multiline = true;
+ this.lblAdresse.Name = "lblAdresse";
+ this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.lblAdresse.SizeF = new System.Drawing.SizeF(317F, 111.5F);
+ this.lblAdresse.StylePriority.UseFont = false;
+ //
+ // xrLabel3
+ //
+ this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
+ this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0.0005086263F, 163.1458F);
+ this.xrLabel3.Name = "xrLabel3";
+ this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel3.SizeF = new System.Drawing.SizeF(317.0001F, 20F);
+ this.xrLabel3.StylePriority.UseBackColor = false;
+ this.xrLabel3.StylePriority.UseFont = false;
+ this.xrLabel3.StylePriority.UseForeColor = false;
+ this.xrLabel3.Text = "[CustomerName]";
+ this.xrLabel3.WordWrap = false;
+ //
+ // xrLabel2
+ //
+ this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
+ this.xrLabel2.CanShrink = true;
+ this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 227.2917F);
+ 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.StylePriority.UseForeColor = false;
+ this.xrLabel2.Text = "Rechnung-Nummer: [InvoiceNumber]";
+ this.xrLabel2.WordWrap = false;
+ //
+ // xrLabel5
+ //
+ this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 287.5F);
+ this.xrLabel5.Multiline = true;
+ this.xrLabel5.Name = "xrLabel5";
+ this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel5.SizeF = new System.Drawing.SizeF(701.3746F, 105.0208F);
+ this.xrLabel5.StylePriority.UseFont = false;
+ this.xrLabel5.Text = resources.GetString("xrLabel5.Text");
+ //
+ // xrLabel8
+ //
+ this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
+ this.xrLabel8.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(484.3748F, 163.1458F);
+ this.xrLabel8.Name = "xrLabel8";
+ this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel8.SizeF = new System.Drawing.SizeF(192.6254F, 23F);
+ this.xrLabel8.StylePriority.UseFont = false;
+ this.xrLabel8.StylePriority.UseTextAlignment = false;
+ this.xrLabel8.Text = "xrLabel8";
+ this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+ //
+ // lblBemerkungen
+ //
+ this.lblBemerkungen.LocationFloat = new DevExpress.Utils.PointFloat(0.0005086263F, 100F);
+ this.lblBemerkungen.Multiline = true;
+ this.lblBemerkungen.Name = "lblBemerkungen";
+ this.lblBemerkungen.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.lblBemerkungen.SizeF = new System.Drawing.SizeF(599.4789F, 193.0416F);
+ this.lblBemerkungen.StylePriority.UseFont = false;
+ this.lblBemerkungen.Text = "Leistungszeitraum: [AccountingPeriod]\r\n\r\nDiese Rechnung ist zahlbar bis {Frist}\r\n" +
+ "\r\n\r\nMit freundlichen Grüßen \t\t\r\n\t\t\r\n\r\nChristian Luft\r\n";
+ //
+ // 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 = 50F;
+ 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(630F, 25F);
+ //
+ // xrTableRow23
+ //
+ this.xrTableRow23.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell32,
+ this.xrTableCell37,
+ this.xrTableCell35,
+ this.xrTableCell33,
+ this.xrTableCell34});
+ this.xrTableRow23.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrTableRow23.Name = "xrTableRow23";
+ this.xrTableRow23.StylePriority.UseFont = false;
+ this.xrTableRow23.Weight = 1D;
+ //
+ // xrTableCell32
+ //
+ 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 = "Tätigkeit";
+ this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell32.Weight = 0.97488922276912438D;
+ //
+ // xrTableCell37
+ //
+ 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 = "Monat";
+ this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell37.Weight = 0.35450515859764475D;
+ //
+ // xrTableCell35
+ //
+ 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 = "Stunden";
+ this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell35.Weight = 0.4431314679685337D;
+ //
+ // xrTableCell33
+ //
+ 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 = "Satz";
+ this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell33.Weight = 0.44313146796853359D;
+ //
+ // xrTableCell34
+ //
+ 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 = "Summe";
+ this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell34.Weight = 0.57607089539926537D;
+ //
+ // 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.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(630F, 25F);
+ this.xrTable6.StylePriority.UseFont = false;
+ //
+ // xrTableRow25
+ //
+ this.xrTableRow25.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell42,
+ this.xrTableCell40,
+ this.xrTableCell44,
+ this.xrTableCell43,
+ this.xrTableCell47});
+ this.xrTableRow25.Name = "xrTableRow25";
+ this.xrTableRow25.Weight = 1D;
+ //
+ // xrTableCell42
+ //
+ 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.97488923967324814D;
+ //
+ // xrTableCell40
+ //
+ this.xrTableCell40.BorderColor = System.Drawing.Color.DarkGray;
+ 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.MiddleCenter;
+ this.xrTableCell40.Weight = 0.35450517550176852D;
+ //
+ // xrTableCell44
+ //
+ this.xrTableCell44.BorderColor = System.Drawing.Color.DarkGray;
+ 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.MiddleCenter;
+ this.xrTableCell44.Weight = 0.44313145106440971D;
+ //
+ // xrTableCell43
+ //
+ this.xrTableCell43.BorderColor = System.Drawing.Color.DarkGray;
+ 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.MiddleCenter;
+ this.xrTableCell43.Weight = 0.4431314679685337D;
+ //
+ // xrTableCell47
+ //
+ this.xrTableCell47.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.GrossAmount")});
+ this.xrTableCell47.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ 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.UseFont = false;
+ this.xrTableCell47.StylePriority.UsePadding = false;
+ this.xrTableCell47.StylePriority.UseTextAlignment = false;
+ this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell47.Weight = 0.57607087849514149D;
+ //
+ // GroupFooter1
+ //
+ this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrLabel1,
+ this.lblBemerkungen});
+ this.GroupFooter1.HeightF = 293.0416F;
+ this.GroupFooter1.Name = "GroupFooter1";
+ //
+ // xrLabel1
+ //
+ this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim", "{0}")});
+ this.xrLabel1.Font = new System.Drawing.Font("Arial", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(374.1666F, 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.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("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
+ this.ruleRateFactorNull});
+ this.Margins = new System.Drawing.Printing.Margins(70, 30, 30, 50);
+ this.PageHeight = 1169;
+ this.PageWidth = 827;
+ this.PaperKind = System.Drawing.Printing.PaperKind.A4;
+ this.Version = "17.1";
+ ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+
+ }
+
+
+ private DevExpress.XtraReports.UI.DetailBand Detail;
+ private System.Windows.Forms.BindingSource bindingSource1;
+ private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
+ private DevExpress.XtraReports.UI.FormattingRule ruleRateFactorNull;
+ private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
+ private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
+ private DevExpress.XtraReports.UI.GroupHeaderBand Page1;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel3;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel2;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel5;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel8;
+ private DevExpress.XtraReports.UI.XRLabel lblBemerkungen;
+ 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 xrTableCell34;
+ private DevExpress.XtraReports.UI.DetailReportBand DetailReport2;
+ private DevExpress.XtraReports.UI.DetailBand Detail3;
+ private DevExpress.XtraReports.UI.XRTable xrTable6;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow25;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell40;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell42;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell43;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell44;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell47;
+ private DevExpress.XtraReports.UI.XRLabel lblAdresse;
+ private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+ private DevExpress.XtraReports.UI.XRRichText xrRichText3;
+ private DevExpress.XtraReports.UI.XRRichText xrRichText4;
+ private DevExpress.XtraReports.UI.XRRichText xrRichText1;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel7;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel6;
+ private DevExpress.XtraReports.UI.XRRichText xrRichText2;
+ }
+}
diff --git a/ReportImp/ChristianLuft/ServiceInvoiceReport.cs b/ReportImp/ChristianLuft/ServiceInvoiceReport.cs
new file mode 100644
index 000000000..814f96fc1
--- /dev/null
+++ b/ReportImp/ChristianLuft/ServiceInvoiceReport.cs
@@ -0,0 +1,101 @@
+using System;
+using System.Text;
+using BeWo.Report.ReportObjects;
+
+using DevExpress.XtraReports.UI;
+
+namespace BeWo.Report.DefaultReports
+{
+ public partial class ServiceInvoiceReport : XtraReport, IBeWoReport
+ {
+ public ServiceInvoiceReport()
+ {
+ this.InitializeComponent();
+ }
+
+ public void SetReportDataSource(ServiceInvoiceRO pRO)
+ {
+ //DateTime start = pRO.AccountingPeriodStart;
+ //DateTime end = pRO.AccountingPeriodEnd;
+ //if (start.Month == end.Month && start.Year == end.Year)
+ //{
+ // lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Monat {0:MMMM yyyy} folgende erbrachte Tätigkeiten:", start);
+ //}
+ //else
+ //{
+ // lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Zeitraum {0:MMMM yyyy} - {1:MMMM yyyy} folgende erbrachte Tätigkeiten:", start, end);
+ //}
+
+ StringBuilder sb = new StringBuilder();
+
+ if (!String.IsNullOrEmpty(pRO.RecipientOrganisation))
+ {
+ sb.AppendLine(pRO.RecipientOrganisation);
+ }
+ if (!String.IsNullOrEmpty(pRO.RecipientContactPerson))
+ {
+ sb.AppendLine(pRO.RecipientContactPerson);
+ }
+ if (!String.IsNullOrEmpty(pRO.RecipientDivision))
+ {
+ sb.AppendLine(pRO.RecipientDivision);
+ }
+ if (!String.IsNullOrEmpty(pRO.RecipientStreet))
+ {
+ sb.AppendLine(pRO.RecipientStreet);
+ }
+ if (!String.IsNullOrEmpty(pRO.RecipientPostCodeAndTown))
+ {
+ sb.AppendLine(pRO.RecipientPostCodeAndTown);
+ }
+ lblAdresse.Text = sb.ToString();
+
+ lblBemerkungen.Text = lblBemerkungen.Text.Replace("{Frist}",
+ String.Format("{0:dd.MM.yyyy}", pRO.InvoiceDateTime.Value.AddDays(14)));
+
+
+ if (pRO.ServiceInvoicePeriods != null && pRO.ServiceInvoicePeriods.Count > 0)
+ {
+ foreach (var p in pRO.ServiceInvoicePeriods)
+ {
+
+ if (p.ServiceInvoiceItems != null && p.ServiceInvoiceItems.Count > 0)
+ {
+
+ foreach (var i in p.ServiceInvoiceItems)
+ {
+ i.ServiceDescription = "Psychosoziale Betreuung";
+ i.Duration = String.Format("{0:MM}/{0:yy}", i.AccountingPeriodStart);
+ decimal rateFactor = 1;
+
+ if (i.HourlyRate.HasValue)
+ {
+ if (!String.IsNullOrEmpty(i.RateFactor))
+ {
+ var rfStr = i.RateFactor.Replace("%", "").Replace(",00", "").Trim();
+ int rfInt = 0;
+ Int32.TryParse(rfStr, out rfInt);
+
+ rateFactor = (100m + rfInt) / 100m;
+ }
+ }
+
+ if (i.Hours.HasValue)
+ {
+ i.Hours *= rateFactor;
+ }
+
+
+ }
+
+ }
+ }
+
+ }
+
+
+
+ this.bindingSource1.DataSource = pRO;
+ }
+ }
+}
\ No newline at end of file
diff --git a/ReportImp/ChristianLuft/ServiceInvoiceReport.resx b/ReportImp/ChristianLuft/ServiceInvoiceReport.resx
new file mode 100644
index 000000000..8815f7458
--- /dev/null
+++ b/ReportImp/ChristianLuft/ServiceInvoiceReport.resx
@@ -0,0 +1,143 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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
+
+
+ ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEcAYQByAGEAbQBvAG4AZAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAyADQAXABjAGYAMQAgAFMAdABhAGEAdABsAGkAYwBoACAAYQBuAGUAcgBrAGEAbgBuAHQAZQByACAARABpAHAAbAAuAC0AUwBvAHoAaQBhAGwAYQByAGIAZQBpAHQAZQByACAAKABGAEgAKQB9AFwAZgAyAFwAZgBzADIAOABcAGMAZgAxAFwAcABhAHIAfQA=
+
+
+ ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEcAYQByAGEAbQBvAG4AZAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgANgA5ADQANgB7AFwAZgAyAFwAZgBzADIAOABcAGMAZgAwACAAQgByAHUAbgBuAGUAbgBzAHQAcgBhAFwAdQAyADIAMwBcACcAZABmAGUAIAA0ADcAfQBcAGYAMgBcAGYAcwAyADgAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgANgA5ADQANgB7AFwAZgAyAFwAZgBzADIAOABcAGMAZgAwACAANgA1ADMAMAA3ACAAQgBhAGQAIABTAGMAaAB3AGEAbABiAGEAYwBoAH0AXABmADIAXABmAHMAMgA4AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADYAOQA0ADYAewBcAGYAMgBcAGYAcwAyADIAXABjAGYAMAAgAFQAZQBsAC4AOgAgADAAMQA3ADkAIAAxADMANQAxADUANwAwAH0AXABmADIAXABmAHMAMgA4AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADYAOQA0ADYAewBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmADIAXABmAHMAMgAyAFwAYwBmADAAIABTAHQATgByAC4AOgAgADAAMAA0ACAAOAA0ADMAIAAzADEAMAAzADMAfQBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmADIAXABmAHMAMgAyAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADYAOQA0ADYAewBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmADIAXABmAHMAMgAyAFwAYwBmADAAIABOAGEAcwBzAGEAdQBpAHMAYwBoAGUAIABTAHAAYQByAGsAYQBzAHMAZQB9AFwAbABhAG4AZwAxADAAMwAzAFwAbABhAG4AZwBmAGUAMQAwADMAMwBcAGYAMgBcAGYAcwAyADIAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgANgA5ADQANgB7AFwAbABhAG4AZwAxADAAMwAzAFwAbABhAG4AZwBmAGUAMQAwADMAMwBcAGYAMgBcAGYAcwAyADIAXABjAGYAMAAgAEkAQgBBAE4AOgAgAEQARQA1ADUAIAA1ADEAMAA1ACAAMAAwADEANQAgADAAMwA5ADMAIAAzADIANgAyACAAMgA4AH0AXABsAGEAbgBnADEAMAAzADMAXABsAGEAbgBnAGYAZQAxADAAMwAzAFwAZgAyAFwAZgBzADIAMgBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAbABhAG4AZwAxADAAMwAzAFwAbABhAG4AZwBmAGUAMQAwADMAMwBcAGYAMgBcAGYAcwAyADIAXABjAGYAMAAgAEIASQBDADoAIABOAEEAUwBTAEQARQA1ADUAWABYAFgAfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgB9AA==
+
+
+ ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEcAYQByAGEAbQBvAG4AZAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgANgA5ADQANgB7AFwAZgAyAFwAZgBzADQANABcAGMAZgAxACAAQwBoAHIAaQBzAHQAaQBhAG4AIABMAHUAZgB0AH0AXABmADIAXABmAHMAMgA4AFwAYwBmADEAXABwAGEAcgB9AA==
+
+
+ ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEcAYQByAGEAbQBvAG4AZAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAyADAAXABjAGYAMAAgAEMAaAByAGkAcwB0AGkAYQBuACAATAB1AGYAdAAgAFwAdQA4ADIAMQAxAFwAJwA5ADYAIABCAHIAdQBuAG4AZQBuAHMAdAByAGEAXAB1ADIAMgAzAFwAJwBkAGYAZQAgADQANwAgACAAXAB1ADgAMgAxADEAXAAnADkANgAgADYANQAzADAANwAgAEIAYQBkACAAUwBjAGgAdwBhAGwAYgBhAGMAaAB9AFwAZgAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAfQA=
+
+
+ Sehr geehrte Damen und Herren,
+
+für meine gemäß Auftrag geleistete Unterstützungsleistung im Rahmen des
+Persönlichen Budgets der o. g. Klient (AZ [CustomerReferenceNumber]) berechne ich wie
+vereinbart:
+
+
+
+ 17, 17
+
+
\ No newline at end of file
diff --git a/ReportImp/DiakonieLandshut/DiakonieLandshut.csproj b/ReportImp/DiakonieLandshut/DiakonieLandshut.csproj
index ad6e192f7..d46d48f60 100644
--- a/ReportImp/DiakonieLandshut/DiakonieLandshut.csproj
+++ b/ReportImp/DiakonieLandshut/DiakonieLandshut.csproj
@@ -70,6 +70,12 @@
+
+ Component
+
+
+ RechnungEigenanteil.cs
+
Component
@@ -109,6 +115,10 @@
Designer
+
+ RechnungEigenanteil.cs
+ Designer
+
ServiceInvoiceReport.cs
Designer
diff --git a/ReportImp/DiakonieLandshut/RechnungEigenanteil.Designer.cs b/ReportImp/DiakonieLandshut/RechnungEigenanteil.Designer.cs
new file mode 100644
index 000000000..2a4593d5e
--- /dev/null
+++ b/ReportImp/DiakonieLandshut/RechnungEigenanteil.Designer.cs
@@ -0,0 +1,687 @@
+using BeWo.Report.ReportObjects;
+namespace DiakonieLandshut
+{
+ partial class RechnungEigenanteil
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RechnungEigenanteil));
+ this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+ 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.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText();
+ this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
+ this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
+ this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
+ this.lblAnrede = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrRichText4 = new DevExpress.XtraReports.UI.XRRichText();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+ ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).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;
+ //
+ // ruleRateFactorNull
+ //
+ this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
+ this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
+ this.ruleRateFactorNull.Name = "ruleRateFactorNull";
+ //
+ // topMarginBand1
+ //
+ this.topMarginBand1.HeightF = 200F;
+ this.topMarginBand1.Name = "topMarginBand1";
+ //
+ // bottomMarginBand1
+ //
+ this.bottomMarginBand1.HeightF = 30F;
+ this.bottomMarginBand1.Name = "bottomMarginBand1";
+ //
+ // Page1
+ //
+ this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrRichText4,
+ this.xrTable4,
+ this.xrLabel2,
+ this.xrTable1,
+ this.xrTable3,
+ this.xrRichText3,
+ this.xrLabel1,
+ this.xrTable2,
+ this.xrRichText2,
+ this.xrRichText1,
+ this.lblAdresse,
+ this.lblAnrede});
+ this.Page1.Font = new System.Drawing.Font("Calibri", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.Page1.HeightF = 904.2915F;
+ this.Page1.Name = "Page1";
+ this.Page1.StylePriority.UseFont = false;
+ //
+ // xrRichText3
+ //
+ this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(550F, 328.0209F);
+ this.xrRichText3.Name = "xrRichText3";
+ this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString");
+ this.xrRichText3.SizeF = new System.Drawing.SizeF(166.9973F, 338.9374F);
+ //
+ // xrLabel1
+ //
+ this.xrLabel1.BackColor = System.Drawing.Color.Transparent;
+ this.xrLabel1.CanShrink = true;
+ this.xrLabel1.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 308.2292F);
+ this.xrLabel1.Multiline = true;
+ this.xrLabel1.Name = "xrLabel1";
+ this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel1.SizeF = new System.Drawing.SizeF(494.31F, 42.47919F);
+ this.xrLabel1.StylePriority.UseBackColor = false;
+ this.xrLabel1.StylePriority.UseFont = false;
+ this.xrLabel1.Text = "Abrechnung der Betreuungsleistungen für\r\nAmbulant Betreutes Einzelwohnen";
+ this.xrLabel1.WordWrap = false;
+ //
+ // xrTable2
+ //
+ this.xrTable2.Font = new System.Drawing.Font("Calibri", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 236.875F);
+ this.xrTable2.Name = "xrTable2";
+ this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow2,
+ this.xrTableRow3});
+ this.xrTable2.SizeF = new System.Drawing.SizeF(550F, 40F);
+ this.xrTable2.StylePriority.UseBorderColor = false;
+ this.xrTable2.StylePriority.UseBorders = false;
+ this.xrTable2.StylePriority.UseFont = false;
+ this.xrTable2.StylePriority.UseTextAlignment = false;
+ this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+ //
+ // xrTableRow2
+ //
+ this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell2,
+ this.xrTableCell4,
+ this.xrTableCell11,
+ this.xrTableCell12});
+ this.xrTableRow2.Name = "xrTableRow2";
+ this.xrTableRow2.StylePriority.UseBackColor = false;
+ this.xrTableRow2.StylePriority.UseFont = false;
+ this.xrTableRow2.Weight = 0.027511789647828321D;
+ //
+ // xrTableCell2
+ //
+ this.xrTableCell2.Name = "xrTableCell2";
+ this.xrTableCell2.Text = "Ihr Zeichen";
+ this.xrTableCell2.Weight = 0.14789962160754391D;
+ //
+ // xrTableCell4
+ //
+ this.xrTableCell4.Multiline = true;
+ this.xrTableCell4.Name = "xrTableCell4";
+ this.xrTableCell4.StylePriority.UseTextAlignment = false;
+ this.xrTableCell4.Text = "Unser Zeichen";
+ this.xrTableCell4.Weight = 0.19340719124451974D;
+ //
+ // xrTableCell11
+ //
+ this.xrTableCell11.Multiline = true;
+ this.xrTableCell11.Name = "xrTableCell11";
+ this.xrTableCell11.StylePriority.UseTextAlignment = false;
+ this.xrTableCell11.Text = "Auskunft bei";
+ this.xrTableCell11.Weight = 0.1706534100124682D;
+ //
+ // xrTableCell12
+ //
+ this.xrTableCell12.Name = "xrTableCell12";
+ this.xrTableCell12.Text = "Datum";
+ this.xrTableCell12.Weight = 0.11376893966674673D;
+ //
+ // xrTableRow3
+ //
+ this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell13,
+ this.xrTableCell15,
+ this.xrTableCell17,
+ this.xrTableCell20});
+ this.xrTableRow3.Name = "xrTableRow3";
+ this.xrTableRow3.Weight = 0.027511789647828321D;
+ //
+ // xrTableCell13
+ //
+ this.xrTableCell13.Name = "xrTableCell13";
+ this.xrTableCell13.Weight = 0.14789962160754386D;
+ //
+ // xrTableCell15
+ //
+ this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceNumber")});
+ this.xrTableCell15.Name = "xrTableCell15";
+ this.xrTableCell15.Weight = 0.19340719124451972D;
+ //
+ // xrTableCell17
+ //
+ this.xrTableCell17.Font = new System.Drawing.Font("Calibri", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrTableCell17.Name = "xrTableCell17";
+ this.xrTableCell17.StylePriority.UseFont = false;
+ this.xrTableCell17.Text = "Bettina Wimmer";
+ this.xrTableCell17.Weight = 0.17065341001246823D;
+ //
+ // xrTableCell20
+ //
+ this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
+ this.xrTableCell20.Name = "xrTableCell20";
+ this.xrTableCell20.Text = "xrTableCell20";
+ this.xrTableCell20.Weight = 0.11376893966674676D;
+ //
+ // xrRichText2
+ //
+ this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrRichText2.Name = "xrRichText2";
+ this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
+ this.xrRichText2.SizeF = new System.Drawing.SizeF(425F, 29F);
+ //
+ // xrRichText1
+ //
+ this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(550.0031F, 30.00002F);
+ this.xrRichText1.Name = "xrRichText1";
+ this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
+ this.xrRichText1.SizeF = new System.Drawing.SizeF(166.9973F, 246.875F);
+ //
+ // lblAdresse
+ //
+ this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 30.00001F);
+ this.lblAdresse.Multiline = true;
+ this.lblAdresse.Name = "lblAdresse";
+ this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.lblAdresse.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+ this.lblAdresse.SizeF = new System.Drawing.SizeF(425.0001F, 124.0417F);
+ this.lblAdresse.StylePriority.UseFont = false;
+ this.lblAdresse.Text = "Landschaftsverband Rheinland";
+ //
+ // lblAnrede
+ //
+ this.lblAnrede.BackColor = System.Drawing.Color.Transparent;
+ this.lblAnrede.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 373.5211F);
+ this.lblAnrede.Multiline = true;
+ this.lblAnrede.Name = "lblAnrede";
+ this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.lblAnrede.SizeF = new System.Drawing.SizeF(550F, 161.1457F);
+ this.lblAnrede.StylePriority.UseBackColor = false;
+ this.lblAnrede.StylePriority.UseFont = false;
+ this.lblAnrede.Text = resources.GetString("lblAnrede.Text");
+ this.lblAnrede.WordWrap = false;
+ //
+ // xrTable3
+ //
+ this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 534.6667F);
+ this.xrTable3.Name = "xrTable3";
+ this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow10});
+ this.xrTable3.SizeF = new System.Drawing.SizeF(525F, 25F);
+ this.xrTable3.StylePriority.UseFont = false;
+ //
+ // xrTableRow10
+ //
+ this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell3,
+ this.xrTableCell16,
+ this.xrTableCell9,
+ this.xrTableCell18,
+ this.xrTableCell19,
+ this.xrTableCell14});
+ this.xrTableRow10.Name = "xrTableRow10";
+ this.xrTableRow10.Weight = 1D;
+ //
+ // xrTableCell3
+ //
+ this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell3.Name = "xrTableCell3";
+ this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+ this.xrTableCell3.StylePriority.UseBorders = false;
+ this.xrTableCell3.StylePriority.UsePadding = false;
+ this.xrTableCell3.StylePriority.UseTextAlignment = false;
+ this.xrTableCell3.Text = "Von";
+ this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell3.Weight = 0.76141565558052D;
+ //
+ // xrTableCell16
+ //
+ this.xrTableCell16.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell16.Name = "xrTableCell16";
+ this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+ this.xrTableCell16.StylePriority.UseBorders = false;
+ this.xrTableCell16.StylePriority.UsePadding = false;
+ this.xrTableCell16.StylePriority.UseTextAlignment = false;
+ this.xrTableCell16.Text = "Bis";
+ this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell16.Weight = 0.76141565558052016D;
+ //
+ // xrTableCell9
+ //
+ this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell9.Name = "xrTableCell9";
+ this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+ this.xrTableCell9.StylePriority.UseBorders = false;
+ this.xrTableCell9.StylePriority.UsePadding = false;
+ this.xrTableCell9.StylePriority.UseTextAlignment = false;
+ this.xrTableCell9.Text = "Posten";
+ this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell9.Weight = 1.5228313706063599D;
+ //
+ // xrTableCell18
+ //
+ this.xrTableCell18.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell18.Name = "xrTableCell18";
+ this.xrTableCell18.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+ this.xrTableCell18.StylePriority.UseBorders = false;
+ this.xrTableCell18.StylePriority.UsePadding = false;
+ this.xrTableCell18.StylePriority.UseTextAlignment = false;
+ this.xrTableCell18.Text = "Satz";
+ this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell18.Weight = 0.7614157166302773D;
+ //
+ // xrTableCell19
+ //
+ this.xrTableCell19.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell19.Name = "xrTableCell19";
+ this.xrTableCell19.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+ this.xrTableCell19.StylePriority.UseBorders = false;
+ this.xrTableCell19.StylePriority.UsePadding = false;
+ this.xrTableCell19.StylePriority.UseTextAlignment = false;
+ this.xrTableCell19.Text = "Anzahl";
+ this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell19.Weight = 0.76141567811809829D;
+ //
+ // xrTableCell14
+ //
+ this.xrTableCell14.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell14.Name = "xrTableCell14";
+ this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F);
+ this.xrTableCell14.StylePriority.UseBorders = false;
+ this.xrTableCell14.StylePriority.UsePadding = false;
+ this.xrTableCell14.StylePriority.UseTextAlignment = false;
+ this.xrTableCell14.Text = "Betrag";
+ this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell14.Weight = 0.76141558636925066D;
+ //
+ // xrTable1
+ //
+ this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 559.6667F);
+ this.xrTable1.Name = "xrTable1";
+ this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow1});
+ this.xrTable1.SizeF = new System.Drawing.SizeF(525F, 25F);
+ this.xrTable1.StylePriority.UseBorders = false;
+ this.xrTable1.StylePriority.UseFont = false;
+ //
+ // xrTableRow1
+ //
+ this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell1,
+ this.xrTableCell6,
+ this.xrTableCell7,
+ this.xrTableCell8,
+ this.xrTableCell10,
+ this.xrTableCell21});
+ this.xrTableRow1.Name = "xrTableRow1";
+ this.xrTableRow1.Weight = 1D;
+ //
+ // xrTableCell1
+ //
+ this.xrTableCell1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.AccountingPeriodStart")});
+ this.xrTableCell1.Name = "xrTableCell1";
+ this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+ this.xrTableCell1.StylePriority.UseBorders = false;
+ this.xrTableCell1.StylePriority.UsePadding = false;
+ this.xrTableCell1.StylePriority.UseTextAlignment = false;
+ this.xrTableCell1.Text = "01.09.2019";
+ this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell1.Weight = 0.76141565558052D;
+ //
+ // xrTableCell6
+ //
+ this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.AccountingPeriodEnd")});
+ this.xrTableCell6.Name = "xrTableCell6";
+ this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+ this.xrTableCell6.StylePriority.UseBorders = false;
+ this.xrTableCell6.StylePriority.UsePadding = false;
+ this.xrTableCell6.StylePriority.UseTextAlignment = false;
+ this.xrTableCell6.Text = "30.09.2019";
+ this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell6.Weight = 0.76141565558052D;
+ //
+ // xrTableCell7
+ //
+ this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.ItemDescription")});
+ this.xrTableCell7.Name = "xrTableCell7";
+ this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+ this.xrTableCell7.StylePriority.UseBorders = false;
+ this.xrTableCell7.StylePriority.UsePadding = false;
+ this.xrTableCell7.StylePriority.UseTextAlignment = false;
+ this.xrTableCell7.Text = "Posten";
+ this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell7.Weight = 1.5228313706063599D;
+ //
+ // xrTableCell8
+ //
+ this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.UnitPrice", "{0:c}")});
+ this.xrTableCell8.Name = "xrTableCell8";
+ this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+ this.xrTableCell8.StylePriority.UseBorders = false;
+ this.xrTableCell8.StylePriority.UsePadding = false;
+ this.xrTableCell8.StylePriority.UseTextAlignment = false;
+ this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell8.Weight = 0.7614157166302773D;
+ //
+ // xrTableCell10
+ //
+ this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.UnitCount", "{0:0.00}")});
+ this.xrTableCell10.Name = "xrTableCell10";
+ this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+ this.xrTableCell10.StylePriority.UseBorders = false;
+ this.xrTableCell10.StylePriority.UsePadding = false;
+ this.xrTableCell10.StylePriority.UseTextAlignment = false;
+ this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell10.Weight = 0.76141567811809829D;
+ //
+ // xrTableCell21
+ //
+ this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.AmountTotal", "{0:c}")});
+ this.xrTableCell21.Name = "xrTableCell21";
+ this.xrTableCell21.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F);
+ this.xrTableCell21.StylePriority.UseBorders = false;
+ this.xrTableCell21.StylePriority.UsePadding = false;
+ this.xrTableCell21.StylePriority.UseTextAlignment = false;
+ this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell21.Weight = 0.76141558636925066D;
+ //
+ // xrLabel2
+ //
+ this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
+ this.xrLabel2.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 620.3542F);
+ this.xrLabel2.Multiline = true;
+ this.xrLabel2.Name = "xrLabel2";
+ this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel2.SizeF = new System.Drawing.SizeF(550F, 175.2081F);
+ this.xrLabel2.StylePriority.UseBackColor = false;
+ this.xrLabel2.StylePriority.UseFont = false;
+ this.xrLabel2.Text = resources.GetString("xrLabel2.Text");
+ //
+ // xrTable4
+ //
+ this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 584.6667F);
+ this.xrTable4.Name = "xrTable4";
+ this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow4});
+ this.xrTable4.SizeF = new System.Drawing.SizeF(525F, 25F);
+ this.xrTable4.StylePriority.UseFont = false;
+ //
+ // xrTableRow4
+ //
+ this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell5,
+ this.xrTableCell22,
+ this.xrTableCell23,
+ this.xrTableCell24,
+ this.xrTableCell25,
+ this.xrTableCell26});
+ this.xrTableRow4.Name = "xrTableRow4";
+ this.xrTableRow4.Weight = 1D;
+ //
+ // xrTableCell5
+ //
+ this.xrTableCell5.Name = "xrTableCell5";
+ this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+ this.xrTableCell5.StylePriority.UseBorders = false;
+ this.xrTableCell5.StylePriority.UsePadding = false;
+ this.xrTableCell5.StylePriority.UseTextAlignment = false;
+ this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell5.Weight = 0.76141565558052D;
+ //
+ // xrTableCell22
+ //
+ this.xrTableCell22.Name = "xrTableCell22";
+ this.xrTableCell22.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+ this.xrTableCell22.StylePriority.UseBorders = false;
+ this.xrTableCell22.StylePriority.UsePadding = false;
+ this.xrTableCell22.StylePriority.UseTextAlignment = false;
+ this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell22.Weight = 0.76141565558052016D;
+ //
+ // xrTableCell23
+ //
+ this.xrTableCell23.Name = "xrTableCell23";
+ this.xrTableCell23.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+ this.xrTableCell23.StylePriority.UseBorders = false;
+ this.xrTableCell23.StylePriority.UsePadding = false;
+ this.xrTableCell23.StylePriority.UseTextAlignment = false;
+ this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell23.Weight = 1.5228313706063599D;
+ //
+ // xrTableCell24
+ //
+ this.xrTableCell24.Name = "xrTableCell24";
+ this.xrTableCell24.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+ this.xrTableCell24.StylePriority.UseBorders = false;
+ this.xrTableCell24.StylePriority.UsePadding = false;
+ this.xrTableCell24.StylePriority.UseTextAlignment = false;
+ this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell24.Weight = 0.7614157166302773D;
+ //
+ // xrTableCell25
+ //
+ this.xrTableCell25.Borders = DevExpress.XtraPrinting.BorderSide.Right;
+ this.xrTableCell25.Name = "xrTableCell25";
+ this.xrTableCell25.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+ this.xrTableCell25.StylePriority.UseBorders = false;
+ this.xrTableCell25.StylePriority.UsePadding = false;
+ this.xrTableCell25.StylePriority.UseTextAlignment = false;
+ this.xrTableCell25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell25.Weight = 0.76141567811809829D;
+ //
+ // xrTableCell26
+ //
+ this.xrTableCell26.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalClaim")});
+ this.xrTableCell26.Font = new System.Drawing.Font("Calibri", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrTableCell26.Name = "xrTableCell26";
+ this.xrTableCell26.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F);
+ this.xrTableCell26.StylePriority.UseBorders = false;
+ this.xrTableCell26.StylePriority.UseFont = false;
+ this.xrTableCell26.StylePriority.UsePadding = false;
+ this.xrTableCell26.StylePriority.UseTextAlignment = false;
+ this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell26.Weight = 0.76141558636925066D;
+ //
+ // xrRichText4
+ //
+ this.xrRichText4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 808.0624F);
+ this.xrRichText4.Name = "xrRichText4";
+ this.xrRichText4.SerializableRtfString = resources.GetString("xrRichText4.SerializableRtfString");
+ this.xrRichText4.SizeF = new System.Drawing.SizeF(385.7473F, 96.22906F);
+ //
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.InvoiceCustomerRO);
+ //
+ // RechnungEigenanteil
+ //
+ this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.Detail,
+ this.topMarginBand1,
+ this.bottomMarginBand1,
+ this.Page1});
+ this.DataSource = this.bindingSource1;
+ this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
+ this.Font = new System.Drawing.Font("Calibri", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
+ this.ruleRateFactorNull});
+ this.Margins = new System.Drawing.Printing.Margins(75, 25, 200, 30);
+ this.PageHeight = 1169;
+ this.PageWidth = 827;
+ this.PaperKind = System.Drawing.Printing.PaperKind.A4;
+ this.Version = "17.1";
+ ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+
+ }
+
+
+ private DevExpress.XtraReports.UI.DetailBand Detail;
+ private System.Windows.Forms.BindingSource bindingSource1;
+ private DevExpress.XtraReports.UI.FormattingRule ruleRateFactorNull;
+ private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
+ private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
+ private DevExpress.XtraReports.UI.GroupHeaderBand Page1;
+ private DevExpress.XtraReports.UI.XRRichText xrRichText2;
+ private DevExpress.XtraReports.UI.XRRichText xrRichText1;
+ private DevExpress.XtraReports.UI.XRLabel lblAdresse;
+ private DevExpress.XtraReports.UI.XRTable xrTable2;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
+ private DevExpress.XtraReports.UI.XRLabel lblAnrede;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+ private DevExpress.XtraReports.UI.XRRichText xrRichText3;
+ private DevExpress.XtraReports.UI.XRTable xrTable1;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
+ private DevExpress.XtraReports.UI.XRTable xrTable3;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow10;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel2;
+ private DevExpress.XtraReports.UI.XRTable xrTable4;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
+ private DevExpress.XtraReports.UI.XRRichText xrRichText4;
+ }
+}
diff --git a/ReportImp/DiakonieLandshut/RechnungEigenanteil.cs b/ReportImp/DiakonieLandshut/RechnungEigenanteil.cs
new file mode 100644
index 000000000..79bb6d80f
--- /dev/null
+++ b/ReportImp/DiakonieLandshut/RechnungEigenanteil.cs
@@ -0,0 +1,98 @@
+using System;
+using System.Text;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+using BS.Shared;
+using DevExpress.XtraReports.UI;
+
+namespace DiakonieLandshut
+{
+ public partial class RechnungEigenanteil : XtraReport, IBeWoReport
+ {
+ public RechnungEigenanteil()
+ {
+ this.InitializeComponent();
+ }
+
+ public void SetReportDataSource(InvoiceCustomerRO pRO)
+ {
+ if (pRO.CustomerSalutation == "Herr")
+ {
+ pRO.CustomerSalutation = "Herrn";
+ }
+ //if (start.Month == end.Month && start.Year == end.Year)
+ //{
+ // lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Monat {0:MMMM yyyy} folgende erbrachte Tätigkeiten:", start);
+ //}
+ //else
+ //{
+ // lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Zeitraum {0:MMMM yyyy} - {1:MMMM yyyy} folgende erbrachte Tätigkeiten:", start, end);
+ //}
+
+ StringBuilder sb = new StringBuilder();
+ if (!String.IsNullOrEmpty(pRO.RecipientOrganisation) && !String.IsNullOrEmpty(pRO.RecipientOrganisation.Trim()))
+ {
+ sb.AppendLine(pRO.RecipientOrganisation);
+ }
+ if (!String.IsNullOrEmpty(pRO.RecipientDivision) && !String.IsNullOrEmpty(pRO.RecipientDivision.Trim()))
+ {
+ sb.AppendLine(pRO.RecipientDivision);
+ }
+ if ((!String.IsNullOrEmpty(pRO.RecipientFirstName) && !String.IsNullOrEmpty(pRO.RecipientFirstName.Trim()))
+ || (!String.IsNullOrEmpty(pRO.RecipientLastName) && !String.IsNullOrEmpty(pRO.RecipientLastName.Trim())))
+ {
+ sb.AppendLine(String.Format("{0} {1}", pRO.RecipientFirstName, pRO.RecipientLastName).Trim());
+ }
+ if (!String.IsNullOrEmpty(pRO.RecipientStreet) && !String.IsNullOrEmpty(pRO.RecipientStreet.Trim()))
+ {
+ sb.AppendLine(pRO.RecipientStreet);
+ }
+ if (!String.IsNullOrEmpty(pRO.RecipientPostCode) && !String.IsNullOrEmpty(pRO.RecipientPostCode.Trim()))
+ {
+ sb.Append(pRO.RecipientPostCode);
+ sb.Append(" ");
+ }
+ if (!String.IsNullOrEmpty(pRO.RecipientTown) && !String.IsNullOrEmpty(pRO.RecipientTown.Trim()))
+ {
+ sb.Append(pRO.RecipientTown);
+ }
+
+ lblAdresse.Text = sb.ToString();
+
+
+ decimal bewilligt = 0;
+ decimal satz = 0;
+
+ String ansprechpartner = "";
+
+ //foreach (var sip in pRO.ServiceInvoicePeriods)
+ //{
+ // if (sip.CostBearer2SupportConcept != null && sip.CostBearer2SupportConcept.CostBearerContactPerson != null)
+ // {
+ // ansprechpartner = String.Format("{0} {1}",
+ // sip.CostBearer2SupportConcept.CostBearerContactPerson.Sex.HasValue &&
+ // sip.CostBearer2SupportConcept.CostBearerContactPerson.Sex.Value == Sex.Male
+ // ? "Herr"
+ // : "Frau", sip.CostBearer2SupportConcept.CostBearerContactPerson.LastName);
+ // }
+ // if (sip.SupportConceptApprovalPeriod != null)
+ // {
+ // bewilligt = sip.SupportConceptApprovalPeriod.ApprovedBEPerInterval ?? 0;
+ // }
+ // foreach (var ii in sip.ServiceInvoiceItems)
+ // {
+ // satz = ii.AmountPerUnit ?? 0;
+ // }
+ //}
+
+
+
+
+
+ //lblAnrede.Text = String.Format("Sehr geehrter {0},\r\n\r\nnachfolgend die Abrechnung des Ambulant Betreuten Einzelwohnens für\r\n{1} {2} {3} für den Zeitraum vom {4:dd.MM.yyyy} bis {5:dd.MM.yyyy}:", ansprechpartner, pRO.CustomerSalutation, pRO.CustomerFirstName, pRO.CustomerLastName, pRO.AccountingPeriodStart, pRO.AccountingPeriodEnd);
+
+ this.bindingSource1.DataSource = pRO;
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/ReportImp/DiakonieLandshut/RechnungEigenanteil.resx b/ReportImp/DiakonieLandshut/RechnungEigenanteil.resx
new file mode 100644
index 000000000..e2be5f1b8
--- /dev/null
+++ b/ReportImp/DiakonieLandshut/RechnungEigenanteil.resx
@@ -0,0 +1,154 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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
+
+
+ ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXABzADEAXABzAGIAYQBzAGUAZABvAG4AMABcAHMAbgBlAHgAdAAxAFwAcQBsAFwAdABxAGMAXAB0AHgANAA1ADMANgBcAHQAcQByAFwAdAB4ADkAMAA3ADIAXABmADEAXABmAHMAMgA0ACAAZgBvAG8AdABlAHIAOwB9AHsAXAAqAFwAYwBzADIAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAzAFwAcwBiAGEAcwBlAGQAbwBuADIAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADQAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXABjAHMANQBcAHMAYgBhAHMAZQBkAG8AbgAyAFwAZgAxAFwAZgBzADIANAAgAHAAYQBnAGUAIABuAHUAbQBiAGUAcgA7AH0AewBcACoAXAB0AHMANgBcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA3AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANgBcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGIAXABmAHMAMgA0AFwAYwBmADAAIABCAGUAdAB0AGkAbgBhACAAVwBpAG0AbQBlAHIAfQBcAGIAXABmAHMAMgA0AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmAHMAMQA4AFwAYwBmADAAIABEAGkAZQBuAHMAdABsAGUAaQB0AHUAbgBnAH0AXABmAHMAMQA4AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmAHMAMgAwAFwAYwBmADAAIABEAGkAcABsAC4AIABTAG8AegBpAGEAbABwAFwAdQAyADIAOABcACcAZQA0AGQAYQBnAG8AZwBpAG4AIAAoAEYASAApAH0AXABmAHMAMgAwAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABiAFwAZgBzADIAMABcAGMAZgAwACAAUgBlAGYAZQByAGEAdAAgAEcAZQBtAGUAaQBuAGQAZQBwAHMAeQBjAGgAaQBhAHQAcgBpAGUAIAB9AFwAYgBcAGYAcwAyADAAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGIAXABmAHMAMgAwAFwAYwBmADAAIABEAGkAYQBrAG8AbgBpAHMAYwBoAGUAcwAgAFcAZQByAGsAIABMAGEAbgBkAHMAaAB1AHQAIABlAC4AVgAuAH0AXABmAHMAMgA0AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A
+
+
+ Überweisen Sie bitte den Gesamtbetrag in Höhe von [TotalClaim] auf unser Konto bei der Sparkasse Landshut, IBAN: DE65 7435 0000 0000 0235 90,
+BIC: BYLADEM 1 LAH, unter Angabe der Rechnungsnummer.
+
+Herzlichen Wir danken Ihnen für Ihr Vertrauen.
+Der Betrag ist gemäß § 4 Nr. 18 UStG steuerfrei.
+
+Mit freundlichen Grüßen
+
+
+ ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAxADYAXABjAGYAMAAgAEQAaQBhAGsAbwBuAGkAcwBjAGgAZQBzACAAVwBlAHIAawAgAGQAZQBzAH0AXABmADIAXABmAHMAMQA2AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADIAXABmAHMAMQA2AFwAYwBmADAAIABFAHYAYQBuAGcAZQBsAGkAcwBjAGgALQBMAHUAdABoAGUAcgBpAHMAYwBoAGUAbgB9AFwAZgAyAFwAZgBzADEANgBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAZgAyAFwAZgBzADEANgBcAGMAZgAwACAARABlAGsAYQBuAGEAdABzAGIAZQB6AGkAcgBrAHMAIABMAGEAbgBkAHMAaAB1AHQAIABlAC4AVgAuAH0AXABmADIAXABmAHMAMQA2AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADIAXABmAHMAMQA2AFwAYwBmADAAIABHAGEAYgBlAGwAcwBiAGUAcgBnAGUAcgBzAHQAcgAuACAANAA2AH0AXABmADIAXABmAHMAMQA2AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADIAXABmAHMAMQA2AFwAYwBmADAAIAA4ADQAMAAzADQAIABMAGEAbgBkAHMAaAB1AHQAfQBcAGYAMgBcAGYAcwAxADYAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABmADIAXABmAHMAMQA2AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADIAXABmAHMAMQA2AFwAYwBmADAAIABUAGUAbABlAGYAbwBuADoAIAAwADgANwAxAC8AIAA2ADAAOQAgADAAfQBcAGYAMgBcAGYAcwAxADYAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAxADYAXABjAGYAMAAgAFQAZQBsAGUAZgBhAHgAOgAgADAAOAA3ADEALwAgADYAMAA5ACAAMwAzADMAfQBcAGYAMgBcAGYAcwAxADYAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAxADYAXABjAGYAMAAgAGkAbgBmAG8AQABkAGkAYQBrAG8AbgBpAGUALQBsAGEAbgBkAHMAaAB1AHQALgBkAGUAfQBcAGYAMgBcAGYAcwAxADYAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAxADYAXABjAGYAMAAgAHcAdwB3AC4AZABpAGEAawBvAG4AaQBlAC0AbABhAG4AZABzAGgAdQB0AC4AZABlAH0AXABmADIAXABmAHMAMQA2AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAZgAyAFwAZgBzADEANgBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAZgAyAFwAZgBzADEANgBcAGMAZgAwACAAUwBwAGEAcgBrAGEAcwBzAGUAIABMAGEAbgBkAHMAaAB1AHQAfQBcAGYAMgBcAGYAcwAxADYAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAxADYAXABjAGYAMAAgAEkAQgBBAE4AOgAgAH0AXABmADIAXABmAHMAMQA2AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADIAXABmAHMAMQA2AFwAYwBmADAAIABEAEUANgA1ACAANwA0ADMANQAgADAAMAAwADAAIAAwADAAMAAwACAAMAAyADMANQA5ADAAfQBcAGYAMgBcAGYAcwAxADYAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAxADYAXABjAGYAMAAgAEcAbABcAHUAMgAyADgAXAAnAGUANAB1AGIAaQBnAGUAcgAtAEkARAA6AH0AXABmADIAXABmAHMAMQA2AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADIAXABmAHMAMQA2AFwAYwBmADAAIABEAEUAMgA2AEQATABBADAAMAAwADAAMAAyADQAOQAwADgAMgB9AFwAZgAyAFwAZgBzADEANgBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGYAMgBcAGYAcwAxADYAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAxADYAXABjAGYAMAAgAFUAUwB0AC0ATgByAC4AIAAxADMAMgAvADEAMAA3AC8ANwAwADAAMQA2AH0AXABmADIAXABmAHMAMQA2AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADIAXABmAHMAMQA2AFwAYwBmADAAIABVAFMAdAAtAEkAZABOAHIALgAgAEQARQAgADEAOAA5ADgAMAAyADcANAAyAH0AXABmADIAXABmAHMAMQA2AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAZgAyAFwAZgBzADEANgBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAZgAyAFwAZgBzADEANgBcAGMAZgAwACAAUwBpAHQAegAgAHUAbgBkACAAUgBlAGcAaQBzAHQAZQByAGcAZQByAGkAYwBoAHQAfQBcAGYAMgBcAGYAcwAxADYAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAxADYAXABjAGYAMAAgAEwAYQBuAGQAcwBoAHUAdAAgAFYAUgAgADkANgB9AFwAZgAyAFwAZgBzADEANgBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGYAMgBcAGYAcwAxADYAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAxADYAXABjAGYAMAAgAFYAbwByAHMAdABhAG4AZAA6AH0AXABmADIAXABmAHMAMQA2AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADIAXABmAHMAMQA2AFwAYwBmADAAIABNAGEAbgB1AGUAbABhACAAQgBlAHIAZwBoAFwAdQAyADIAOABcACcAZQA0AHUAcwBlAHIAfQBcAGYAMgBcAGYAcwAxADYAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAxADYAXABjAGYAMAAgAEgAbwBsAGcAZQByACAAUABlAHQAZQByAHMAfQBcAGYAMgBcAGYAcwAxADYAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAfQA=
+
+
+ ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAxADIAXABjAGYAMAAgAEQAaQBhAGsAbwBuAGkAcwBjAGgAZQBzACAAVwBlAHIAawAgAEwAYQBuAGQAcwBoAHUAdAAgAGUALgBWAH0AewBcAGYAMgBcAGYAcwAxADQAXABjAGYAMAAgAC4AIABcAHUAMQA4ADMAXAAnAGIANwAgAH0AewBcAGYAMgBcAGYAcwAxADIAXABjAGYAMAAgAEcAYQBiAGUAbABzAGIAZQByAGcAZQByAHMAdAByAGEAXAB1ADIAMgAzAFwAJwBkAGYAZQAgADQANgAsACAAOAA0ADAAMwA0ACAATABhAG4AZABzAGgAdQB0AH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAfQA=
+
+
+ ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGIAXABmADIAXABmAHMAMQA2AFwAYwBmADAAIABHAGUAbQBlAGkAbgBkAGUAcABzAHkAYwBoAGkAYQB0AHIAaQBzAGMAaABlAHIAfQBcAGIAXABmADIAXABmAHMAMQA2AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABiAFwAZgAyAFwAZgBzADEANgBcAGMAZgAwACAARgBhAGMAaABkAGkAZQBuAHMAdAB9AFwAYgBcAGYAMgBcAGYAcwAxADYAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABiAFwAZgAyAFwAZgBzADEANgBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAYgBcAGYAMgBcAGYAcwAyADAAXABjAGYAMAAgAEEAfQB7AFwAZgAyAFwAZgBzADIAMABcAGMAZgAwACAAbQBiAHUAbABhAG4AdAAgAH0AXABiAFwAZgAyAFwAZgBzADIAMABcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAYgBcAGYAMgBcAGYAcwAyADAAXABjAGYAMAAgAEIAfQB7AFwAZgAyAFwAZgBzADIAMABcAGMAZgAwACAAZQB0AHIAZQB1AHQAZQBzAH0AewBcAGIAXABmADIAXABmAHMAMgAwAFwAYwBmADAAIAAgAH0AXABiAFwAZgAyAFwAZgBzADIAMABcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAYgBcAGYAMgBcAGYAcwAyADAAXABjAGYAMAAgAFcAfQB7AFwAZgAyAFwAZgBzADIAMABcAGMAZgAwACAAbwBoAG4AZQBuAH0AXABiAFwAZgAyAFwAZgBzADIAMABcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGYAMgBcAGYAcwAyADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABmADIAXABmAHMAMgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAZgAyAFwAZgBzADIAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAZgAyAFwAZgBzADEANwBcAGMAZgAwACAARgBvAG4AOgAgADAAOAA3ADEAIAAvACAANgAwADkAIAAyADgAOAB9AFwAZgAyAFwAZgBzADEANwBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGYAaQA0ADIANgBcAGwAaQAtADQAMgA2AFwAbABpAG4ALQA0ADIANgB7AFwAZgAyAFwAZgBzADEANwBcAGMAZgAwACAARgBhAHgAOgAgADAAOAA3ADEAIAAvACAANgAwADkAIAA2ADIAOAA4AH0AXABmADIAXABmAHMAMQA3AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADIAXABmAHMAMQA3AFwAYwBmADAAIABFAC0ATQBhAGkAbAA6AH0AXABmADIAXABmAHMAMQA3AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADIAXABmAHMAMQA3AFwAYwBmADAAIABiAHcAaQBtAG0AZQByAEAAfQBcAGYAMgBcAGYAcwAxADcAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAxADcAXABjAGYAMAAgAGQAaQBhAGsAbwBuAGkAZQAtAGwAYQBuAGQAcwBoAHUAdAAuAGQAZQB9AFwAZgAyAFwAZgBzADEANwBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAZgAyAFwAZgBzADEAOABcAGMAZgAwACAAdwB3AHcALgBkAGkAYQBrAG8AbgBpAGUALQBsAGEAbgBkAHMAaAB1AHQALgBkAGUAfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgB9AA==
+
+
+ [RecipientSalutation] [RecipientLastName],
+
+wie vereinbart erlauben wir uns Ihnen die Betreuungsleistungen für den
+Zeitraum vom [AccountingPeriod] in Rechnung zu stellen.
+Die Abrechnung der Betreuungsentgelte erfolgt gemäß unserer
+Leistungsvereinbarung mit dem Bezirk Niederbayern
+und nach aktueller Vergütungsvereinbarung (Stundensatz [InvoiceItems.UnitPrice!c]).
+
+
+
+ 17, 17
+
+
\ No newline at end of file
diff --git a/ReportImp/DiakonieLandshut/ServiceInvoiceReport.Designer.cs b/ReportImp/DiakonieLandshut/ServiceInvoiceReport.Designer.cs
index dae14dd17..07c8a7106 100644
--- a/ReportImp/DiakonieLandshut/ServiceInvoiceReport.Designer.cs
+++ b/ReportImp/DiakonieLandshut/ServiceInvoiceReport.Designer.cs
@@ -35,11 +35,27 @@ namespace DiakonieLandshut
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.lblAnrede = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
+ this.lblBetreuungssatz = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
@@ -53,8 +69,8 @@ namespace DiakonieLandshut
this.xrTableRow25 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
@@ -68,29 +84,13 @@ namespace DiakonieLandshut
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
- this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
- this.lblBetreuungssatz = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
- this.lblAnrede = new DevExpress.XtraReports.UI.XRLabel();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -133,6 +133,169 @@ namespace DiakonieLandshut
this.Page1.Name = "Page1";
this.Page1.StylePriority.UseFont = false;
//
+ // lblAnrede
+ //
+ this.lblAnrede.BackColor = System.Drawing.Color.Transparent;
+ this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 398.0002F);
+ this.lblAnrede.Multiline = true;
+ this.lblAnrede.Name = "lblAnrede";
+ this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.lblAnrede.SizeF = new System.Drawing.SizeF(494.31F, 90F);
+ this.lblAnrede.StylePriority.UseBackColor = false;
+ this.lblAnrede.StylePriority.UseFont = false;
+ this.lblAnrede.Text = "Sehr geehrter Herr Maurer,\r\n\r\nnachfolgend die Abrechnung des Ambulant Betreuten E" +
+ "inzelwohnens für\r\nFrau S…. Kn ….. für den Zeitraum vom 01.04. bis 30.04.2018:";
+ this.lblAnrede.WordWrap = false;
+ //
+ // xrLabel14
+ //
+ this.xrLabel14.BackColor = System.Drawing.Color.Transparent;
+ this.xrLabel14.CanShrink = true;
+ this.xrLabel14.Font = new System.Drawing.Font("Calibri", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 344.0001F);
+ this.xrLabel14.Multiline = true;
+ this.xrLabel14.Name = "xrLabel14";
+ this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel14.SizeF = new System.Drawing.SizeF(494.31F, 18F);
+ this.xrLabel14.StylePriority.UseBackColor = false;
+ this.xrLabel14.StylePriority.UseFont = false;
+ this.xrLabel14.Text = "Rechnungsnummer: [InvoiceNumber]";
+ this.xrLabel14.WordWrap = false;
+ //
+ // lblBetreuungssatz
+ //
+ this.lblBetreuungssatz.BackColor = System.Drawing.Color.Transparent;
+ this.lblBetreuungssatz.CanShrink = true;
+ this.lblBetreuungssatz.LocationFloat = new DevExpress.Utils.PointFloat(0.003306071F, 326.0001F);
+ this.lblBetreuungssatz.Multiline = true;
+ this.lblBetreuungssatz.Name = "lblBetreuungssatz";
+ this.lblBetreuungssatz.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.lblBetreuungssatz.SizeF = new System.Drawing.SizeF(494.31F, 18F);
+ this.lblBetreuungssatz.StylePriority.UseBackColor = false;
+ this.lblBetreuungssatz.StylePriority.UseFont = false;
+ this.lblBetreuungssatz.Text = "Betreuungsschlüssel 1 : 6 / Betreuungssatz 33,54 €";
+ this.lblBetreuungssatz.WordWrap = false;
+ //
+ // xrLabel7
+ //
+ this.xrLabel7.BackColor = System.Drawing.Color.Transparent;
+ this.xrLabel7.CanShrink = true;
+ this.xrLabel7.Font = new System.Drawing.Font("Calibri", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 308.0001F);
+ 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(494.31F, 18F);
+ this.xrLabel7.StylePriority.UseBackColor = false;
+ this.xrLabel7.StylePriority.UseFont = false;
+ this.xrLabel7.Text = "[CustomerSalutation] [CustomerFirstName] [CustomerLastName]";
+ this.xrLabel7.WordWrap = false;
+ //
+ // xrLabel1
+ //
+ this.xrLabel1.BackColor = System.Drawing.Color.Transparent;
+ this.xrLabel1.CanShrink = true;
+ this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 290F);
+ this.xrLabel1.Multiline = true;
+ this.xrLabel1.Name = "xrLabel1";
+ this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel1.SizeF = new System.Drawing.SizeF(494.31F, 18F);
+ this.xrLabel1.StylePriority.UseBackColor = false;
+ this.xrLabel1.StylePriority.UseFont = false;
+ this.xrLabel1.Text = "Einzelabrechnung Ambulant Betreutes Einzelwohnen für";
+ this.xrLabel1.WordWrap = false;
+ //
+ // xrTable2
+ //
+ this.xrTable2.Font = new System.Drawing.Font("Calibri", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0.003306071F, 212.9167F);
+ this.xrTable2.Name = "xrTable2";
+ this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow2,
+ this.xrTableRow3});
+ this.xrTable2.SizeF = new System.Drawing.SizeF(550F, 40F);
+ this.xrTable2.StylePriority.UseBorderColor = false;
+ this.xrTable2.StylePriority.UseBorders = false;
+ this.xrTable2.StylePriority.UseFont = false;
+ this.xrTable2.StylePriority.UseTextAlignment = false;
+ this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+ //
+ // xrTableRow2
+ //
+ this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell2,
+ this.xrTableCell4,
+ this.xrTableCell11,
+ this.xrTableCell12});
+ this.xrTableRow2.Name = "xrTableRow2";
+ this.xrTableRow2.StylePriority.UseBackColor = false;
+ this.xrTableRow2.StylePriority.UseFont = false;
+ this.xrTableRow2.Weight = 0.027511789647828321D;
+ //
+ // xrTableCell2
+ //
+ this.xrTableCell2.Name = "xrTableCell2";
+ this.xrTableCell2.Text = "Ihr Zeichen";
+ this.xrTableCell2.Weight = 0.14789962160754391D;
+ //
+ // xrTableCell4
+ //
+ this.xrTableCell4.Multiline = true;
+ this.xrTableCell4.Name = "xrTableCell4";
+ this.xrTableCell4.StylePriority.UseTextAlignment = false;
+ this.xrTableCell4.Text = "Unser Zeichen";
+ this.xrTableCell4.Weight = 0.19340719124451974D;
+ //
+ // xrTableCell11
+ //
+ this.xrTableCell11.Multiline = true;
+ this.xrTableCell11.Name = "xrTableCell11";
+ this.xrTableCell11.StylePriority.UseTextAlignment = false;
+ this.xrTableCell11.Text = "Auskunft bei";
+ this.xrTableCell11.Weight = 0.1706534100124682D;
+ //
+ // xrTableCell12
+ //
+ this.xrTableCell12.Name = "xrTableCell12";
+ this.xrTableCell12.Text = "Datum";
+ this.xrTableCell12.Weight = 0.11376893966674673D;
+ //
+ // xrTableRow3
+ //
+ this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell13,
+ this.xrTableCell15,
+ this.xrTableCell17,
+ this.xrTableCell20});
+ this.xrTableRow3.Name = "xrTableRow3";
+ this.xrTableRow3.Weight = 0.027511789647828321D;
+ //
+ // xrTableCell13
+ //
+ this.xrTableCell13.Name = "xrTableCell13";
+ this.xrTableCell13.Weight = 0.14789962160754386D;
+ //
+ // xrTableCell15
+ //
+ this.xrTableCell15.Name = "xrTableCell15";
+ this.xrTableCell15.Weight = 0.19340719124451972D;
+ //
+ // xrTableCell17
+ //
+ this.xrTableCell17.Font = new System.Drawing.Font("Calibri", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrTableCell17.Name = "xrTableCell17";
+ this.xrTableCell17.StylePriority.UseFont = false;
+ this.xrTableCell17.Text = "Bettina Wimmer";
+ this.xrTableCell17.Weight = 0.17065341001246823D;
+ //
+ // xrTableCell20
+ //
+ this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
+ this.xrTableCell20.Name = "xrTableCell20";
+ this.xrTableCell20.Text = "xrTableCell20";
+ this.xrTableCell20.Weight = 0.11376893966674676D;
+ //
// xrTable1
//
this.xrTable1.BackColor = System.Drawing.Color.LightGray;
@@ -170,18 +333,6 @@ namespace DiakonieLandshut
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell6.Weight = 0.18461537386512594D;
//
- // xrTableCell7
- //
- this.xrTableCell7.Name = "xrTableCell7";
- this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTableCell7.StylePriority.UseBorders = false;
- this.xrTableCell7.StylePriority.UseForeColor = false;
- this.xrTableCell7.StylePriority.UsePadding = false;
- this.xrTableCell7.StylePriority.UseTextAlignment = false;
- this.xrTableCell7.Text = "Betreuungssatz";
- this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell7.Weight = 0.16923075463540421D;
- //
// xrTableCell8
//
this.xrTableCell8.Name = "xrTableCell8";
@@ -194,6 +345,18 @@ namespace DiakonieLandshut
this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell8.Weight = 0.10769229968159921D;
//
+ // xrTableCell7
+ //
+ this.xrTableCell7.Name = "xrTableCell7";
+ this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell7.StylePriority.UseBorders = false;
+ this.xrTableCell7.StylePriority.UseForeColor = false;
+ this.xrTableCell7.StylePriority.UsePadding = false;
+ this.xrTableCell7.StylePriority.UseTextAlignment = false;
+ this.xrTableCell7.Text = "Betreuungssatz";
+ this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell7.Weight = 0.16923075463540421D;
+ //
// xrTableCell10
//
this.xrTableCell10.CanShrink = true;
@@ -326,19 +489,6 @@ namespace DiakonieLandshut
this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell43.Weight = 0.31019201026855053D;
//
- // xrTableCell45
- //
- this.xrTableCell45.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.GrossAmount")});
- 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.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell45.Weight = 0.55391430225427019D;
- //
// xrTableCell46
//
this.xrTableCell46.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -352,6 +502,19 @@ namespace DiakonieLandshut
this.xrTableCell46.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell46.Weight = 0.48744458271098445D;
//
+ // xrTableCell45
+ //
+ this.xrTableCell45.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.GrossAmount")});
+ 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.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell45.Weight = 0.55391430225427019D;
+ //
// xrTableCell47
//
this.xrTableCell47.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -478,169 +641,6 @@ namespace DiakonieLandshut
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.Text = resources.GetString("xrLabel9.Text");
//
- // xrTable2
- //
- this.xrTable2.Font = new System.Drawing.Font("Calibri", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0.003306071F, 212.9167F);
- this.xrTable2.Name = "xrTable2";
- this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
- this.xrTableRow2,
- this.xrTableRow3});
- this.xrTable2.SizeF = new System.Drawing.SizeF(550F, 40F);
- this.xrTable2.StylePriority.UseBorderColor = false;
- this.xrTable2.StylePriority.UseBorders = false;
- this.xrTable2.StylePriority.UseFont = false;
- this.xrTable2.StylePriority.UseTextAlignment = false;
- this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
- //
- // xrTableRow2
- //
- this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell2,
- this.xrTableCell4,
- this.xrTableCell11,
- this.xrTableCell12});
- this.xrTableRow2.Name = "xrTableRow2";
- this.xrTableRow2.StylePriority.UseBackColor = false;
- this.xrTableRow2.StylePriority.UseFont = false;
- this.xrTableRow2.Weight = 0.027511789647828321D;
- //
- // xrTableCell2
- //
- this.xrTableCell2.Name = "xrTableCell2";
- this.xrTableCell2.Text = "Ihr Zeichen";
- this.xrTableCell2.Weight = 0.14789962160754391D;
- //
- // xrTableCell4
- //
- this.xrTableCell4.Multiline = true;
- this.xrTableCell4.Name = "xrTableCell4";
- this.xrTableCell4.StylePriority.UseTextAlignment = false;
- this.xrTableCell4.Text = "Unser Zeichen";
- this.xrTableCell4.Weight = 0.19340719124451974D;
- //
- // xrTableCell11
- //
- this.xrTableCell11.Multiline = true;
- this.xrTableCell11.Name = "xrTableCell11";
- this.xrTableCell11.StylePriority.UseTextAlignment = false;
- this.xrTableCell11.Text = "Auskunft bei";
- this.xrTableCell11.Weight = 0.1706534100124682D;
- //
- // xrTableCell12
- //
- this.xrTableCell12.Name = "xrTableCell12";
- this.xrTableCell12.Text = "Datum";
- this.xrTableCell12.Weight = 0.11376893966674673D;
- //
- // xrTableRow3
- //
- this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell13,
- this.xrTableCell15,
- this.xrTableCell17,
- this.xrTableCell20});
- this.xrTableRow3.Name = "xrTableRow3";
- this.xrTableRow3.Weight = 0.027511789647828321D;
- //
- // xrTableCell13
- //
- this.xrTableCell13.Name = "xrTableCell13";
- this.xrTableCell13.Weight = 0.14789962160754386D;
- //
- // xrTableCell15
- //
- this.xrTableCell15.Name = "xrTableCell15";
- this.xrTableCell15.Weight = 0.19340719124451972D;
- //
- // xrTableCell17
- //
- this.xrTableCell17.Font = new System.Drawing.Font("Calibri", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.xrTableCell17.Name = "xrTableCell17";
- this.xrTableCell17.StylePriority.UseFont = false;
- this.xrTableCell17.Text = "Bettina Wimmer";
- this.xrTableCell17.Weight = 0.17065341001246823D;
- //
- // xrTableCell20
- //
- this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
- this.xrTableCell20.Name = "xrTableCell20";
- this.xrTableCell20.Text = "xrTableCell20";
- this.xrTableCell20.Weight = 0.11376893966674676D;
- //
- // xrLabel1
- //
- this.xrLabel1.BackColor = System.Drawing.Color.Transparent;
- this.xrLabel1.CanShrink = true;
- this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 290F);
- this.xrLabel1.Multiline = true;
- this.xrLabel1.Name = "xrLabel1";
- this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel1.SizeF = new System.Drawing.SizeF(494.31F, 18F);
- this.xrLabel1.StylePriority.UseBackColor = false;
- this.xrLabel1.StylePriority.UseFont = false;
- this.xrLabel1.Text = "Einzelabrechnung Ambulant Betreutes Einzelwohnen für";
- this.xrLabel1.WordWrap = false;
- //
- // xrLabel7
- //
- this.xrLabel7.BackColor = System.Drawing.Color.Transparent;
- this.xrLabel7.CanShrink = true;
- this.xrLabel7.Font = new System.Drawing.Font("Calibri", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 308.0001F);
- 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(494.31F, 18F);
- this.xrLabel7.StylePriority.UseBackColor = false;
- this.xrLabel7.StylePriority.UseFont = false;
- this.xrLabel7.Text = "[CustomerSalutation] [CustomerFirstName] [CustomerLastName]";
- this.xrLabel7.WordWrap = false;
- //
- // lblBetreuungssatz
- //
- this.lblBetreuungssatz.BackColor = System.Drawing.Color.Transparent;
- this.lblBetreuungssatz.CanShrink = true;
- this.lblBetreuungssatz.LocationFloat = new DevExpress.Utils.PointFloat(0.003306071F, 326.0001F);
- this.lblBetreuungssatz.Multiline = true;
- this.lblBetreuungssatz.Name = "lblBetreuungssatz";
- this.lblBetreuungssatz.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.lblBetreuungssatz.SizeF = new System.Drawing.SizeF(494.31F, 18F);
- this.lblBetreuungssatz.StylePriority.UseBackColor = false;
- this.lblBetreuungssatz.StylePriority.UseFont = false;
- this.lblBetreuungssatz.Text = "Betreuungsschlüssel 1 : 6 / Betreuungssatz 33,54 €";
- this.lblBetreuungssatz.WordWrap = false;
- //
- // xrLabel14
- //
- this.xrLabel14.BackColor = System.Drawing.Color.Transparent;
- this.xrLabel14.CanShrink = true;
- this.xrLabel14.Font = new System.Drawing.Font("Calibri", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 344.0001F);
- this.xrLabel14.Multiline = true;
- this.xrLabel14.Name = "xrLabel14";
- this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel14.SizeF = new System.Drawing.SizeF(494.31F, 18F);
- this.xrLabel14.StylePriority.UseBackColor = false;
- this.xrLabel14.StylePriority.UseFont = false;
- this.xrLabel14.Text = "Rechnungsnummer: [InvoiceNumber]";
- this.xrLabel14.WordWrap = false;
- //
- // lblAnrede
- //
- this.lblAnrede.BackColor = System.Drawing.Color.Transparent;
- this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 398.0002F);
- this.lblAnrede.Multiline = true;
- this.lblAnrede.Name = "lblAnrede";
- this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.lblAnrede.SizeF = new System.Drawing.SizeF(494.31F, 90F);
- this.lblAnrede.StylePriority.UseBackColor = false;
- this.lblAnrede.StylePriority.UseFont = false;
- this.lblAnrede.Text = "Sehr geehrter Herr Maurer,\r\n\r\nnachfolgend die Abrechnung des Ambulant Betreuten E" +
- "inzelwohnens für\r\nFrau S…. Kn ….. für den Zeitraum vom 01.04. bis 30.04.2018:";
- this.lblAnrede.WordWrap = false;
- //
// ServiceInvoiceReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -660,13 +660,13 @@ namespace DiakonieLandshut
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.Version = "17.1";
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
diff --git a/ReportImp/DiakonieLandshut/ServiceInvoiceReport.resx b/ReportImp/DiakonieLandshut/ServiceInvoiceReport.resx
index 369b16272..c355ad049 100644
--- a/ReportImp/DiakonieLandshut/ServiceInvoiceReport.resx
+++ b/ReportImp/DiakonieLandshut/ServiceInvoiceReport.resx
@@ -128,7 +128,7 @@
Bitte überweisen Sie den Betrag in Höhe von [GrossClaim] auf unser Konto bei der
-Sparkasse Landshut, IBAN: DE65 7435 0000 0000 0235 90 , BIC: BYLADEM 1 LAH,
+Sparkasse Landshut, IBAN: DE65 7435 0000 0000 0235 90, BIC: BYLADEM 1 LAH,
unter Angabe der Rechnungsnummer.
Wir danken Ihnen für Ihr Vertrauen.
diff --git a/ReportImp/LebenshilfeKusel/ServicesOverviewReport.Designer.cs b/ReportImp/LebenshilfeKusel/ServicesOverviewReport.Designer.cs
index 3a1bd0126..d1a12732c 100644
--- a/ReportImp/LebenshilfeKusel/ServicesOverviewReport.Designer.cs
+++ b/ReportImp/LebenshilfeKusel/ServicesOverviewReport.Designer.cs
@@ -46,6 +46,7 @@ namespace LebenshilfeKusel
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.ruleRowInisible = new DevExpress.XtraReports.UI.FormattingRule();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
@@ -73,11 +74,11 @@ namespace LebenshilfeKusel
this.lblFLSTotal = new DevExpress.XtraReports.UI.XRLabel();
this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
this.ruleMinutesEqualsZero = new DevExpress.XtraReports.UI.FormattingRule();
- this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+ this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -224,6 +225,8 @@ namespace LebenshilfeKusel
//
// xrTableCell2
//
+ this.xrTableCell2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.picSignature});
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.StylePriority.UseTextAlignment = false;
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
@@ -245,6 +248,10 @@ namespace LebenshilfeKusel
this.GroupHeader1.RepeatEveryPage = true;
this.GroupHeader1.StylePriority.UseFont = false;
//
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+ //
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
@@ -515,9 +522,17 @@ namespace LebenshilfeKusel
this.ruleMinutesEqualsZero.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.ruleMinutesEqualsZero.Name = "ruleMinutesEqualsZero";
//
- // bindingSource1
+ // picSignature
//
- this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+ this.picSignature.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.picSignature.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")});
+ this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(0.9999593F, 1.000023F);
+ this.picSignature.Name = "picSignature";
+ this.picSignature.SizeF = new System.Drawing.SizeF(258F, 23F);
+ this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+ this.picSignature.StylePriority.UseBorders = false;
+ this.picSignature.BeforePrint += new System.Drawing.Printing.PrintEventHandler(this.picSignature_BeforePrint);
//
// Stundenzettel
//
@@ -550,8 +565,8 @@ namespace LebenshilfeKusel
this.Watermark.ImageViewMode = DevExpress.XtraPrinting.Drawing.ImageViewMode.Zoom;
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -601,5 +616,6 @@ namespace LebenshilfeKusel
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
+ private DevExpress.XtraReports.UI.XRPictureBox picSignature;
}
}
diff --git a/ReportImp/LebenshilfeKusel/ServicesOverviewReport.cs b/ReportImp/LebenshilfeKusel/ServicesOverviewReport.cs
index 06138e6fb..601843e39 100644
--- a/ReportImp/LebenshilfeKusel/ServicesOverviewReport.cs
+++ b/ReportImp/LebenshilfeKusel/ServicesOverviewReport.cs
@@ -7,6 +7,10 @@ using DevExpress.XtraReports.UI;
using BeWo.Report.ReportObjects;
using BeWo.Report;
using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Text.RegularExpressions;
+using BS.Shared.Core;
namespace LebenshilfeKusel
{
@@ -34,7 +38,8 @@ namespace LebenshilfeKusel
{
if (s.IsBillable)
{
- if (s.ServiceCategory.StartsWith("Assistenz"))
+ ServicesOverviewRO.CreateSignatureString(s);
+ if (s.ServiceCategory.StartsWith("Assistenz"))
{
showALS = true;
}
@@ -111,5 +116,32 @@ namespace LebenshilfeKusel
return null;
}
+ private void picSignature_BeforePrint(object sender, System.Drawing.Printing.PrintEventArgs e)
+ {
+ XRPictureBox xrBox = sender as XRPictureBox;
+ //var test = this.GetCurrent
+ string base64String = xrBox.Tag as string;
+ if (!String.IsNullOrWhiteSpace(base64String))
+ {
+ var base64Data = Regex.Match(base64String, @"data:image/(?.+?),(?.+)").Groups["data"].Value;
+ var binData = Convert.FromBase64String(base64Data);
+ Image img = ByteArrayToImage(binData);
+ xrBox.Image = Utils.CropImage(img);
+ }
+ else
+ {
+ xrBox.Image = null;
+ }
+ }
+
+ public Image ByteArrayToImage(byte[] byteArrayIn)
+ {
+ Image returnImage = null;
+ MemoryStream ms = new System.IO.MemoryStream(byteArrayIn);
+ returnImage = Image.FromStream(ms);
+
+ return returnImage;
+ }
+
}
}
diff --git a/ReportImp/LebenshilfeMoenchengladbach/Quittierungsbeleg.Designer.cs b/ReportImp/LebenshilfeMoenchengladbach/Quittierungsbeleg.Designer.cs
index 76c4cacbc..b0aefbdeb 100644
--- a/ReportImp/LebenshilfeMoenchengladbach/Quittierungsbeleg.Designer.cs
+++ b/ReportImp/LebenshilfeMoenchengladbach/Quittierungsbeleg.Designer.cs
@@ -49,19 +49,19 @@ namespace LebenshilfeMoenchengladbach
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.cellFlsIn = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.cellMinuten = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
- this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
+ this.lblBewilligteFlsWoche = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
@@ -104,10 +104,10 @@ namespace LebenshilfeMoenchengladbach
this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
+ this.lblGR = new DevExpress.XtraReports.UI.XRLabel();
+ this.lblF = new DevExpress.XtraReports.UI.XRLabel();
+ this.lblOhne12 = new DevExpress.XtraReports.UI.XRLabel();
+ this.lblFachleistungenInMinuten = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField();
@@ -301,7 +301,7 @@ namespace LebenshilfeMoenchengladbach
this.xrTableCell3,
this.xrTableCell4,
this.xrTableCell11,
- this.xrTableCell9,
+ this.cellFlsIn,
this.xrTableCell28});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
@@ -354,21 +354,21 @@ namespace LebenshilfeMoenchengladbach
this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
this.xrTableCell11.Weight = 0.27932960893854752D;
//
- // xrTableCell9
+ // cellFlsIn
//
- this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ this.cellFlsIn.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
- this.xrTableCell9.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.xrTableCell9.Multiline = true;
- this.xrTableCell9.Name = "xrTableCell9";
- this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
- this.xrTableCell9.StylePriority.UseBorders = false;
- this.xrTableCell9.StylePriority.UseFont = false;
- this.xrTableCell9.StylePriority.UsePadding = false;
- this.xrTableCell9.StylePriority.UseTextAlignment = false;
- this.xrTableCell9.Text = "FLS in";
- this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
- this.xrTableCell9.Weight = 0.27932960893854752D;
+ this.cellFlsIn.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.cellFlsIn.Multiline = true;
+ this.cellFlsIn.Name = "cellFlsIn";
+ this.cellFlsIn.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+ this.cellFlsIn.StylePriority.UseBorders = false;
+ this.cellFlsIn.StylePriority.UseFont = false;
+ this.cellFlsIn.StylePriority.UsePadding = false;
+ this.cellFlsIn.StylePriority.UseTextAlignment = false;
+ this.cellFlsIn.Text = "FLS in";
+ this.cellFlsIn.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
+ this.cellFlsIn.Weight = 0.27932960893854752D;
//
// xrTableCell28
//
@@ -390,7 +390,7 @@ namespace LebenshilfeMoenchengladbach
this.xrTableCell8,
this.xrTableCell5,
this.xrTableCell6,
- this.xrTableCell7,
+ this.cellMinuten,
this.xrTableCell43});
this.xrTableRow1.Name = "xrTableRow1";
this.xrTableRow1.Weight = 1.223644578313253D;
@@ -446,21 +446,21 @@ namespace LebenshilfeMoenchengladbach
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell6.Weight = 0.27932960893854752D;
//
- // xrTableCell7
+ // cellMinuten
//
- this.xrTableCell7.BackColor = System.Drawing.Color.Gainsboro;
- this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ this.cellMinuten.BackColor = System.Drawing.Color.Gainsboro;
+ this.cellMinuten.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableCell7.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.xrTableCell7.Multiline = true;
- this.xrTableCell7.Name = "xrTableCell7";
- this.xrTableCell7.StylePriority.UseBackColor = false;
- this.xrTableCell7.StylePriority.UseBorders = false;
- this.xrTableCell7.StylePriority.UseFont = false;
- this.xrTableCell7.StylePriority.UseTextAlignment = false;
- this.xrTableCell7.Text = "Minuten\r\n(ohne 1,2)";
- this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
- this.xrTableCell7.Weight = 0.27932960893854752D;
+ this.cellMinuten.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.cellMinuten.Multiline = true;
+ this.cellMinuten.Name = "cellMinuten";
+ this.cellMinuten.StylePriority.UseBackColor = false;
+ this.cellMinuten.StylePriority.UseBorders = false;
+ this.cellMinuten.StylePriority.UseFont = false;
+ this.cellMinuten.StylePriority.UseTextAlignment = false;
+ this.cellMinuten.Text = "Minuten\r\n(ohne 1,2)";
+ this.cellMinuten.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+ this.cellMinuten.Weight = 0.27932960893854752D;
//
// xrTableCell43
//
@@ -486,7 +486,7 @@ namespace LebenshilfeMoenchengladbach
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
- this.xrLabel14,
+ this.lblBewilligteFlsWoche,
this.xrLabel16,
this.xrLabel7,
this.xrLabel8,
@@ -498,23 +498,23 @@ namespace LebenshilfeMoenchengladbach
this.ReportHeader.HeightF = 130F;
this.ReportHeader.Name = "ReportHeader";
//
- // xrLabel14
+ // lblBewilligteFlsWoche
//
- this.xrLabel14.BackColor = System.Drawing.Color.Gainsboro;
- this.xrLabel14.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ this.lblBewilligteFlsWoche.BackColor = System.Drawing.Color.Gainsboro;
+ this.lblBewilligteFlsWoche.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
- this.xrLabel14.Font = new System.Drawing.Font("Arial", 10F);
- this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(370.9997F, 48.15276F);
- this.xrLabel14.Name = "xrLabel14";
- this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
- this.xrLabel14.SizeF = new System.Drawing.SizeF(178.7501F, 30.50001F);
- this.xrLabel14.StylePriority.UseBackColor = false;
- this.xrLabel14.StylePriority.UseBorders = false;
- this.xrLabel14.StylePriority.UseFont = false;
- this.xrLabel14.StylePriority.UsePadding = false;
- this.xrLabel14.StylePriority.UseTextAlignment = false;
- this.xrLabel14.Text = "Bewilligte FLS wöchentlich";
- this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.lblBewilligteFlsWoche.Font = new System.Drawing.Font("Arial", 10F);
+ this.lblBewilligteFlsWoche.LocationFloat = new DevExpress.Utils.PointFloat(370.9997F, 48.15276F);
+ this.lblBewilligteFlsWoche.Name = "lblBewilligteFlsWoche";
+ this.lblBewilligteFlsWoche.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+ this.lblBewilligteFlsWoche.SizeF = new System.Drawing.SizeF(178.7501F, 30.50001F);
+ this.lblBewilligteFlsWoche.StylePriority.UseBackColor = false;
+ this.lblBewilligteFlsWoche.StylePriority.UseBorders = false;
+ this.lblBewilligteFlsWoche.StylePriority.UseFont = false;
+ this.lblBewilligteFlsWoche.StylePriority.UsePadding = false;
+ this.lblBewilligteFlsWoche.StylePriority.UseTextAlignment = false;
+ this.lblBewilligteFlsWoche.Text = "Bewilligte FLS wöchentlich";
+ this.lblBewilligteFlsWoche.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// xrLabel16
//
@@ -694,10 +694,10 @@ namespace LebenshilfeMoenchengladbach
this.xrRichText2,
this.xrRichText1,
this.xrLabel15,
- this.xrLabel13,
- this.xrLabel12,
- this.xrLabel11,
- this.xrLabel10,
+ this.lblGR,
+ this.lblF,
+ this.lblOhne12,
+ this.lblFachleistungenInMinuten,
this.xrLabel9,
this.xrLabel1});
this.GroupFooter1.HeightF = 270F;
@@ -1016,66 +1016,66 @@ namespace LebenshilfeMoenchengladbach
this.xrLabel15.Text = "Krankenhausaufenthalte/\r\nstat. Rehamaßnahmen:";
this.xrLabel15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
- // xrLabel13
+ // lblGR
//
- this.xrLabel13.Font = new System.Drawing.Font("Arial", 10F);
- this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 39.99998F);
- this.xrLabel13.Name = "xrLabel13";
- this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
- this.xrLabel13.SizeF = new System.Drawing.SizeF(320F, 20F);
- this.xrLabel13.StylePriority.UseBackColor = false;
- this.xrLabel13.StylePriority.UseBorders = false;
- this.xrLabel13.StylePriority.UseFont = false;
- this.xrLabel13.StylePriority.UsePadding = false;
- this.xrLabel13.StylePriority.UseTextAlignment = false;
- this.xrLabel13.Text = "GR = Gruppenangebot";
- this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.lblGR.Font = new System.Drawing.Font("Arial", 10F);
+ this.lblGR.LocationFloat = new DevExpress.Utils.PointFloat(0F, 39.99998F);
+ this.lblGR.Name = "lblGR";
+ this.lblGR.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+ this.lblGR.SizeF = new System.Drawing.SizeF(320F, 20F);
+ this.lblGR.StylePriority.UseBackColor = false;
+ this.lblGR.StylePriority.UseBorders = false;
+ this.lblGR.StylePriority.UseFont = false;
+ this.lblGR.StylePriority.UsePadding = false;
+ this.lblGR.StylePriority.UseTextAlignment = false;
+ this.lblGR.Text = "GR = Gruppenangebot";
+ this.lblGR.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
- // xrLabel12
+ // lblF
//
- this.xrLabel12.Font = new System.Drawing.Font("Arial", 10F);
- this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 19.99999F);
- this.xrLabel12.Name = "xrLabel12";
- this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
- this.xrLabel12.SizeF = new System.Drawing.SizeF(320F, 20F);
- this.xrLabel12.StylePriority.UseBackColor = false;
- this.xrLabel12.StylePriority.UseBorders = false;
- this.xrLabel12.StylePriority.UseFont = false;
- this.xrLabel12.StylePriority.UsePadding = false;
- this.xrLabel12.StylePriority.UseTextAlignment = false;
- this.xrLabel12.Text = "F = ear to ear, face to face";
- this.xrLabel12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.lblF.Font = new System.Drawing.Font("Arial", 10F);
+ this.lblF.LocationFloat = new DevExpress.Utils.PointFloat(0F, 19.99999F);
+ this.lblF.Name = "lblF";
+ this.lblF.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+ this.lblF.SizeF = new System.Drawing.SizeF(320F, 20F);
+ this.lblF.StylePriority.UseBackColor = false;
+ this.lblF.StylePriority.UseBorders = false;
+ this.lblF.StylePriority.UseFont = false;
+ this.lblF.StylePriority.UsePadding = false;
+ this.lblF.StylePriority.UseTextAlignment = false;
+ this.lblF.Text = "F = ear to ear, face to face";
+ this.lblF.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
- // xrLabel11
+ // lblOhne12
//
- this.xrLabel11.Font = new System.Drawing.Font("Arial", 8F);
- this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(370.9997F, 20.00001F);
- this.xrLabel11.Name = "xrLabel11";
- this.xrLabel11.SizeF = new System.Drawing.SizeF(300.0697F, 20F);
- this.xrLabel11.StylePriority.UseBackColor = false;
- this.xrLabel11.StylePriority.UseBorders = false;
- this.xrLabel11.StylePriority.UseFont = false;
- this.xrLabel11.StylePriority.UsePadding = false;
- this.xrLabel11.StylePriority.UseTextAlignment = false;
- this.xrLabel11.Text = "Ohne Faktor 1,2 (wird erst bei Abrechnung eingerechnet)";
- this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.lblOhne12.Font = new System.Drawing.Font("Arial", 8F);
+ this.lblOhne12.LocationFloat = new DevExpress.Utils.PointFloat(370.9997F, 20.00001F);
+ this.lblOhne12.Name = "lblOhne12";
+ this.lblOhne12.SizeF = new System.Drawing.SizeF(300.0697F, 20F);
+ this.lblOhne12.StylePriority.UseBackColor = false;
+ this.lblOhne12.StylePriority.UseBorders = false;
+ this.lblOhne12.StylePriority.UseFont = false;
+ this.lblOhne12.StylePriority.UsePadding = false;
+ this.lblOhne12.StylePriority.UseTextAlignment = false;
+ this.lblOhne12.Text = "Ohne Faktor 1,2 (wird erst bei Abrechnung eingerechnet)";
+ this.lblOhne12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
- // xrLabel10
+ // lblFachleistungenInMinuten
//
- this.xrLabel10.BackColor = System.Drawing.Color.Gainsboro;
- this.xrLabel10.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrLabel10.Font = new System.Drawing.Font("Arial", 10F);
- this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(479.9998F, 0F);
- this.xrLabel10.Name = "xrLabel10";
- this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
- this.xrLabel10.SizeF = new System.Drawing.SizeF(170F, 20F);
- this.xrLabel10.StylePriority.UseBackColor = false;
- this.xrLabel10.StylePriority.UseBorders = false;
- this.xrLabel10.StylePriority.UseFont = false;
- this.xrLabel10.StylePriority.UsePadding = false;
- this.xrLabel10.StylePriority.UseTextAlignment = false;
- this.xrLabel10.Text = "Fachleistungen in Minuten";
- this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.lblFachleistungenInMinuten.BackColor = System.Drawing.Color.Gainsboro;
+ this.lblFachleistungenInMinuten.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.lblFachleistungenInMinuten.Font = new System.Drawing.Font("Arial", 10F);
+ this.lblFachleistungenInMinuten.LocationFloat = new DevExpress.Utils.PointFloat(479.9998F, 0F);
+ this.lblFachleistungenInMinuten.Name = "lblFachleistungenInMinuten";
+ this.lblFachleistungenInMinuten.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+ this.lblFachleistungenInMinuten.SizeF = new System.Drawing.SizeF(170F, 20F);
+ this.lblFachleistungenInMinuten.StylePriority.UseBackColor = false;
+ this.lblFachleistungenInMinuten.StylePriority.UseBorders = false;
+ this.lblFachleistungenInMinuten.StylePriority.UseFont = false;
+ this.lblFachleistungenInMinuten.StylePriority.UsePadding = false;
+ this.lblFachleistungenInMinuten.StylePriority.UseTextAlignment = false;
+ this.lblFachleistungenInMinuten.Text = "Fachleistungen in Minuten";
+ this.lblFachleistungenInMinuten.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// xrLabel9
//
@@ -1172,14 +1172,14 @@ namespace LebenshilfeMoenchengladbach
private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
+ private DevExpress.XtraReports.UI.XRTableCell cellFlsIn;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
+ private DevExpress.XtraReports.UI.XRTableCell cellMinuten;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell43;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
@@ -1198,12 +1198,12 @@ namespace LebenshilfeMoenchengladbach
private DevExpress.XtraReports.UI.XRTableCell xrTableCell44;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
private DevExpress.XtraReports.UI.CalculatedField fieldKontaktArt;
- private DevExpress.XtraReports.UI.XRLabel xrLabel11;
- private DevExpress.XtraReports.UI.XRLabel xrLabel10;
+ private DevExpress.XtraReports.UI.XRLabel lblOhne12;
+ private DevExpress.XtraReports.UI.XRLabel lblFachleistungenInMinuten;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
- private DevExpress.XtraReports.UI.XRLabel xrLabel13;
- private DevExpress.XtraReports.UI.XRLabel xrLabel12;
+ private DevExpress.XtraReports.UI.XRLabel lblGR;
+ private DevExpress.XtraReports.UI.XRLabel lblF;
private DevExpress.XtraReports.UI.XRLabel xrLabel15;
private DevExpress.XtraReports.UI.XRRichText xrRichText1;
private DevExpress.XtraReports.UI.XRRichText xrRichText2;
@@ -1232,7 +1232,7 @@ namespace LebenshilfeMoenchengladbach
private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell31;
- private DevExpress.XtraReports.UI.XRLabel xrLabel14;
+ private DevExpress.XtraReports.UI.XRLabel lblBewilligteFlsWoche;
private DevExpress.XtraReports.UI.XRLabel xrLabel16;
}
}
diff --git a/ReportImp/LebenshilfeMoenchengladbach/Quittierungsbeleg.cs b/ReportImp/LebenshilfeMoenchengladbach/Quittierungsbeleg.cs
index db8d4476b..efec665b4 100644
--- a/ReportImp/LebenshilfeMoenchengladbach/Quittierungsbeleg.cs
+++ b/ReportImp/LebenshilfeMoenchengladbach/Quittierungsbeleg.cs
@@ -49,6 +49,14 @@ namespace LebenshilfeMoenchengladbach
if (descDict.Count == 1 && isAssistenz)
{
lblTitle.Text = "Quittierungsbeleg Assistenzleistung";
+ lblBewilligteFlsWoche.Text = "Bewilligte ASS wöchentlich";
+ cellFlsIn.Text = "ASS in";
+ cellMinuten.Text = "Minuten";
+ lblOhne12.Visible = false;
+ lblF.Text = "F = face to face";
+ lblGR.Visible = false;
+ lblFachleistungenInMinuten.Text = "Minuten";
+
}
if (String.IsNullOrWhiteSpace(pRO.AbsenceTimes))
diff --git a/ReportImp/Nous/SettlementReport.Designer.cs b/ReportImp/Nous/SettlementReport.Designer.cs
index 495d11eb4..00fce16e0 100644
--- a/ReportImp/Nous/SettlementReport.Designer.cs
+++ b/ReportImp/Nous/SettlementReport.Designer.cs
@@ -83,7 +83,6 @@
this.xrTableRow15 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
- this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow30 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -104,12 +103,13 @@
this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -133,7 +133,7 @@
// xrLabel9
//
this.xrLabel9.Font = new System.Drawing.Font("Open Sans", 7.125F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(485.29F, 80F);
+ this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(499.2884F, 79.99998F);
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(192.7083F, 17F);
@@ -152,7 +152,7 @@
// xrPictureBox1
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
- this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(485.2915F, 0F);
+ this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(499.2899F, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(175F, 75F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
@@ -161,7 +161,7 @@
//
this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
- this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(367.0001F, 169F);
+ this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(367.0003F, 156.5F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(283F, 23F);
@@ -172,7 +172,7 @@
// xrTable1
//
this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight;
- this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 367.3333F);
+ this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 346.5F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow9,
@@ -303,7 +303,7 @@
//
// xrLabel6
//
- this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 300.3333F);
+ this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 279.4999F);
this.xrLabel6.Multiline = true;
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -313,7 +313,7 @@
//
// xrLabel5
//
- this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 267.3333F);
+ this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 246.5F);
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);
@@ -325,7 +325,7 @@
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
this.xrLabel4.Font = new System.Drawing.Font("Open Sans", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 225F);
+ this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 212.5F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -340,7 +340,7 @@
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
this.xrLabel3.CanShrink = true;
this.xrLabel3.Font = new System.Drawing.Font("Open Sans", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 209F);
+ this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 196.5F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 16F);
@@ -354,7 +354,7 @@
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
this.xrLabel2.CanShrink = true;
this.xrLabel2.Font = new System.Drawing.Font("Open Sans", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192F);
+ this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 179.5F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(650F, 17F);
@@ -426,7 +426,7 @@
this.xrTable3,
this.xrLabel12,
this.lblNotice});
- this.ReportFooter.HeightF = 296.8333F;
+ this.ReportFooter.HeightF = 291.8333F;
this.ReportFooter.KeepTogether = true;
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.PrintAtBottom = true;
@@ -436,7 +436,7 @@
//
this.xrLabel7.CanGrow = false;
this.xrLabel7.Font = new System.Drawing.Font("Open Sans", 7.125F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(485.29F, 25F);
+ this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(499.29F, 20F);
this.xrLabel7.Multiline = true;
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -567,7 +567,7 @@
//
// bottomMarginBand1
//
- this.bottomMarginBand1.HeightF = 40F;
+ this.bottomMarginBand1.HeightF = 30F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// GroupHeader1
@@ -586,7 +586,7 @@
this.xrTable1,
this.xrLabel8});
this.GroupHeader1.Font = new System.Drawing.Font("Open Sans", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.GroupHeader1.HeightF = 435.3333F;
+ this.GroupHeader1.HeightF = 414.5F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
@@ -659,10 +659,6 @@
this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell23.Weight = 0.21685899000901443D;
//
- // bindingSource1
- //
- this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
- //
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -877,6 +873,10 @@
this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell58.Weight = 0.21685899000901443D;
//
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
+ //
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -893,7 +893,7 @@
this.Font = new System.Drawing.Font("Open Sans", 10F);
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
- this.Margins = new System.Drawing.Printing.Margins(75, 74, 120, 40);
+ this.Margins = new System.Drawing.Printing.Margins(75, 50, 120, 30);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
@@ -902,8 +902,8 @@
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
diff --git a/ReportImp/PsychosozialerTraegervereinReports/Invoicing/CustomInvoiceFactory.cs b/ReportImp/PsychosozialerTraegervereinReports/Invoicing/CustomInvoiceFactory.cs
index 2071b5868..73df6a80e 100644
--- a/ReportImp/PsychosozialerTraegervereinReports/Invoicing/CustomInvoiceFactory.cs
+++ b/ReportImp/PsychosozialerTraegervereinReports/Invoicing/CustomInvoiceFactory.cs
@@ -16,7 +16,24 @@ namespace PsychosozialerTraegervereinReports.Invoicing
{
public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary> supportConcepts2ServiceRecords)
{
- foreach (var list in supportConcepts2ServiceRecords.Values)
+ foreach (var item in supportConcepts2ServiceRecords)
+ {
+ var csc = item.Key;
+ var sc = DAOFactory.GenericDAO.LoadByID(csc.SupportConceptOid);
+
+ if (csc.CostBearerRelOids != null && csc.CostBearerRelOids.Count > 0)
+ {
+ var c2s = DAOFactory.GenericDAO.LoadByID(csc.CostBearerRelOids[0]);
+ if (c2s.CostBearer.Organisation.Name.Contains("LT 24"))
+ {
+ return new Lt24InvoiceCreation();
+ }
+
+ }
+
+ }
+
+ foreach (var list in supportConcepts2ServiceRecords.Values)
{
foreach (var sr in list)
diff --git a/ReportImp/PsychosozialerTraegervereinReports/RechnungLT24.resx b/ReportImp/PsychosozialerTraegervereinReports/RechnungLT24.resx
index 46dfd47e0..b78972679 100644
--- a/ReportImp/PsychosozialerTraegervereinReports/RechnungLT24.resx
+++ b/ReportImp/PsychosozialerTraegervereinReports/RechnungLT24.resx
@@ -128,7 +128,7 @@ Sollten Sie noch Fragen haben, können Sie sich gerne mit uns in Verbindung setz
Mit freundlichen Grüßen
-Psychosozialer Trägerverein
+Psychosozialer Trägerverein e.V.
Leitung Ambulant Betreutes Wohnen
diff --git a/ReportImp/PsychosozialerTraegervereinReports/RechnungSonstige.cs b/ReportImp/PsychosozialerTraegervereinReports/RechnungSonstige.cs
index 4434831f4..b41f5fecb 100644
--- a/ReportImp/PsychosozialerTraegervereinReports/RechnungSonstige.cs
+++ b/ReportImp/PsychosozialerTraegervereinReports/RechnungSonstige.cs
@@ -93,9 +93,9 @@ namespace BeWo.PsychosozialerTraegervereinReports
pRO.CustomerSalutation = "Herrn";
cellMonat.Text = String.Format("{0:MM}/{0:yyyy}", pRO.AccountingPeriodStart);
- cellDays.Text = String.Format("{0:0.##}", hours);
+ cellDays.Text = String.Format("{0:0.00}", hours);
cellHouryRate.Text = String.Format("{0:0.00}", hourlyRate);
- cellClaim.Text = String.Format("{0}", pRO.NetClaim.Replace("€","").Trim());
+ cellClaim.Text = String.Format("{0}", pRO.GrossClaim);
this.bindingSource1.DataSource = pRO;
}
diff --git a/ReportImp/PsychosozialerTraegervereinReports/RechnungSonstige.resx b/ReportImp/PsychosozialerTraegervereinReports/RechnungSonstige.resx
index 46dfd47e0..b78972679 100644
--- a/ReportImp/PsychosozialerTraegervereinReports/RechnungSonstige.resx
+++ b/ReportImp/PsychosozialerTraegervereinReports/RechnungSonstige.resx
@@ -128,7 +128,7 @@ Sollten Sie noch Fragen haben, können Sie sich gerne mit uns in Verbindung setz
Mit freundlichen Grüßen
-Psychosozialer Trägerverein
+Psychosozialer Trägerverein e.V.
Leitung Ambulant Betreutes Wohnen
diff --git a/ReportImp/VkmMenden/AllgemeineRechnung.Designer.cs b/ReportImp/VkmMenden/AllgemeineRechnung.Designer.cs
index 50e584cf6..052b66aab 100644
--- a/ReportImp/VkmMenden/AllgemeineRechnung.Designer.cs
+++ b/ReportImp/VkmMenden/AllgemeineRechnung.Designer.cs
@@ -97,7 +97,6 @@ namespace VkmMenden
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
- this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -113,6 +112,7 @@ namespace VkmMenden
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.tableCustomer)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
@@ -121,9 +121,9 @@ namespace VkmMenden
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -323,12 +323,11 @@ namespace VkmMenden
//
// xrTableCell17
//
- this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderPhone")});
this.xrTableCell17.Name = "xrTableCell17";
this.xrTableCell17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell17.StylePriority.UsePadding = false;
this.xrTableCell17.StylePriority.UseTextAlignment = false;
+ this.xrTableCell17.Text = "02373- 946 0 756";
this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell17.Weight = 0.31012402011277251D;
//
@@ -352,12 +351,11 @@ namespace VkmMenden
//
// xrTableCell19
//
- this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderFax")});
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell19.StylePriority.UsePadding = false;
this.xrTableCell19.StylePriority.UseTextAlignment = false;
+ this.xrTableCell19.Text = "02373- 946 0 700";
this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell19.Weight = 0.31012402011277251D;
//
@@ -381,12 +379,11 @@ namespace VkmMenden
//
// xrTableCell21
//
- this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderMail")});
this.xrTableCell21.Name = "xrTableCell21";
this.xrTableCell21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell21.StylePriority.UsePadding = false;
this.xrTableCell21.StylePriority.UseTextAlignment = false;
+ this.xrTableCell21.Text = "marc.brumberg@vkm-menden.de";
this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell21.Weight = 0.31012402011277251D;
//
@@ -588,7 +585,7 @@ namespace VkmMenden
this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel17.SizeF = new System.Drawing.SizeF(308.33F, 17F);
this.xrLabel17.StylePriority.UseFont = false;
- this.xrLabel17.Text = "VKM mobil gGmbH, Sollingstraße 7, 58706 Menden";
+ this.xrLabel17.Text = "VKM mobil gGmbH, Hofeskamp 22, 58706 Menden";
//
// lblAdresse
//
@@ -799,10 +796,6 @@ namespace VkmMenden
this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell23.Weight = 0.15384613212152973D;
//
- // bindingSource1
- //
- this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.InvoiceCustomerRO);
- //
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -986,6 +979,10 @@ namespace VkmMenden
this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell11.Weight = 0.15384615750933417D;
//
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.InvoiceCustomerRO);
+ //
// AllgemeineRechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1014,9 +1011,9 @@ namespace VkmMenden
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
diff --git a/ReportImp/VkmMenden/AllgemeineRechnung.resx b/ReportImp/VkmMenden/AllgemeineRechnung.resx
index 0a3069e85..737ac4f61 100644
--- a/ReportImp/VkmMenden/AllgemeineRechnung.resx
+++ b/ReportImp/VkmMenden/AllgemeineRechnung.resx
@@ -3302,7 +3302,7 @@
- ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AewBcAGYAMwAgAFYAZQByAGQAYQBuAGEAOwB9AH0AewBcAGMAbwBsAG8AcgB0AGIAbAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADAAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAyADUANQAgADsAfQB7AFwAKgBcAGQAZQBmAGMAaABwACAAXABmADEAXABmAHMAMgA0AH0AewBcAHMAdAB5AGwAZQBzAGgAZQBlAHQAIAB7AFwAcQBsAFwAZgAxAFwAZgBzADIANAAgAE4AbwByAG0AYQBsADsAfQB7AFwAKgBcAGMAcwAxAFwAZgAxAFwAZgBzADIANABcAGMAZgAxACAARABlAGYAYQB1AGwAdAAgAFAAYQByAGEAZwByAGEAcABoACAARgBvAG4AdAA7AH0AewBcACoAXABjAHMAMgBcAHMAYgBhAHMAZQBkAG8AbgAxAFwAZgAxAFwAZgBzADIANABcAGMAZgAxACAATABpAG4AZQAgAE4AdQBtAGIAZQByADsAfQB7AFwAKgBcAGMAcwAzAFwAdQBsAFwAZgAxAFwAZgBzADIANABcAGMAZgAyACAASAB5AHAAZQByAGwAaQBuAGsAOwB9AHsAXAAqAFwAdABzADQAXAB0AHMAcgBvAHcAZABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAdAAzAFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABOAG8AcgBtAGEAbAAgAFQAYQBiAGwAZQA7AH0AewBcACoAXAB0AHMANQBcAHQAcwByAG8AdwBkAFwAcwBiAGEAcwBlAGQAbwBuADQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdAByAGIAcgBkAHIAdABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBsAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAcgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBoAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHYAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAFQAYQBiAGwAZQAgAFMAaQBtAHAAbABlACAAMQA7AH0AfQB7AFwAKgBcAGwAaQBzAHQAbwB2AGUAcgByAGkAZABlAHQAYQBiAGwAZQB9AFwAbgBvAHUAaQBjAG8AbQBwAGEAdABcAHMAcABsAHkAdAB3AG4AaQBuAGUAXABoAHQAbQBhAHUAdABzAHAAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAbgBvAHcAaQBkAGMAdABsAHAAYQByAFwAdAB4ADMANgAwAFwAdAB4ADcAMgAwAFwAdAB4ADEAMAA4ADAAXAB0AHgAMQA0ADQAMABcAHQAeAAxADgAMAAwAFwAdAB4ADIAMQA2ADAAXAB0AHgAMgA1ADIAMABcAHQAeAAyADgAOAAwAHsAXABiAFwAZgAyAFwAZgBzADEAOQBcAGMAZgAxACAAQQBtAGIAdQBsAGEAbgB0AGUAcwAgAFcAbwBoAG4AZQBuAH0AXABiAFwAZgAzAFwAZgBzADIANABcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHUAbABcAGYAMgBcAGYAcwAxADkAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAdQBsAFwAZgAyAFwAZgBzADEAOQBcAGMAZgAxACAAUwBvAGwAbABpAG4AZwBzAHQAcgBhAFwAdQAyADIAMwBcACcAZABmAGUAIAA3AH0AXAB1AGwAXABmADIAXABmAHMAMQA5AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAHUAbABcAGYAMgBcAGYAcwAxADkAXABjAGYAMQAgADUAOAA3ADAANgAgAE0AZQBuAGQAZQBuAH0AXABmADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgB9AA==
+ ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AewBcAGYAMwAgAFYAZQByAGQAYQBuAGEAOwB9AH0AewBcAGMAbwBsAG8AcgB0AGIAbAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADAAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAyADUANQAgADsAfQB7AFwAKgBcAGQAZQBmAGMAaABwACAAXABmADEAXABmAHMAMgA0AH0AewBcAHMAdAB5AGwAZQBzAGgAZQBlAHQAIAB7AFwAcQBsAFwAZgAxAFwAZgBzADIANAAgAE4AbwByAG0AYQBsADsAfQB7AFwAKgBcAGMAcwAxAFwAZgAxAFwAZgBzADIANABcAGMAZgAxACAARABlAGYAYQB1AGwAdAAgAFAAYQByAGEAZwByAGEAcABoACAARgBvAG4AdAA7AH0AewBcACoAXABjAHMAMgBcAHMAYgBhAHMAZQBkAG8AbgAxAFwAZgAxAFwAZgBzADIANABcAGMAZgAxACAATABpAG4AZQAgAE4AdQBtAGIAZQByADsAfQB7AFwAKgBcAGMAcwAzAFwAdQBsAFwAZgAxAFwAZgBzADIANABcAGMAZgAyACAASAB5AHAAZQByAGwAaQBuAGsAOwB9AHsAXAAqAFwAdABzADQAXAB0AHMAcgBvAHcAZABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAdAAzAFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABOAG8AcgBtAGEAbAAgAFQAYQBiAGwAZQA7AH0AewBcACoAXAB0AHMANQBcAHQAcwByAG8AdwBkAFwAcwBiAGEAcwBlAGQAbwBuADQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdAByAGIAcgBkAHIAdABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBsAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAcgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBoAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHYAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAFQAYQBiAGwAZQAgAFMAaQBtAHAAbABlACAAMQA7AH0AfQB7AFwAKgBcAGwAaQBzAHQAbwB2AGUAcgByAGkAZABlAHQAYQBiAGwAZQB9AFwAbgBvAHUAaQBjAG8AbQBwAGEAdABcAHMAcABsAHkAdAB3AG4AaQBuAGUAXABoAHQAbQBhAHUAdABzAHAAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAbgBvAHcAaQBkAGMAdABsAHAAYQByAFwAdAB4ADMANgAwAFwAdAB4ADcAMgAwAFwAdAB4ADEAMAA4ADAAXAB0AHgAMQA0ADQAMABcAHQAeAAxADgAMAAwAFwAdAB4ADIAMQA2ADAAXAB0AHgAMgA1ADIAMABcAHQAeAAyADgAOAAwAHsAXABiAFwAZgAyAFwAZgBzADEAOQBcAGMAZgAxACAAQQBtAGIAdQBsAGEAbgB0AGUAcwAgAFcAbwBoAG4AZQBuAH0AXABiAFwAZgAzAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdQBsAFwAZgAyAFwAZgBzADEAOQBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAdQBsAFwAZgAyAFwAZgBzADEAOQBcAGMAZgAxACAASABvAGYAZQBzAGsAYQBtAHAAIAAyADIAfQBcAHUAbABcAGYAMgBcAGYAcwAxADkAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAdQBsAFwAZgAyAFwAZgBzADEAOQBcAGMAZgAxACAANQA4ADcAMAA2ACAATQBlAG4AZABlAG4AfQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A
ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAFQAYQBoAG8AbQBhADsAfQB9AHsAXABjAG8AbABvAHIAdABiAGwAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAwACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMgA1ADUAIAA7AH0AewBcACoAXABkAGUAZgBjAGgAcAAgAFwAZgAxAFwAZgBzADIANAB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAMQBcAGYAcwAyADQAIABOAG8AcgBtAGEAbAA7AH0AewBcACoAXABjAHMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEQAZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAOwB9AHsAXAAqAFwAYwBzADIAXABzAGIAYQBzAGUAZABvAG4AMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEwAaQBuAGUAIABOAHUAbQBiAGUAcgA7AH0AewBcACoAXABjAHMAMwBcAHUAbABcAGYAMQBcAGYAcwAyADQAXABjAGYAMgAgAEgAeQBwAGUAcgBsAGkAbgBrADsAfQB7AFwAKgBcAHQAcwA0AFwAdABzAHIAbwB3AGQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBiADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHQAMwBcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAATgBvAHIAbQBhAGwAIABUAGEAYgBsAGUAOwB9AHsAXAAqAFwAdABzADUAXAB0AHMAcgBvAHcAZABcAHMAYgBhAHMAZQBkAG8AbgA0AFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcgBiAHIAZAByAHQAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAbABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBiAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAaABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgB2AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABUAGEAYgBsAGUAIABTAGkAbQBwAGwAZQAgADEAOwB9AH0AewBcACoAXABsAGkAcwB0AG8AdgBlAHIAcgBpAGQAZQB0AGEAYgBsAGUAfQBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAaAB0AG0AYQB1AHQAcwBwAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAYwB7AFwAdQBsAFwAZgAyAFwAZgBzADEANABcAGMAZgAxACAAUgBlAGcAaQBzAHQAZQByAGcAZQByAGkAYwBoAHQAfQBcAHUAbABcAGYAMgBcAGYAcwAxADQAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAYwBcAHUAbABcAGYAMgBcAGYAcwAxADAAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAYwB7AFwAZgAyAFwAZgBzADEANABcAGMAZgAxACAAQQBtAHQAcwBnAGUAcgBpAGMAaAB0ACAAQQByAG4AcwBiAGUAcgBnACAAfQBcAGIAXABmADIAXABmAHMAMQA0AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGMAewBcAGYAMgBcAGYAcwAxADQAXABjAGYAMQAgAEgAUgBCACAAMQAyADAAMwA4AH0AXABiAFwAZgAyAFwAZgBzADEANABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBjAFwAYgBcAGYAMgBcAGYAcwA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGMAewBcAGYAMgBcAGYAcwAxADQAXABjAGYAMQAgAFMAdABlAHUAZQByAG4AdQBtAG0AZQByADoAIAAzADIAOAAvADUAOAA4ADIALwA0ADAANwA2AH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAfQA=
diff --git a/ReportImp/VkmMenden/ServiceInvoiceReport.Designer.cs b/ReportImp/VkmMenden/ServiceInvoiceReport.Designer.cs
index 199c4965c..e9d39801e 100644
--- a/ReportImp/VkmMenden/ServiceInvoiceReport.Designer.cs
+++ b/ReportImp/VkmMenden/ServiceInvoiceReport.Designer.cs
@@ -99,7 +99,6 @@ namespace VkmMenden
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
- this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -115,6 +114,7 @@ namespace VkmMenden
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
@@ -123,9 +123,9 @@ namespace VkmMenden
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -324,12 +324,11 @@ namespace VkmMenden
//
// xrTableCell17
//
- this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderContactPersonPhone")});
this.xrTableCell17.Name = "xrTableCell17";
this.xrTableCell17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell17.StylePriority.UsePadding = false;
this.xrTableCell17.StylePriority.UseTextAlignment = false;
+ this.xrTableCell17.Text = "02373- 946 0 756";
this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell17.Weight = 0.31012402011277251D;
//
@@ -353,12 +352,11 @@ namespace VkmMenden
//
// xrTableCell19
//
- this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderContactPersonFax")});
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell19.StylePriority.UsePadding = false;
this.xrTableCell19.StylePriority.UseTextAlignment = false;
+ this.xrTableCell19.Text = "02373- 946 0 700";
this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell19.Weight = 0.31012402011277251D;
//
@@ -382,12 +380,11 @@ namespace VkmMenden
//
// xrTableCell21
//
- this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderContactPersonMail")});
this.xrTableCell21.Name = "xrTableCell21";
this.xrTableCell21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell21.StylePriority.UsePadding = false;
this.xrTableCell21.StylePriority.UseTextAlignment = false;
+ this.xrTableCell21.Text = "marc.brumberg@vkm-menden.de";
this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell21.Weight = 0.31012402011277251D;
//
@@ -589,7 +586,7 @@ namespace VkmMenden
this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel17.SizeF = new System.Drawing.SizeF(308.33F, 17F);
this.xrLabel17.StylePriority.UseFont = false;
- this.xrLabel17.Text = "VKM mobil gGmbH, Sollingstraße 7, 58706 Menden";
+ this.xrLabel17.Text = "VKM mobil gGmbH, Hofeskamp 22, 58706 Menden";
//
// lblAdresse
//
@@ -815,10 +812,6 @@ namespace VkmMenden
this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell23.Weight = 0.15384613212152973D;
//
- // bindingSource1
- //
- this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
- //
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -1002,6 +995,10 @@ namespace VkmMenden
this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell11.Weight = 0.15384615750933417D;
//
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
+ //
// ServiceInvoiceReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1030,9 +1027,9 @@ namespace VkmMenden
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
diff --git a/ReportImp/VkmMenden/ServiceInvoiceReport.resx b/ReportImp/VkmMenden/ServiceInvoiceReport.resx
index 0a3069e85..737ac4f61 100644
--- a/ReportImp/VkmMenden/ServiceInvoiceReport.resx
+++ b/ReportImp/VkmMenden/ServiceInvoiceReport.resx
@@ -3302,7 +3302,7 @@
- ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AewBcAGYAMwAgAFYAZQByAGQAYQBuAGEAOwB9AH0AewBcAGMAbwBsAG8AcgB0AGIAbAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADAAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAyADUANQAgADsAfQB7AFwAKgBcAGQAZQBmAGMAaABwACAAXABmADEAXABmAHMAMgA0AH0AewBcAHMAdAB5AGwAZQBzAGgAZQBlAHQAIAB7AFwAcQBsAFwAZgAxAFwAZgBzADIANAAgAE4AbwByAG0AYQBsADsAfQB7AFwAKgBcAGMAcwAxAFwAZgAxAFwAZgBzADIANABcAGMAZgAxACAARABlAGYAYQB1AGwAdAAgAFAAYQByAGEAZwByAGEAcABoACAARgBvAG4AdAA7AH0AewBcACoAXABjAHMAMgBcAHMAYgBhAHMAZQBkAG8AbgAxAFwAZgAxAFwAZgBzADIANABcAGMAZgAxACAATABpAG4AZQAgAE4AdQBtAGIAZQByADsAfQB7AFwAKgBcAGMAcwAzAFwAdQBsAFwAZgAxAFwAZgBzADIANABcAGMAZgAyACAASAB5AHAAZQByAGwAaQBuAGsAOwB9AHsAXAAqAFwAdABzADQAXAB0AHMAcgBvAHcAZABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAdAAzAFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABOAG8AcgBtAGEAbAAgAFQAYQBiAGwAZQA7AH0AewBcACoAXAB0AHMANQBcAHQAcwByAG8AdwBkAFwAcwBiAGEAcwBlAGQAbwBuADQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdAByAGIAcgBkAHIAdABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBsAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAcgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBoAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHYAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAFQAYQBiAGwAZQAgAFMAaQBtAHAAbABlACAAMQA7AH0AfQB7AFwAKgBcAGwAaQBzAHQAbwB2AGUAcgByAGkAZABlAHQAYQBiAGwAZQB9AFwAbgBvAHUAaQBjAG8AbQBwAGEAdABcAHMAcABsAHkAdAB3AG4AaQBuAGUAXABoAHQAbQBhAHUAdABzAHAAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAbgBvAHcAaQBkAGMAdABsAHAAYQByAFwAdAB4ADMANgAwAFwAdAB4ADcAMgAwAFwAdAB4ADEAMAA4ADAAXAB0AHgAMQA0ADQAMABcAHQAeAAxADgAMAAwAFwAdAB4ADIAMQA2ADAAXAB0AHgAMgA1ADIAMABcAHQAeAAyADgAOAAwAHsAXABiAFwAZgAyAFwAZgBzADEAOQBcAGMAZgAxACAAQQBtAGIAdQBsAGEAbgB0AGUAcwAgAFcAbwBoAG4AZQBuAH0AXABiAFwAZgAzAFwAZgBzADIANABcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHUAbABcAGYAMgBcAGYAcwAxADkAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAdQBsAFwAZgAyAFwAZgBzADEAOQBcAGMAZgAxACAAUwBvAGwAbABpAG4AZwBzAHQAcgBhAFwAdQAyADIAMwBcACcAZABmAGUAIAA3AH0AXAB1AGwAXABmADIAXABmAHMAMQA5AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAHUAbABcAGYAMgBcAGYAcwAxADkAXABjAGYAMQAgADUAOAA3ADAANgAgAE0AZQBuAGQAZQBuAH0AXABmADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgB9AA==
+ ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AewBcAGYAMwAgAFYAZQByAGQAYQBuAGEAOwB9AH0AewBcAGMAbwBsAG8AcgB0AGIAbAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADAAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAyADUANQAgADsAfQB7AFwAKgBcAGQAZQBmAGMAaABwACAAXABmADEAXABmAHMAMgA0AH0AewBcAHMAdAB5AGwAZQBzAGgAZQBlAHQAIAB7AFwAcQBsAFwAZgAxAFwAZgBzADIANAAgAE4AbwByAG0AYQBsADsAfQB7AFwAKgBcAGMAcwAxAFwAZgAxAFwAZgBzADIANABcAGMAZgAxACAARABlAGYAYQB1AGwAdAAgAFAAYQByAGEAZwByAGEAcABoACAARgBvAG4AdAA7AH0AewBcACoAXABjAHMAMgBcAHMAYgBhAHMAZQBkAG8AbgAxAFwAZgAxAFwAZgBzADIANABcAGMAZgAxACAATABpAG4AZQAgAE4AdQBtAGIAZQByADsAfQB7AFwAKgBcAGMAcwAzAFwAdQBsAFwAZgAxAFwAZgBzADIANABcAGMAZgAyACAASAB5AHAAZQByAGwAaQBuAGsAOwB9AHsAXAAqAFwAdABzADQAXAB0AHMAcgBvAHcAZABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAdAAzAFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABOAG8AcgBtAGEAbAAgAFQAYQBiAGwAZQA7AH0AewBcACoAXAB0AHMANQBcAHQAcwByAG8AdwBkAFwAcwBiAGEAcwBlAGQAbwBuADQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdAByAGIAcgBkAHIAdABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBsAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAcgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBoAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHYAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAFQAYQBiAGwAZQAgAFMAaQBtAHAAbABlACAAMQA7AH0AfQB7AFwAKgBcAGwAaQBzAHQAbwB2AGUAcgByAGkAZABlAHQAYQBiAGwAZQB9AFwAbgBvAHUAaQBjAG8AbQBwAGEAdABcAHMAcABsAHkAdAB3AG4AaQBuAGUAXABoAHQAbQBhAHUAdABzAHAAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAbgBvAHcAaQBkAGMAdABsAHAAYQByAFwAdAB4ADMANgAwAFwAdAB4ADcAMgAwAFwAdAB4ADEAMAA4ADAAXAB0AHgAMQA0ADQAMABcAHQAeAAxADgAMAAwAFwAdAB4ADIAMQA2ADAAXAB0AHgAMgA1ADIAMABcAHQAeAAyADgAOAAwAHsAXABiAFwAZgAyAFwAZgBzADEAOQBcAGMAZgAxACAAQQBtAGIAdQBsAGEAbgB0AGUAcwAgAFcAbwBoAG4AZQBuAH0AXABiAFwAZgAzAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdQBsAFwAZgAyAFwAZgBzADEAOQBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAdQBsAFwAZgAyAFwAZgBzADEAOQBcAGMAZgAxACAASABvAGYAZQBzAGsAYQBtAHAAIAAyADIAfQBcAHUAbABcAGYAMgBcAGYAcwAxADkAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAdQBsAFwAZgAyAFwAZgBzADEAOQBcAGMAZgAxACAANQA4ADcAMAA2ACAATQBlAG4AZABlAG4AfQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A
ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAFQAYQBoAG8AbQBhADsAfQB9AHsAXABjAG8AbABvAHIAdABiAGwAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAwACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMgA1ADUAIAA7AH0AewBcACoAXABkAGUAZgBjAGgAcAAgAFwAZgAxAFwAZgBzADIANAB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAMQBcAGYAcwAyADQAIABOAG8AcgBtAGEAbAA7AH0AewBcACoAXABjAHMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEQAZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAOwB9AHsAXAAqAFwAYwBzADIAXABzAGIAYQBzAGUAZABvAG4AMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEwAaQBuAGUAIABOAHUAbQBiAGUAcgA7AH0AewBcACoAXABjAHMAMwBcAHUAbABcAGYAMQBcAGYAcwAyADQAXABjAGYAMgAgAEgAeQBwAGUAcgBsAGkAbgBrADsAfQB7AFwAKgBcAHQAcwA0AFwAdABzAHIAbwB3AGQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBiADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHQAMwBcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAATgBvAHIAbQBhAGwAIABUAGEAYgBsAGUAOwB9AHsAXAAqAFwAdABzADUAXAB0AHMAcgBvAHcAZABcAHMAYgBhAHMAZQBkAG8AbgA0AFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcgBiAHIAZAByAHQAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAbABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBiAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAaABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgB2AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABUAGEAYgBsAGUAIABTAGkAbQBwAGwAZQAgADEAOwB9AH0AewBcACoAXABsAGkAcwB0AG8AdgBlAHIAcgBpAGQAZQB0AGEAYgBsAGUAfQBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAaAB0AG0AYQB1AHQAcwBwAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAYwB7AFwAdQBsAFwAZgAyAFwAZgBzADEANABcAGMAZgAxACAAUgBlAGcAaQBzAHQAZQByAGcAZQByAGkAYwBoAHQAfQBcAHUAbABcAGYAMgBcAGYAcwAxADQAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAYwBcAHUAbABcAGYAMgBcAGYAcwAxADAAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAYwB7AFwAZgAyAFwAZgBzADEANABcAGMAZgAxACAAQQBtAHQAcwBnAGUAcgBpAGMAaAB0ACAAQQByAG4AcwBiAGUAcgBnACAAfQBcAGIAXABmADIAXABmAHMAMQA0AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGMAewBcAGYAMgBcAGYAcwAxADQAXABjAGYAMQAgAEgAUgBCACAAMQAyADAAMwA4AH0AXABiAFwAZgAyAFwAZgBzADEANABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBjAFwAYgBcAGYAMgBcAGYAcwA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGMAewBcAGYAMgBcAGYAcwAxADQAXABjAGYAMQAgAFMAdABlAHUAZQByAG4AdQBtAG0AZQByADoAIAAzADIAOAAvADUAOAA4ADIALwA0ADAANwA2AH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAfQA=
diff --git a/ReportImp/VkmMenden/Spitzabrechnung.Designer.cs b/ReportImp/VkmMenden/Spitzabrechnung.Designer.cs
index a18cc1438..ac5072838 100644
--- a/ReportImp/VkmMenden/Spitzabrechnung.Designer.cs
+++ b/ReportImp/VkmMenden/Spitzabrechnung.Designer.cs
@@ -97,7 +97,6 @@ namespace VkmMenden.Alt
this.xrRichText4 = new DevExpress.XtraReports.UI.XRRichText();
this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText();
this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
- this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow30 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -124,6 +123,7 @@ namespace VkmMenden.Alt
this.xrTableRow17 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
@@ -132,9 +132,9 @@ namespace VkmMenden.Alt
((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -466,12 +466,11 @@ namespace VkmMenden.Alt
//
// xrTableCell17
//
- this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderContactPersonPhone")});
this.xrTableCell17.Name = "xrTableCell17";
this.xrTableCell17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell17.StylePriority.UsePadding = false;
this.xrTableCell17.StylePriority.UseTextAlignment = false;
+ this.xrTableCell17.Text = "02373- 946 0 756";
this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell17.Weight = 0.31012402011277251D;
//
@@ -495,12 +494,11 @@ namespace VkmMenden.Alt
//
// xrTableCell19
//
- this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderContactPersonFax")});
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell19.StylePriority.UsePadding = false;
this.xrTableCell19.StylePriority.UseTextAlignment = false;
+ this.xrTableCell19.Text = "02373- 946 0 700";
this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell19.Weight = 0.31012402011277251D;
//
@@ -524,12 +522,11 @@ namespace VkmMenden.Alt
//
// xrTableCell21
//
- this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderContactPersonMail")});
this.xrTableCell21.Name = "xrTableCell21";
this.xrTableCell21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell21.StylePriority.UsePadding = false;
this.xrTableCell21.StylePriority.UseTextAlignment = false;
+ this.xrTableCell21.Text = "marc.brumberg@vkm-menden.de";
this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell21.Weight = 0.31012402011277251D;
//
@@ -733,7 +730,7 @@ namespace VkmMenden.Alt
this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel17.SizeF = new System.Drawing.SizeF(308.33F, 17F);
this.xrLabel17.StylePriority.UseFont = false;
- this.xrLabel17.Text = "VKM mobil gGmbH, Sollingstraße 7, 58706 Menden";
+ this.xrLabel17.Text = "VKM mobil gGmbH, Hofeskamp 22, 58706 Menden";
//
// lblAdresse
//
@@ -810,10 +807,6 @@ namespace VkmMenden.Alt
this.xrRichText1.SizeF = new System.Drawing.SizeF(150F, 87.06F);
this.xrRichText1.StylePriority.UseBorders = false;
//
- // bindingSource1
- //
- this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
- //
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -1095,6 +1088,10 @@ namespace VkmMenden.Alt
this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell23.Weight = 0.21685899000901443D;
//
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
+ //
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1122,9 +1119,9 @@ namespace VkmMenden.Alt
((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
diff --git a/ReportImp/VkmMenden/Spitzabrechnung.resx b/ReportImp/VkmMenden/Spitzabrechnung.resx
index 0a3069e85..a3c526214 100644
--- a/ReportImp/VkmMenden/Spitzabrechnung.resx
+++ b/ReportImp/VkmMenden/Spitzabrechnung.resx
@@ -3302,7 +3302,7 @@
- ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AewBcAGYAMwAgAFYAZQByAGQAYQBuAGEAOwB9AH0AewBcAGMAbwBsAG8AcgB0AGIAbAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADAAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAyADUANQAgADsAfQB7AFwAKgBcAGQAZQBmAGMAaABwACAAXABmADEAXABmAHMAMgA0AH0AewBcAHMAdAB5AGwAZQBzAGgAZQBlAHQAIAB7AFwAcQBsAFwAZgAxAFwAZgBzADIANAAgAE4AbwByAG0AYQBsADsAfQB7AFwAKgBcAGMAcwAxAFwAZgAxAFwAZgBzADIANABcAGMAZgAxACAARABlAGYAYQB1AGwAdAAgAFAAYQByAGEAZwByAGEAcABoACAARgBvAG4AdAA7AH0AewBcACoAXABjAHMAMgBcAHMAYgBhAHMAZQBkAG8AbgAxAFwAZgAxAFwAZgBzADIANABcAGMAZgAxACAATABpAG4AZQAgAE4AdQBtAGIAZQByADsAfQB7AFwAKgBcAGMAcwAzAFwAdQBsAFwAZgAxAFwAZgBzADIANABcAGMAZgAyACAASAB5AHAAZQByAGwAaQBuAGsAOwB9AHsAXAAqAFwAdABzADQAXAB0AHMAcgBvAHcAZABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAdAAzAFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABOAG8AcgBtAGEAbAAgAFQAYQBiAGwAZQA7AH0AewBcACoAXAB0AHMANQBcAHQAcwByAG8AdwBkAFwAcwBiAGEAcwBlAGQAbwBuADQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdAByAGIAcgBkAHIAdABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBsAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAcgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBoAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHYAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAFQAYQBiAGwAZQAgAFMAaQBtAHAAbABlACAAMQA7AH0AfQB7AFwAKgBcAGwAaQBzAHQAbwB2AGUAcgByAGkAZABlAHQAYQBiAGwAZQB9AFwAbgBvAHUAaQBjAG8AbQBwAGEAdABcAHMAcABsAHkAdAB3AG4AaQBuAGUAXABoAHQAbQBhAHUAdABzAHAAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAbgBvAHcAaQBkAGMAdABsAHAAYQByAFwAdAB4ADMANgAwAFwAdAB4ADcAMgAwAFwAdAB4ADEAMAA4ADAAXAB0AHgAMQA0ADQAMABcAHQAeAAxADgAMAAwAFwAdAB4ADIAMQA2ADAAXAB0AHgAMgA1ADIAMABcAHQAeAAyADgAOAAwAHsAXABiAFwAZgAyAFwAZgBzADEAOQBcAGMAZgAxACAAQQBtAGIAdQBsAGEAbgB0AGUAcwAgAFcAbwBoAG4AZQBuAH0AXABiAFwAZgAzAFwAZgBzADIANABcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHUAbABcAGYAMgBcAGYAcwAxADkAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAdQBsAFwAZgAyAFwAZgBzADEAOQBcAGMAZgAxACAAUwBvAGwAbABpAG4AZwBzAHQAcgBhAFwAdQAyADIAMwBcACcAZABmAGUAIAA3AH0AXAB1AGwAXABmADIAXABmAHMAMQA5AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAHUAbABcAGYAMgBcAGYAcwAxADkAXABjAGYAMQAgADUAOAA3ADAANgAgAE0AZQBuAGQAZQBuAH0AXABmADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgB9AA==
+ ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AewBcAGYAMwAgAFYAZQByAGQAYQBuAGEAOwB9AH0AewBcAGMAbwBsAG8AcgB0AGIAbAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADAAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAyADUANQAgADsAfQB7AFwAKgBcAGQAZQBmAGMAaABwACAAXABmADEAXABmAHMAMgA0AH0AewBcAHMAdAB5AGwAZQBzAGgAZQBlAHQAIAB7AFwAcQBsAFwAZgAxAFwAZgBzADIANAAgAE4AbwByAG0AYQBsADsAfQB7AFwAKgBcAGMAcwAxAFwAZgAxAFwAZgBzADIANABcAGMAZgAxACAARABlAGYAYQB1AGwAdAAgAFAAYQByAGEAZwByAGEAcABoACAARgBvAG4AdAA7AH0AewBcACoAXABjAHMAMgBcAHMAYgBhAHMAZQBkAG8AbgAxAFwAZgAxAFwAZgBzADIANABcAGMAZgAxACAATABpAG4AZQAgAE4AdQBtAGIAZQByADsAfQB7AFwAKgBcAGMAcwAzAFwAdQBsAFwAZgAxAFwAZgBzADIANABcAGMAZgAyACAASAB5AHAAZQByAGwAaQBuAGsAOwB9AHsAXAAqAFwAdABzADQAXAB0AHMAcgBvAHcAZABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAdAAzAFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABOAG8AcgBtAGEAbAAgAFQAYQBiAGwAZQA7AH0AewBcACoAXAB0AHMANQBcAHQAcwByAG8AdwBkAFwAcwBiAGEAcwBlAGQAbwBuADQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdAByAGIAcgBkAHIAdABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBsAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAcgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBoAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHYAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAFQAYQBiAGwAZQAgAFMAaQBtAHAAbABlACAAMQA7AH0AfQB7AFwAKgBcAGwAaQBzAHQAbwB2AGUAcgByAGkAZABlAHQAYQBiAGwAZQB9AFwAbgBvAHUAaQBjAG8AbQBwAGEAdABcAHMAcABsAHkAdAB3AG4AaQBuAGUAXABoAHQAbQBhAHUAdABzAHAAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAbgBvAHcAaQBkAGMAdABsAHAAYQByAFwAdAB4ADMANgAwAFwAdAB4ADcAMgAwAFwAdAB4ADEAMAA4ADAAXAB0AHgAMQA0ADQAMABcAHQAeAAxADgAMAAwAFwAdAB4ADIAMQA2ADAAXAB0AHgAMgA1ADIAMABcAHQAeAAyADgAOAAwAHsAXABiAFwAZgAyAFwAZgBzADEAOQBcAGMAZgAxACAAQQBtAGIAdQBsAGEAbgB0AGUAcwAgAFcAbwBoAG4AZQBuAH0AXABiAFwAZgAzAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdQBsAFwAZgAyAFwAZgBzADEAOQBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAdQBsAFwAZgAyAFwAZgBzADEAOQBcAGMAZgAxACAASABvAGYAZQBzAGsAYQBtAHAAfQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAHUAbABcAGYAMgBcAGYAcwAxADkAXABjAGYAMQAgACAAMgAyAH0AXAB1AGwAXABmADIAXABmAHMAMQA5AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAHUAbABcAGYAMgBcAGYAcwAxADkAXABjAGYAMQAgADUAOAA3ADAANgAgAE0AZQBuAGQAZQBuAH0AXABmADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgB9AA==
ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAFQAYQBoAG8AbQBhADsAfQB9AHsAXABjAG8AbABvAHIAdABiAGwAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAwACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMgA1ADUAIAA7AH0AewBcACoAXABkAGUAZgBjAGgAcAAgAFwAZgAxAFwAZgBzADIANAB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAMQBcAGYAcwAyADQAIABOAG8AcgBtAGEAbAA7AH0AewBcACoAXABjAHMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEQAZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAOwB9AHsAXAAqAFwAYwBzADIAXABzAGIAYQBzAGUAZABvAG4AMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEwAaQBuAGUAIABOAHUAbQBiAGUAcgA7AH0AewBcACoAXABjAHMAMwBcAHUAbABcAGYAMQBcAGYAcwAyADQAXABjAGYAMgAgAEgAeQBwAGUAcgBsAGkAbgBrADsAfQB7AFwAKgBcAHQAcwA0AFwAdABzAHIAbwB3AGQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBiADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHQAMwBcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAATgBvAHIAbQBhAGwAIABUAGEAYgBsAGUAOwB9AHsAXAAqAFwAdABzADUAXAB0AHMAcgBvAHcAZABcAHMAYgBhAHMAZQBkAG8AbgA0AFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcgBiAHIAZAByAHQAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAbABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBiAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAaABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgB2AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABUAGEAYgBsAGUAIABTAGkAbQBwAGwAZQAgADEAOwB9AH0AewBcACoAXABsAGkAcwB0AG8AdgBlAHIAcgBpAGQAZQB0AGEAYgBsAGUAfQBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAaAB0AG0AYQB1AHQAcwBwAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAYwB7AFwAdQBsAFwAZgAyAFwAZgBzADEANABcAGMAZgAxACAAUgBlAGcAaQBzAHQAZQByAGcAZQByAGkAYwBoAHQAfQBcAHUAbABcAGYAMgBcAGYAcwAxADQAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAYwBcAHUAbABcAGYAMgBcAGYAcwAxADAAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAYwB7AFwAZgAyAFwAZgBzADEANABcAGMAZgAxACAAQQBtAHQAcwBnAGUAcgBpAGMAaAB0ACAAQQByAG4AcwBiAGUAcgBnACAAfQBcAGIAXABmADIAXABmAHMAMQA0AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGMAewBcAGYAMgBcAGYAcwAxADQAXABjAGYAMQAgAEgAUgBCACAAMQAyADAAMwA4AH0AXABiAFwAZgAyAFwAZgBzADEANABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBjAFwAYgBcAGYAMgBcAGYAcwA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGMAewBcAGYAMgBcAGYAcwAxADQAXABjAGYAMQAgAFMAdABlAHUAZQByAG4AdQBtAG0AZQByADoAIAAzADIAOAAvADUAOAA4ADIALwA0ADAANwA2AH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAfQA=
diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs
index dfcee4e80..cc592ca61 100644
--- a/Service/Plugins/PluginLoader.cs
+++ b/Service/Plugins/PluginLoader.cs
@@ -161,11 +161,11 @@ namespace BeWo.Service.Plugins
//t = "1873138856"; // BUG e.V.
//t = "6463422907"; // Caritas Leverkusen
//t = "6149463003"; // Diakonisches Werk Bad Windsheim Neustadt a. d. Aisch
- //t = "6548202677"; // VKM Aachen SBD
+ t = "6548202677"; // VKM Aachen SBD
//t = "7803602698"; // Taubblindendienst
//t = "5518600303"; // Wetterleuchten e.V.
//t = "4096649015"; // AWO Dortmund
- t = "3614251071"; // Pusteblume
+ //t = "3614251071"; // Pusteblume
//t = "7755740484"; // Sawo
//t = "8275654834"; // Twg Jonathan
//t = "6586058528"; // Freundeskreis Suchtkrankenhilfe e.V.
diff --git a/Service/SBD/VertretungsManager.cs b/Service/SBD/VertretungsManager.cs
index a948043c7..2d75e40dc 100644
--- a/Service/SBD/VertretungsManager.cs
+++ b/Service/SBD/VertretungsManager.cs
@@ -177,9 +177,10 @@ namespace BeWo.Service.SBD
if(customer == null || !customer.Arbeitszeiten.Any() && !customer.Employee2CustomerList.Any())
{
continue;
- }
+ }
+ MigriereSubstitutionStatus(customer);
+
-
var addEmpty = true;
foreach (var employee2Customer in customer.Employee2CustomerList.Where(e2c => e2c.Employee.IsActive == ActivationTypeId.Active))
@@ -236,10 +237,12 @@ namespace BeWo.Service.SBD
}
}
}
-
+
return result;
}
+
+
private static IEnumerable ErstelleVertretungsItemsForAbsenceEmployee(AbsenceTime absenceTime, Employee employee, Customer customer, List vertretungen, DateTime start, DateTime end, List customerContactInformation, List employeeContactInformation, List schools)
{
var vertretungsItems = new List();
@@ -330,6 +333,8 @@ namespace BeWo.Service.SBD
if (absenceTime.CustomerOid.HasValue)
{
newVertretungsItem.VertretungsStatus = VertretungsStatus.KlientKrank;
+
+ // Migriere alten Vertretungsstatus auf neuen enum, sonst wirds im Klient in der falschen Liste angezeigt
}
else
{
@@ -502,6 +507,31 @@ namespace BeWo.Service.SBD
return vertretungsItems;
}
+ private static void MigriereSubstitutionStatus(Customer customer)
+ {
+ if (customer != null)
+ {
+ if (customer.SubstitutionNeed == SubstitutionNeed.SubstitutionNeedUnset)
+ {
+ if (customer.VertretungDringendErforderlich)
+ {
+ customer.SubstitutionNeed = SubstitutionNeed.SubstitutionNeeded;
+ }
+ else
+ {
+ customer.SubstitutionNeed = customer.VertretungGewuenscht
+ ? SubstitutionNeed.SubstitutionWanted
+ : SubstitutionNeed.NoSubstitutionWanted;
+ }
+ }
+ else
+ {
+ customer.SubstitutionNeed = customer.SubstitutionNeed;
+ }
+ }
+ }
+
+
private static void SetTeamleitung(BeWoEntityBase employee, VertretungsItemDC item)
{
if(employee.Oid == null)
@@ -681,7 +711,10 @@ namespace BeWo.Service.SBD
foreach(var assistanceTime in assistanceTimes)
{
var assistanceDateTimes = Utils.GetAssistanceTimeComparisonDateTime(assistanceTime.UhrzeitVon, assistanceTime.UhrzeitBis, dateTime);
-
+ if (substitution.VertretungsZeitraumBis.Hour == 0 && substitution.VertretungsZeitraumBis.Minute == 0)
+ {
+ substitution.VertretungsZeitraumBis = substitution.VertretungsZeitraumBis.AddDays(1).AddTicks(-1);
+ }
isSubstituted = assistanceDateTimes.Start.AreInBetweenDates(assistanceDateTimes.End, substitution.VertretungsZeitraumVon, substitution.VertretungsZeitraumBis);
if(!isSubstituted)
@@ -695,6 +728,8 @@ namespace BeWo.Service.SBD
private static void GetVertretungsstatus(VertretungsItemDC vertretungsItem, DateTime dateTime, DateTime absenceTimeStartDate, Customer customer)
{
+ MigriereSubstitutionStatus(customer);
+
if (customer.SubstitutionNeed == SubstitutionNeed.SubstitutionNeeded)
{
vertretungsItem.VertretungsStatus = VertretungsStatus.MaKrankVertretungBenoetigt;