diff --git a/ReportImp/Wichernhaus/Budgetnachweis.Designer.cs b/ReportImp/Wichernhaus/Budgetnachweis.Designer.cs
index 187af4fbe..8d22d02b0 100644
--- a/ReportImp/Wichernhaus/Budgetnachweis.Designer.cs
+++ b/ReportImp/Wichernhaus/Budgetnachweis.Designer.cs
@@ -31,6 +31,7 @@ namespace Wichernhaus
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Budgetnachweis));
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+ this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
@@ -72,16 +73,15 @@ namespace Wichernhaus
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
- this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
- this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.tableRechnungspositionen)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -98,12 +98,25 @@ namespace Wichernhaus
this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.Detail.StylePriority.UseFont = false;
this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+ //
+ // xrLabel1
+ //
+ this.xrLabel1.BackColor = System.Drawing.Color.Transparent;
+ this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(60F, 53.95833F);
+ 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(642F, 66.25F);
+ this.xrLabel1.StylePriority.UseBackColor = false;
+ this.xrLabel1.StylePriority.UseFont = false;
+ this.xrLabel1.Text = "Sehr geehrte Damen und Herren,\r\n\r\nanbei der Budgetnachweis des Ambulant Betreuten" +
+ " Wohnens der Wichernhaus gGmbH";
//
// xrLabel16
//
this.xrLabel16.BackColor = System.Drawing.Color.Transparent;
this.xrLabel16.CanShrink = true;
- this.xrLabel16.Font = new System.Drawing.Font("Times New Roman", 14F, System.Drawing.FontStyle.Bold);
+ this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Times New Roman", 14F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(60.0001F, 10.00001F);
this.xrLabel16.Name = "xrLabel16";
this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -182,7 +195,7 @@ namespace Wichernhaus
//
this.xrLabel35.BackColor = System.Drawing.Color.Transparent;
this.xrLabel35.Borders = DevExpress.XtraPrinting.BorderSide.None;
- this.xrLabel35.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+ this.xrLabel35.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel35.LocationFloat = new DevExpress.Utils.PointFloat(65.00015F, 214.13F);
this.xrLabel35.Multiline = true;
this.xrLabel35.Name = "xrLabel35";
@@ -408,7 +421,7 @@ namespace Wichernhaus
// xrLabel17
//
this.xrLabel17.BackColor = System.Drawing.Color.Transparent;
- this.xrLabel17.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(65.00015F, 284.1301F);
this.xrLabel17.Multiline = true;
this.xrLabel17.Name = "xrLabel17";
@@ -426,7 +439,6 @@ namespace Wichernhaus
//
// topMarginBand1
//
- this.topMarginBand1.HeightF = 100F;
this.topMarginBand1.Name = "topMarginBand1";
//
// bottomMarginBand1
@@ -444,6 +456,15 @@ namespace Wichernhaus
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
+ // xrRichText2
+ //
+ this.xrRichText2.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
+ this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(531.1946F, 0F);
+ this.xrRichText2.Name = "xrRichText2";
+ this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
+ this.xrRichText2.SizeF = new System.Drawing.SizeF(235.8053F, 165.5556F);
+ this.xrRichText2.StylePriority.UseFont = false;
+ //
// xrLabel8
//
this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -494,28 +515,6 @@ namespace Wichernhaus
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
- //
- // xrRichText2
- //
- this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F);
- this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(531.1946F, 0F);
- this.xrRichText2.Name = "xrRichText2";
- this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
- this.xrRichText2.SizeF = new System.Drawing.SizeF(235.8053F, 165.5556F);
- this.xrRichText2.StylePriority.UseFont = false;
- //
- // xrLabel1
- //
- this.xrLabel1.BackColor = System.Drawing.Color.Transparent;
- this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(60F, 53.95833F);
- 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(642F, 66.25F);
- this.xrLabel1.StylePriority.UseBackColor = false;
- this.xrLabel1.StylePriority.UseFont = false;
- this.xrLabel1.Text = "Sehr geehrte Damen und Herren,\r\n\r\nanbei der Budgetnachweis des Ambulant Betreuten" +
- " Wohnens der Wichernhaus gGmbH";
//
// Budgetnachweis
//
@@ -528,17 +527,17 @@ namespace Wichernhaus
this.GroupFooter2});
this.DataSource = this.bindingSource1;
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
- this.Font = new System.Drawing.Font("Times New Roman", 12F);
+ this.Font = new DevExpress.Drawing.DXFont("Times New Roman", 12F);
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
- this.Margins = new System.Drawing.Printing.Margins(30, 30, 100, 90);
+ this.Margins = new DevExpress.Drawing.DXMargins(30F, 30F, 100F, 90.33334F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
- this.Version = "17.1";
+ this.Version = "23.2";
((System.ComponentModel.ISupportInitialize)(this.tableRechnungspositionen)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
diff --git a/ReportImp/Wichernhaus/Budgetnachweis.resx b/ReportImp/Wichernhaus/Budgetnachweis.resx
index 7ac8db9cb..1641d730b 100644
--- a/ReportImp/Wichernhaus/Budgetnachweis.resx
+++ b/ReportImp/Wichernhaus/Budgetnachweis.resx
@@ -123,9 +123,6 @@
Mit freundlichen Grüßen
- ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGIAXABmADEAXABmAHMAMQA4AFwAYwBmADAAIABXAGkAYwBoAGUAcgBuAGgAYQB1AHMAIABnAEcAbQBiAEgAfQBcAGYAMQBcAGYAcwAyADQAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGIAXABmADEAXABmAHMAMQA4AFwAYwBmADAAIABBAG0AYgB1AGwAYQBuAHQAIABCAGUAdAByAGUAdQB0AGUAcwAgAFcAbwBoAG4AZQBuAH0AXABiAFwAZgAxAFwAZgBzADIANABcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGgAeQBwAGgAcABhAHIAMABcAGYAMQBcAGYAcwAxADgAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAMQBcAGYAcwAxADgAXABjAGYAMAAgAFcAYQByAGUAbgBkAG8AcgBmAGUAcgAgAFMAdAByAC4AIAAxADQAfQBcAGYAMQBcAGYAcwAxADgAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAMQBcAGYAcwAxADgAXABjAGYAMAAgADQANQA4ADkAMgAgAEcAZQBsAHMAZQBuAGsAaQByAGMAaABlAG4AfQBcAGYAMQBcAGYAcwAxADgAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAMQBcAGYAcwAxADgAXABjAGYAMAAgAFQAZQBsAGUAZgBvAG4AOgAgADAAMgAwADkALwA5ADcANgAxADcAMQA0AH0AXABmADEAXABmAHMAMQA4AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAaAB5AHAAaABwAGEAcgAwAHsAXABmADEAXABmAHMAMQA4AFwAYwBmADAAIABGAGEAeAA6ACAAMAAyADAAOQAvADkANwA2ADEANwA5ADkAfQBcAGYAMQBcAGYAcwAxADgAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAaQBlAGwAZAB7AFwAKgBcAGYAbABkAGkAbgBzAHQAewBcAGYAMQBcAGYAcwAyADQAXABjAGYAMAAgAEgAWQBQAEUAUgBMAEkATgBLACAAIgBtAGEAaQBsAHQAbwA6AGIAZQB0AHIAZQB1AHQAZQBzAHcAbwBoAG4AZQBuAEAAdwBpAGMAaABlAHIAbgBoAGEAdQBzAC4AYwBvAG0AIgAgAH0AfQB7AFwAZgBsAGQAcgBzAGwAdAB7AFwAdQBsAFwAZgAxAFwAZgBzADEAOABcAGMAZgAyACAAYgBlAHQAcgBlAHUAdABlAHMAdwBvAGgAbgBlAG4AQAB3AGkAYwBoAGUAcgBuAGgAYQB1AHMALgBjAG8AbQB9AH0AfQBcAGYAMQBcAGYAcwAyADQAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwAMgA3ADUAXABzAGwAbQB1AGwAdAAxAFwAcwBhADIAMAAwAHsAXABmADEAXABmAHMAMQA4AFwAYwBmADAAIABBAG4AcwBwAHIAZQBjAGgAcABhAHIAdABuAGUAcgA6ACAARgAuACAAQwBvAGwAbABlAHQAfQBcAGwAYQBuAGcANwBcAGwAYQBuAGcAZgBlADcAXABmAHMAMgAyAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A
+ ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAKgBcAGQAZQBmAHAAYQBwACAAXAB3AGkAZABjAHQAbABwAGEAcgB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAMQBcAGYAcwAyADQAIABOAG8AcgBtAGEAbAA7AH0AewBcACoAXABjAHMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEQAZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAOwB9AHsAXAAqAFwAYwBzADIAXABzAGIAYQBzAGUAZABvAG4AMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEwAaQBuAGUAIABOAHUAbQBiAGUAcgA7AH0AewBcACoAXABjAHMAMwBcAGYAMQBcAGYAcwAyADQAXAB1AGwAXABjAGYAMgAgAEgAeQBwAGUAcgBsAGkAbgBrADsAfQB7AFwAKgBcAHQAcwA0AFwAdABzAHIAbwB3AGQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBiADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHQAMwBcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAATgBvAHIAbQBhAGwAIABUAGEAYgBsAGUAOwB9AHsAXAAqAFwAdABzADUAXAB0AHMAcgBvAHcAZABcAHMAYgBhAHMAZQBkAG8AbgA0AFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcgBiAHIAZAByAHQAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAbABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBiAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAaABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgB2AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABUAGEAYgBsAGUAIABTAGkAbQBwAGwAZQAgADEAOwB9AH0AewBcACoAXABsAGkAcwB0AG8AdgBlAHIAcgBpAGQAZQB0AGEAYgBsAGUAfQBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABoAHQAbQBhAHUAdABzAHAAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGgAeQBwAGgAcABhAHIAMAB7AFwAZgAxAFwAZgBzADEAOABcAGIAXABjAGYAMQAgAFcAaQBjAGgAZQByAG4AaABhAHUAcwAgAGcARwBtAGIASAB9AFwAZgAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAaAB5AHAAaABwAGEAcgAwAHsAXABmADEAXABmAHMAMQA4AFwAYgBcAGMAZgAxACAAQQBtAGIAdQBsAGEAbgB0ACAAQgBlAHQAcgBlAHUAdABlAHMAIABXAG8AaABuAGUAbgB9AFwAZgAxAFwAZgBzADIANABcAGIAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGgAeQBwAGgAcABhAHIAMABcAGYAMQBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGgAeQBwAGgAcABhAHIAMAB7AFwAZgAxAFwAZgBzADEAOABcAGMAZgAxACAAVwBhAHIAZQBuAGQAbwByAGYAZQByACAAUwB0AHIALgAgADEANAB9AFwAZgAxAFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAaAB5AHAAaABwAGEAcgAwAHsAXABmADEAXABmAHMAMQA4AFwAYwBmADEAIAA0ADUAOAA5ADIAIABHAGUAbABzAGUAbgBrAGkAcgBjAGgAZQBuAH0AXABmADEAXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAMQBcAGYAcwAxADgAXABjAGYAMQAgAFQAZQBsAGUAZgBvAG4AOgAgADAAMgAwADkALwA5ADcANgAxADcAMQA0AH0AXABmADEAXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAMQBcAGYAcwAxADgAXABjAGYAMQAgAEYAYQB4ADoAIAAwADIAMAA5AC8AOQA3ADYAMQA3ADkAOQB9AFwAZgAxAFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAaAB5AHAAaABwAGEAcgAwAHsAXABmAGkAZQBsAGQAewBcACoAXABmAGwAZABpAG4AcwB0AHsAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABIAFkAUABFAFIATABJAE4ASwAgACIAbQBhAGkAbAB0AG8AOgBiAGUAdAByAGUAdQB0AGUAcwB3AG8AaABuAGUAbgBAAHcAaQBjAGgAZQByAG4AaABhAHUAcwAuAGMAbwBtACIAIAB9AH0AewBcAGYAbABkAHIAcwBsAHQAewBcAGYAMQBcAGYAcwAxADgAXAB1AGwAXABjAGYAMgAgAGIAfQB7AFwAZgAxAFwAZgBzADEAOABcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXAB1AGwAXABjAGYAMgAgAGUAZwBsAGUAaQB0AGUAdABlAHMAdwB9AHsAXABmADEAXABmAHMAMQA4AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAHUAbABcAGMAZgAyACAAbwBoAG4AZQBuAH0AewBcAGYAMQBcAGYAcwAxADgAXAB1AGwAXABjAGYAMgAgAEAAdwBpAGMAaABlAHIAbgBoAGEAdQBzAC4AYwBvAG0AfQB9AH0AXABmADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwAMgA3ADUAXABzAGwAbQB1AGwAdAAxAFwAcwBhADIAMAAwAHsAXABmADEAXABmAHMAMQA4AFwAYwBmADEAIABBAG4AcwBwAHIAZQBjAGgAcABhAHIAdABuAGUAcgA6ACAARgAuACAAQwBvAGwAbABlAHQAfQBcAGYAcwAyADIAXABsAGEAbgBnADcAXABsAGEAbgBnAGYAZQA3AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABmADEAXABmAHMAMgA0AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGMAZgAxAFwAcABhAHIAfQA=
-
- 17, 17
-
\ No newline at end of file
diff --git a/ReportImp/Wichernhaus/Budgetnachweis2.Designer.cs b/ReportImp/Wichernhaus/Budgetnachweis2.Designer.cs
index 4e1d24e78..40710b273 100644
--- a/ReportImp/Wichernhaus/Budgetnachweis2.Designer.cs
+++ b/ReportImp/Wichernhaus/Budgetnachweis2.Designer.cs
@@ -120,7 +120,7 @@ namespace Wichernhaus.Neu
//
this.xrLabel16.BackColor = System.Drawing.Color.Transparent;
this.xrLabel16.CanShrink = true;
- this.xrLabel16.Font = new System.Drawing.Font("Times New Roman", 14F, System.Drawing.FontStyle.Bold);
+ this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Times New Roman", 14F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(60.0001F, 10.00001F);
this.xrLabel16.Name = "xrLabel16";
this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -199,7 +199,7 @@ namespace Wichernhaus.Neu
//
this.xrLabel35.BackColor = System.Drawing.Color.Transparent;
this.xrLabel35.Borders = DevExpress.XtraPrinting.BorderSide.None;
- this.xrLabel35.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+ this.xrLabel35.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel35.LocationFloat = new DevExpress.Utils.PointFloat(60.0001F, 217.0883F);
this.xrLabel35.Multiline = true;
this.xrLabel35.Name = "xrLabel35";
@@ -453,7 +453,7 @@ namespace Wichernhaus.Neu
// xrLabel17
//
this.xrLabel17.BackColor = System.Drawing.Color.Transparent;
- this.xrLabel17.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(60.0001F, 277.0884F);
this.xrLabel17.Multiline = true;
this.xrLabel17.Name = "xrLabel17";
@@ -471,7 +471,6 @@ namespace Wichernhaus.Neu
//
// topMarginBand1
//
- this.topMarginBand1.HeightF = 100F;
this.topMarginBand1.Name = "topMarginBand1";
//
// bottomMarginBand1
@@ -491,7 +490,7 @@ namespace Wichernhaus.Neu
//
// xrRichText2
//
- this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F);
+ this.xrRichText2.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(531.1946F, 0F);
this.xrRichText2.Name = "xrRichText2";
this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
@@ -559,14 +558,14 @@ namespace Wichernhaus.Neu
this.GroupFooter2});
this.DataSource = this.bindingSource1;
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
- this.Font = new System.Drawing.Font("Times New Roman", 12F);
+ this.Font = new DevExpress.Drawing.DXFont("Times New Roman", 12F);
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
- this.Margins = new System.Drawing.Printing.Margins(30, 30, 100, 90);
+ this.Margins = new DevExpress.Drawing.DXMargins(30F, 30F, 100F, 90.33334F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
- this.Version = "17.1";
+ this.Version = "23.2";
((System.ComponentModel.ISupportInitialize)(this.tableRechnungspositionen)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
diff --git a/ReportImp/Wichernhaus/Budgetnachweis2.resx b/ReportImp/Wichernhaus/Budgetnachweis2.resx
index 1ee964e46..3a9f13df6 100644
--- a/ReportImp/Wichernhaus/Budgetnachweis2.resx
+++ b/ReportImp/Wichernhaus/Budgetnachweis2.resx
@@ -123,9 +123,6 @@
Mit freundlichen Grüßen
- ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGIAXABmADEAXABmAHMAMQA4AFwAYwBmADAAIABXAGkAYwBoAGUAcgBuAGgAYQB1AHMAIABnAEcAbQBiAEgAfQBcAGYAMQBcAGYAcwAyADQAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGIAXABmADEAXABmAHMAMQA4AFwAYwBmADAAIABBAG0AYgB1AGwAYQBuAHQAIABCAGUAdAByAGUAdQB0AGUAcwAgAFcAbwBoAG4AZQBuAH0AXABiAFwAZgAxAFwAZgBzADIANABcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGgAeQBwAGgAcABhAHIAMABcAGYAMQBcAGYAcwAxADgAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAMQBcAGYAcwAxADgAXABjAGYAMAAgAFcAYQByAGUAbgBkAG8AcgBmAGUAcgAgAFMAdAByAC4AIAAxADQAfQBcAGYAMQBcAGYAcwAxADgAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAMQBcAGYAcwAxADgAXABjAGYAMAAgADQANQA4ADkAMgAgAEcAZQBsAHMAZQBuAGsAaQByAGMAaABlAG4AfQBcAGYAMQBcAGYAcwAxADgAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAMQBcAGYAcwAxADgAXABjAGYAMAAgAFQAZQBsAGUAZgBvAG4AOgAgADAAMgAwADkALwA5ADcANgAxADcAMQA0AH0AXABmADEAXABmAHMAMQA4AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAaAB5AHAAaABwAGEAcgAwAHsAXABmADEAXABmAHMAMQA4AFwAYwBmADAAIABGAGEAeAA6ACAAMAAyADAAOQAvADkANwA2ADEANwA5ADkAfQBcAGYAMQBcAGYAcwAxADgAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAaQBlAGwAZAB7AFwAKgBcAGYAbABkAGkAbgBzAHQAewBcAGYAMQBcAGYAcwAyADQAXABjAGYAMAAgAEgAWQBQAEUAUgBMAEkATgBLACAAIgBtAGEAaQBsAHQAbwA6AGIAZQB0AHIAZQB1AHQAZQBzAHcAbwBoAG4AZQBuAEAAdwBpAGMAaABlAHIAbgBoAGEAdQBzAC4AYwBvAG0AIgAgAH0AfQB7AFwAZgBsAGQAcgBzAGwAdAB7AFwAdQBsAFwAZgAxAFwAZgBzADEAOABcAGMAZgAyACAAYgBlAHQAcgBlAHUAdABlAHMAdwBvAGgAbgBlAG4AQAB3AGkAYwBoAGUAcgBuAGgAYQB1AHMALgBjAG8AbQB9AH0AfQBcAGYAMQBcAGYAcwAyADQAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwAMgA3ADUAXABzAGwAbQB1AGwAdAAxAFwAcwBhADIAMAAwAHsAXABmADEAXABmAHMAMQA4AFwAYwBmADAAIABBAG4AcwBwAHIAZQBjAGgAcABhAHIAdABuAGUAcgA6ACAARgAuACAAQwBvAGwAbABlAHQAfQBcAGwAYQBuAGcANwBcAGwAYQBuAGcAZgBlADcAXABmAHMAMgAyAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A
+ ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAKgBcAGQAZQBmAHAAYQBwACAAXAB3AGkAZABjAHQAbABwAGEAcgB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAMQBcAGYAcwAyADQAIABOAG8AcgBtAGEAbAA7AH0AewBcACoAXABjAHMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEQAZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAOwB9AHsAXAAqAFwAYwBzADIAXABzAGIAYQBzAGUAZABvAG4AMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEwAaQBuAGUAIABOAHUAbQBiAGUAcgA7AH0AewBcACoAXABjAHMAMwBcAGYAMQBcAGYAcwAyADQAXAB1AGwAXABjAGYAMgAgAEgAeQBwAGUAcgBsAGkAbgBrADsAfQB7AFwAKgBcAHQAcwA0AFwAdABzAHIAbwB3AGQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBiADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHQAMwBcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAATgBvAHIAbQBhAGwAIABUAGEAYgBsAGUAOwB9AHsAXAAqAFwAdABzADUAXAB0AHMAcgBvAHcAZABcAHMAYgBhAHMAZQBkAG8AbgA0AFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcgBiAHIAZAByAHQAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAbABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBiAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAaABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgB2AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABUAGEAYgBsAGUAIABTAGkAbQBwAGwAZQAgADEAOwB9AH0AewBcACoAXABsAGkAcwB0AG8AdgBlAHIAcgBpAGQAZQB0AGEAYgBsAGUAfQBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABoAHQAbQBhAHUAdABzAHAAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGgAeQBwAGgAcABhAHIAMAB7AFwAZgAxAFwAZgBzADEAOABcAGIAXABjAGYAMQAgAFcAaQBjAGgAZQByAG4AaABhAHUAcwAgAGcARwBtAGIASAB9AFwAZgAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAaAB5AHAAaABwAGEAcgAwAHsAXABmADEAXABmAHMAMQA4AFwAYgBcAGMAZgAxACAAQQBtAGIAdQBsAGEAbgB0ACAAQgBlAHQAcgBlAHUAdABlAHMAIABXAG8AaABuAGUAbgB9AFwAZgAxAFwAZgBzADIANABcAGIAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGgAeQBwAGgAcABhAHIAMABcAGYAMQBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGgAeQBwAGgAcABhAHIAMAB7AFwAZgAxAFwAZgBzADEAOABcAGMAZgAxACAAVwBhAHIAZQBuAGQAbwByAGYAZQByACAAUwB0AHIALgAgADEANAB9AFwAZgAxAFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAaAB5AHAAaABwAGEAcgAwAHsAXABmADEAXABmAHMAMQA4AFwAYwBmADEAIAA0ADUAOAA5ADIAIABHAGUAbABzAGUAbgBrAGkAcgBjAGgAZQBuAH0AXABmADEAXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAMQBcAGYAcwAxADgAXABjAGYAMQAgAFQAZQBsAGUAZgBvAG4AOgAgADAAMgAwADkALwA5ADcANgAxADcAMQA0AH0AXABmADEAXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAMQBcAGYAcwAxADgAXABjAGYAMQAgAEYAYQB4ADoAIAAwADIAMAA5AC8AOQA3ADYAMQA3ADkAOQB9AFwAZgAxAFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAaAB5AHAAaABwAGEAcgAwAHsAXABmAGkAZQBsAGQAewBcACoAXABmAGwAZABpAG4AcwB0AHsAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABIAFkAUABFAFIATABJAE4ASwAgACIAbQBhAGkAbAB0AG8AOgBiAGUAdAByAGUAdQB0AGUAcwB3AG8AaABuAGUAbgBAAHcAaQBjAGgAZQByAG4AaABhAHUAcwAuAGMAbwBtACIAIAB9AH0AewBcAGYAbABkAHIAcwBsAHQAewBcAGYAMQBcAGYAcwAxADgAXAB1AGwAXABjAGYAMgAgAGIAfQB7AFwAZgAxAFwAZgBzADEAOABcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXAB1AGwAXABjAGYAMgAgAGUAZwBsAGUAaQB0AGUAdABlAHMAdwBvAGgAbgBlAG4AfQB7AFwAZgAxAFwAZgBzADEAOABcAHUAbABcAGMAZgAyACAAQAB3AGkAYwBoAGUAcgBuAGgAYQB1AHMALgBjAG8AbQB9AH0AfQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHMAbAAyADcANQBcAHMAbABtAHUAbAB0ADEAXABzAGEAMgAwADAAewBcAGYAMQBcAGYAcwAxADgAXABjAGYAMQAgAEEAbgBzAHAAcgBlAGMAaABwAGEAcgB0AG4AZQByADoAIABGAC4AIABDAG8AbABsAGUAdAB9AFwAZgBzADIAMgBcAGwAYQBuAGcANwBcAGwAYQBuAGcAZgBlADcAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGYAMQBcAGYAcwAyADQAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYwBmADEAXABwAGEAcgB9AA==
-
- 17, 17
-
\ No newline at end of file
diff --git a/ReportImp/Wichernhaus/BudgetnachweisVariante2.Designer.cs b/ReportImp/Wichernhaus/BudgetnachweisVariante2.Designer.cs
index 663ad8588..788d6bdcf 100644
--- a/ReportImp/Wichernhaus/BudgetnachweisVariante2.Designer.cs
+++ b/ReportImp/Wichernhaus/BudgetnachweisVariante2.Designer.cs
@@ -46,12 +46,12 @@ namespace Wichernhaus
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
- this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -156,7 +156,7 @@ namespace Wichernhaus
this.xrLabel3.CanShrink = true;
this.xrLabel3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecordedFLSTotal", "{0:0.00}")});
- this.xrLabel3.Font = new System.Drawing.Font("Times New Roman", 12F, System.Drawing.FontStyle.Bold);
+ this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Times New Roman", 12F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(561.38F, 132F);
this.xrLabel3.Multiline = true;
this.xrLabel3.Name = "xrLabel3";
@@ -175,7 +175,7 @@ namespace Wichernhaus
this.xrLabel9.BackColor = System.Drawing.Color.Transparent;
this.xrLabel9.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrLabel9.CanShrink = true;
- this.xrLabel9.Font = new System.Drawing.Font("Times New Roman", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))));
+ this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Times New Roman", 12F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline))));
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 9.999974F);
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.SizeF = new System.Drawing.SizeF(650F, 20F);
@@ -255,9 +255,18 @@ namespace Wichernhaus
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
+ // xrRichText2
+ //
+ this.xrRichText2.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
+ this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(413.3468F, 0F);
+ this.xrRichText2.Name = "xrRichText2";
+ this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
+ this.xrRichText2.SizeF = new System.Drawing.SizeF(264.972F, 165.5556F);
+ this.xrRichText2.StylePriority.UseFont = false;
+ //
// xrLabel8
//
- this.xrLabel8.Font = new System.Drawing.Font("Times New Roman", 12F, System.Drawing.FontStyle.Bold);
+ this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Times New Roman", 12F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 276.2917F);
this.xrLabel8.Multiline = true;
this.xrLabel8.Name = "xrLabel8";
@@ -283,16 +292,7 @@ namespace Wichernhaus
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
//
- // xrRichText2
- //
- this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F);
- this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(413.3468F, 0F);
- this.xrRichText2.Name = "xrRichText2";
- this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
- this.xrRichText2.SizeF = new System.Drawing.SizeF(264.972F, 165.5556F);
- this.xrRichText2.StylePriority.UseFont = false;
- //
- // Budgetnachweis
+ // BudgetnachweisVariante2
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail,
@@ -301,16 +301,16 @@ namespace Wichernhaus
this.GroupHeader1});
this.DataSource = this.bindingSource1;
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
- this.Font = new System.Drawing.Font("Times New Roman", 12F);
+ this.Font = new DevExpress.Drawing.DXFont("Times New Roman", 12F);
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
- this.Margins = new System.Drawing.Printing.Margins(80, 30, 50, 50);
+ this.Margins = new DevExpress.Drawing.DXMargins(80F, 30F, 50F, 50F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
- this.Version = "17.1";
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+ this.Version = "23.2";
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
diff --git a/ReportImp/Wichernhaus/BudgetnachweisVariante2.resx b/ReportImp/Wichernhaus/BudgetnachweisVariante2.resx
index 8ac1c26c0..800e927fa 100644
--- a/ReportImp/Wichernhaus/BudgetnachweisVariante2.resx
+++ b/ReportImp/Wichernhaus/BudgetnachweisVariante2.resx
@@ -123,9 +123,6 @@
Mit freundlichen Grüßen
- ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGIAXABmADEAXABmAHMAMQA4AFwAYwBmADAAIABXAGkAYwBoAGUAcgBuAGgAYQB1AHMAIABnAEcAbQBiAEgAfQBcAGYAMQBcAGYAcwAyADQAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGIAXABmADEAXABmAHMAMQA4AFwAYwBmADAAIABBAG0AYgB1AGwAYQBuAHQAIABCAGUAdAByAGUAdQB0AGUAcwAgAFcAbwBoAG4AZQBuAH0AXABiAFwAZgAxAFwAZgBzADIANABcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGgAeQBwAGgAcABhAHIAMABcAGYAMQBcAGYAcwAxADgAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAMQBcAGYAcwAxADgAXABjAGYAMAAgAFcAYQByAGUAbgBkAG8AcgBmAGUAcgAgAFMAdAByAC4AIAAxADQAfQBcAGYAMQBcAGYAcwAxADgAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAMQBcAGYAcwAxADgAXABjAGYAMAAgADQANQA4ADkAMgAgAEcAZQBsAHMAZQBuAGsAaQByAGMAaABlAG4AfQBcAGYAMQBcAGYAcwAxADgAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAMQBcAGYAcwAxADgAXABjAGYAMAAgAFQAZQBsAGUAZgBvAG4AOgAgADAAMgAwADkALwA5ADcANgAxADcAMQA0AH0AXABmADEAXABmAHMAMQA4AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAaAB5AHAAaABwAGEAcgAwAHsAXABmADEAXABmAHMAMQA4AFwAYwBmADAAIABGAGEAeAA6ACAAMAAyADAAOQAvADkANwA2ADEANwA5ADkAfQBcAGYAMQBcAGYAcwAxADgAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAaQBlAGwAZAB7AFwAKgBcAGYAbABkAGkAbgBzAHQAewBcAGYAMQBcAGYAcwAyADQAXABjAGYAMAAgAEgAWQBQAEUAUgBMAEkATgBLACAAIgBtAGEAaQBsAHQAbwA6AGIAZQB0AHIAZQB1AHQAZQBzAHcAbwBoAG4AZQBuAEAAdwBpAGMAaABlAHIAbgBoAGEAdQBzAC4AYwBvAG0AIgAgAH0AfQB7AFwAZgBsAGQAcgBzAGwAdAB7AFwAdQBsAFwAZgAxAFwAZgBzADEAOABcAGMAZgAyACAAYgBlAHQAcgBlAHUAdABlAHMAdwBvAGgAbgBlAG4AQAB3AGkAYwBoAGUAcgBuAGgAYQB1AHMALgBjAG8AbQB9AH0AfQBcAGYAMQBcAGYAcwAyADQAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwAMgA3ADUAXABzAGwAbQB1AGwAdAAxAFwAcwBhADIAMAAwAHsAXABmADEAXABmAHMAMQA4AFwAYwBmADAAIABBAG4AcwBwAHIAZQBjAGgAcABhAHIAdABuAGUAcgA6ACAARgAuACAAQwBvAGwAbABlAHQAfQBcAGwAYQBuAGcANwBcAGwAYQBuAGcAZgBlADcAXABmAHMAMgAyAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A
+ ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAKgBcAGQAZQBmAHAAYQBwACAAXAB3AGkAZABjAHQAbABwAGEAcgB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAMQBcAGYAcwAyADQAIABOAG8AcgBtAGEAbAA7AH0AewBcACoAXABjAHMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEQAZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAOwB9AHsAXAAqAFwAYwBzADIAXABzAGIAYQBzAGUAZABvAG4AMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEwAaQBuAGUAIABOAHUAbQBiAGUAcgA7AH0AewBcACoAXABjAHMAMwBcAGYAMQBcAGYAcwAyADQAXAB1AGwAXABjAGYAMgAgAEgAeQBwAGUAcgBsAGkAbgBrADsAfQB7AFwAKgBcAHQAcwA0AFwAdABzAHIAbwB3AGQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBiADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHQAMwBcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAATgBvAHIAbQBhAGwAIABUAGEAYgBsAGUAOwB9AHsAXAAqAFwAdABzADUAXAB0AHMAcgBvAHcAZABcAHMAYgBhAHMAZQBkAG8AbgA0AFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcgBiAHIAZAByAHQAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAbABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBiAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAaABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgB2AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABUAGEAYgBsAGUAIABTAGkAbQBwAGwAZQAgADEAOwB9AH0AewBcACoAXABsAGkAcwB0AG8AdgBlAHIAcgBpAGQAZQB0AGEAYgBsAGUAfQBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABoAHQAbQBhAHUAdABzAHAAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGgAeQBwAGgAcABhAHIAMAB7AFwAZgAxAFwAZgBzADEAOABcAGIAXABjAGYAMQAgAFcAaQBjAGgAZQByAG4AaABhAHUAcwAgAGcARwBtAGIASAB9AFwAZgAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAaAB5AHAAaABwAGEAcgAwAHsAXABmADEAXABmAHMAMQA4AFwAYgBcAGMAZgAxACAAQQBtAGIAdQBsAGEAbgB0ACAAQgBlAHQAcgBlAHUAdABlAHMAIABXAG8AaABuAGUAbgB9AFwAZgAxAFwAZgBzADIANABcAGIAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGgAeQBwAGgAcABhAHIAMABcAGYAMQBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGgAeQBwAGgAcABhAHIAMAB7AFwAZgAxAFwAZgBzADEAOABcAGMAZgAxACAAVwBhAHIAZQBuAGQAbwByAGYAZQByACAAUwB0AHIALgAgADEANAB9AFwAZgAxAFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAaAB5AHAAaABwAGEAcgAwAHsAXABmADEAXABmAHMAMQA4AFwAYwBmADEAIAA0ADUAOAA5ADIAIABHAGUAbABzAGUAbgBrAGkAcgBjAGgAZQBuAH0AXABmADEAXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAMQBcAGYAcwAxADgAXABjAGYAMQAgAFQAZQBsAGUAZgBvAG4AOgAgADAAMgAwADkALwA5ADcANgAxADcAMQA0AH0AXABmADEAXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAMQBcAGYAcwAxADgAXABjAGYAMQAgAEYAYQB4ADoAIAAwADIAMAA5AC8AOQA3ADYAMQA3ADkAOQB9AFwAZgAxAFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAaAB5AHAAaABwAGEAcgAwAHsAXABmAGkAZQBsAGQAewBcACoAXABmAGwAZABpAG4AcwB0AHsAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABIAFkAUABFAFIATABJAE4ASwAgACIAbQBhAGkAbAB0AG8AOgBiAGUAdAByAGUAdQB0AGUAcwB3AG8AaABuAGUAbgBAAHcAaQBjAGgAZQByAG4AaABhAHUAcwAuAGMAbwBtACIAIAB9AH0AewBcAGYAbABkAHIAcwBsAHQAewBcAGYAMQBcAGYAcwAxADgAXAB1AGwAXABjAGYAMgAgAGIAfQB7AFwAZgAxAFwAZgBzADEAOABcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXAB1AGwAXABjAGYAMgAgAGUAZwBsAGUAaQB0AGUAdABlAHMAdwBvAGgAbgBlAG4AfQB7AFwAZgAxAFwAZgBzADEAOABcAHUAbABcAGMAZgAyACAAQAB3AGkAYwBoAGUAcgBuAGgAYQB1AHMALgBjAG8AbQB9AH0AfQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHMAbAAyADcANQBcAHMAbABtAHUAbAB0ADEAXABzAGEAMgAwADAAewBcAGYAMQBcAGYAcwAxADgAXABjAGYAMQAgAEEAbgBzAHAAcgBlAGMAaABwAGEAcgB0AG4AZQByADoAIABGAC4AIABDAG8AbABsAGUAdAB9AFwAZgBzADIAMgBcAGwAYQBuAGcANwBcAGwAYQBuAGcAZgBlADcAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGYAMQBcAGYAcwAyADQAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYwBmADEAXABwAGEAcgB9AA==
-
- 17, 17
-
\ No newline at end of file