diff --git a/ReportImp/SBBMainzReports/InvoiceCustomerReport.Designer.cs b/ReportImp/SBBMainzReports/InvoiceCustomerReport.Designer.cs
index 5879bdee4..af86d99ed 100644
--- a/ReportImp/SBBMainzReports/InvoiceCustomerReport.Designer.cs
+++ b/ReportImp/SBBMainzReports/InvoiceCustomerReport.Designer.cs
@@ -84,11 +84,9 @@ namespace SBBMainzReports
this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
this.lblTitel = new DevExpress.XtraReports.UI.XRLabel();
this.lblRechnungsnummer = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.lblAbrechnungszeitraum = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
- this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -102,13 +100,14 @@ namespace SBBMainzReports
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -249,7 +248,6 @@ namespace SBBMainzReports
this.xrTable2,
this.lblTitel,
this.lblRechnungsnummer,
- this.xrLabel11,
this.xrLabel10,
this.lblAbrechnungszeitraum,
this.xrLabel12,
@@ -403,7 +401,7 @@ namespace SBBMainzReports
this.xrLabel8,
this.xrTable4});
this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
- this.ReportFooter.HeightF = 269.7083F;
+ this.ReportFooter.HeightF = 336.5419F;
this.ReportFooter.KeepTogether = true;
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
@@ -489,15 +487,15 @@ namespace SBBMainzReports
// PageFooter
//
this.PageFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
- this.xrPictureBox2,
- this.xrLabel15});
+ this.xrLabel15,
+ this.xrPictureBox2});
this.PageFooter.HeightF = 124.2083F;
this.PageFooter.Name = "PageFooter";
//
// xrPictureBox2
//
this.xrPictureBox2.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox2.ImageSource"));
- this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(510.0831F, 10.00016F);
+ this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(521.6254F, 0F);
this.xrPictureBox2.Name = "xrPictureBox2";
this.xrPictureBox2.SizeF = new System.Drawing.SizeF(159.7919F, 111F);
this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
@@ -505,7 +503,7 @@ namespace SBBMainzReports
// xrLabel15
//
this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
- this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(91.24998F, 75.00006F);
+ this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(92.29202F, 75F);
this.xrLabel15.Multiline = true;
this.xrLabel15.Name = "xrLabel15";
this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -747,22 +745,6 @@ namespace SBBMainzReports
this.lblRechnungsnummer.Text = "[InvoiceNumber]";
this.lblRechnungsnummer.WordWrap = false;
//
- // xrLabel11
- //
- this.xrLabel11.BackColor = System.Drawing.Color.Transparent;
- this.xrLabel11.CanShrink = true;
- this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecipientDebitorNumber")});
- this.xrLabel11.Font = new DevExpress.Drawing.DXFont("arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
- this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(122.5F, 331.4166F);
- this.xrLabel11.Name = "xrLabel11";
- this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel11.SizeF = new System.Drawing.SizeF(112.5F, 20F);
- this.xrLabel11.StylePriority.UseBackColor = false;
- this.xrLabel11.StylePriority.UseFont = false;
- this.xrLabel11.Text = "[DebitorNumber]";
- this.xrLabel11.WordWrap = false;
- //
// xrLabel10
//
this.xrLabel10.BackColor = System.Drawing.Color.Transparent;
@@ -782,10 +764,10 @@ namespace SBBMainzReports
this.lblAbrechnungszeitraum.BackColor = System.Drawing.Color.Transparent;
this.lblAbrechnungszeitraum.CanShrink = true;
this.lblAbrechnungszeitraum.Font = new DevExpress.Drawing.DXFont("arial", 11F);
- this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(501.4996F, 311.4165F);
+ this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(488.9996F, 311.4166F);
this.lblAbrechnungszeitraum.Name = "lblAbrechnungszeitraum";
this.lblAbrechnungszeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.lblAbrechnungszeitraum.SizeF = new System.Drawing.SizeF(179.9179F, 20F);
+ this.lblAbrechnungszeitraum.SizeF = new System.Drawing.SizeF(187.8335F, 20F);
this.lblAbrechnungszeitraum.StylePriority.UseBackColor = false;
this.lblAbrechnungszeitraum.StylePriority.UseFont = false;
this.lblAbrechnungszeitraum.Text = "[AccountingPeriod]";
@@ -796,7 +778,7 @@ namespace SBBMainzReports
this.xrLabel12.BackColor = System.Drawing.Color.Transparent;
this.xrLabel12.CanShrink = true;
this.xrLabel12.Font = new DevExpress.Drawing.DXFont("arial", 11F);
- this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(332.2917F, 311.4166F);
+ this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(319.7917F, 311.4166F);
this.xrLabel12.Name = "xrLabel12";
this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(169.208F, 20F);
@@ -805,10 +787,6 @@ namespace SBBMainzReports
this.xrLabel12.Text = "Abrechnungszeitraum:";
this.xrLabel12.WordWrap = false;
//
- // bindingSource1
- //
- this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.InvoiceCustomerRO);
- //
// xrTable5
//
this.xrTable5.Font = new DevExpress.Drawing.DXFont("arial", 9F);
@@ -956,6 +934,10 @@ namespace SBBMainzReports
this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell30.Weight = 0.49440482311450973D;
//
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.InvoiceCustomerRO);
+ //
// InvoiceCustomerReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -982,8 +964,8 @@ namespace SBBMainzReports
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -1043,7 +1025,6 @@ namespace SBBMainzReports
private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
private DevExpress.XtraReports.UI.XRLabel lblTitel;
private DevExpress.XtraReports.UI.XRLabel lblRechnungsnummer;
- private DevExpress.XtraReports.UI.XRLabel xrLabel11;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
private DevExpress.XtraReports.UI.XRLabel lblAbrechnungszeitraum;
private DevExpress.XtraReports.UI.XRLabel xrLabel12;
diff --git a/ReportImp/SBBMainzReports/InvoiceCustomerReport.resx b/ReportImp/SBBMainzReports/InvoiceCustomerReport.resx
index 549bcd83b..3a6cba980 100644
--- a/ReportImp/SBBMainzReports/InvoiceCustomerReport.resx
+++ b/ReportImp/SBBMainzReports/InvoiceCustomerReport.resx
@@ -121,7 +121,7 @@
ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AewBcAGYAMwBcAGYAYwBoAGEAcgBzAGUAdAAyACAAUwB5AG0AYgBvAGwAOwB9AHsAXABmADQAIABWAGUAcgBkAGEAbgBhADsAfQB9AHsAXABjAG8AbABvAHIAdABiAGwAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAwACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMgA1ADUAIAA7AFwAcgBlAGQAMgA1ADUAXABnAHIAZQBlAG4AMQA5ADIAXABiAGwAdQBlADAAIAA7AH0AewBcACoAXABkAGUAZgBjAGgAcAAgAFwAZgAxAFwAZgBzADIANAB9AHsAXAAqAFwAZABlAGYAcABhAHAAIABcAHcAaQBkAGMAdABsAHAAYQByAH0AewBcAHMAdAB5AGwAZQBzAGgAZQBlAHQAIAB7AFwAcQBsAFwAZgAxAFwAZgBzADIANAAgAE4AbwByAG0AYQBsADsAfQB7AFwAKgBcAGMAcwAxAFwAZgAxAFwAZgBzADIANABcAGMAZgAxACAARABlAGYAYQB1AGwAdAAgAFAAYQByAGEAZwByAGEAcABoACAARgBvAG4AdAA7AH0AewBcACoAXABjAHMAMgBcAHMAYgBhAHMAZQBkAG8AbgAxAFwAZgAxAFwAZgBzADIANABcAGMAZgAxACAATABpAG4AZQAgAE4AdQBtAGIAZQByADsAfQB7AFwAKgBcAGMAcwAzAFwAZgAxAFwAZgBzADIANABcAHUAbABcAGMAZgAyACAASAB5AHAAZQByAGwAaQBuAGsAOwB9AHsAXAAqAFwAdABzADQAXAB0AHMAcgBvAHcAZABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAdAAzAFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABOAG8AcgBtAGEAbAAgAFQAYQBiAGwAZQA7AH0AewBcACoAXAB0AHMANQBcAHQAcwByAG8AdwBkAFwAcwBiAGEAcwBlAGQAbwBuADQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdAByAGIAcgBkAHIAdABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBsAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAcgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBoAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHYAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAFQAYQBiAGwAZQAgAFMAaQBtAHAAbABlACAAMQA7AH0AfQB7AFwAKgBcAGwAaQBzAHQAbwB2AGUAcgByAGkAZABlAHQAYQBiAGwAZQB9AFwAbgBvAHUAaQBjAG8AbQBwAGEAdABcAGgAdABtAGEAdQB0AHMAcABcAHMAcABsAHkAdAB3AG4AaQBuAGUAXABhAGwAbgB0AGIAbABpAG4AZABcAGUAeABwAHMAaAByAHQAbgBcAHMAcABsAHQAcABnAHAAYQByAFwAbgBvAGcAcgBvAHcAYQB1AHQAbwBmAGkAdABcAHUAdABpAG4AbABcAG4AbwBiAHIAawB3AHIAcAB0AGIAbABcAGYAdABuAGwAeQB0AHcAbgBpAG4AZQBcAG4AbwB0AGMAdgBhAHMAcABcAGQAbgB0AGIAbABuAHMAYgBkAGIAXABuAGUAdwB0AGIAbABzAHQAeQByAHUAbABzAFwAZgBvAHIAbQBzAGgAYQBkAGUAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdwBpAGQAYwB0AGwAcABhAHIAewBcAGYAMgBcAGYAcwAxADYAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYwBmADAAIABTAEIAQgAgAFMAbwB6AGkAYQBsAHQAaABlAHIAYQBwAGUAdQB0AGkAcwBjAGgAZQAgAEIAZQByAGEAdAB1AG4AZwBzAHMAdABlAGwAbABlACAATQBhAGkAbgB6ACAAZwBHAG0AYgBIACAAUgBoAGUAaQBuAGEAbABsAGUAZQAgADEANwAgACAAIAB9AHsAXABmADMAXABmAHMAMQA2AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGMAZgAzACAAXAB1AC0AMwA5ADEAMwBcACcAMwBmAH0AewBcAGYAMgBcAGYAcwAxADYAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYwBmADMAIAAgACAAIAB9AHsAXABmADIAXABmAHMAMQA2AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGMAZgAwACAANQA1ADEAMQA4ACAATQBhAGkAbgB6AH0AXABmADQAXABmAHMAMgAwAFwAYwBmADEAXABwAGEAcgB9AA==
- Wir bitten um Überweisung des Gesamtbetrages unter Angabe der Rechnungsnummer auf unser Konto.
+ Wir bitten um Überweisung des Gesamtbetrages unter Angabe der Rechnungsnummer und der Debitornummer auf unser Konto.
Mit freundlichen Grüßen
diff --git a/ReportImp/SBBMainzReports/Translation/TranslationDictionary.cs b/ReportImp/SBBMainzReports/Translation/TranslationDictionary.cs
index 58e7c24bc..ca04265d7 100644
--- a/ReportImp/SBBMainzReports/Translation/TranslationDictionary.cs
+++ b/ReportImp/SBBMainzReports/Translation/TranslationDictionary.cs
@@ -20,7 +20,7 @@ namespace SBBMainz.Translation
var dict = base.GetTranslationDictionary();
AddOrReplaceTranslation(dict, "Hilfeplankonferenzen innerhalb der nächsten zwei Wochen:", "Hilfeplankonferenzen innerhalb der nächsten 3 Monate:");
- //AddOrReplaceTranslation(dict, "Beruf", "Zonen");
+ AddOrReplaceTranslation(dict, "Beruf", "Zonen");
return dict;
}