PariMobil/Reporting/ServiceInvoiceReport - Miniformatanpassungen

158540

ReportImp/PariMobil/Reporting/ServiceInvoiceReport.Designer.cs

@@ -38,6 +38,8 @@ namespace PariMobil
             this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
             this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
             this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.lblAnrede = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
             this.lblKontaktdaten = new DevExpress.XtraReports.UI.XRLabel();
@@ -74,11 +76,10 @@ namespace PariMobil
             this.xrTableCell46 = 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.lblAnrede = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
             this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
@@ -140,6 +141,7 @@ namespace PariMobil
             // Page1
             // 
             this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel9,
             this.lblAnrede,
             this.xrLabel6,
             this.xrLabel8,
@@ -151,10 +153,34 @@ namespace PariMobil
             this.xrLabel3,
             this.xrLabel2});
             this.Page1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
-            this.Page1.HeightF = 424.7084F;
+            this.Page1.HeightF = 437.4168F;
             this.Page1.Name = "Page1";
             this.Page1.StylePriority.UseFont = false;
             // 
+            // lblAnrede
+            // 
+            this.lblAnrede.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(25F, 275.75F);
+            this.lblAnrede.Name = "lblAnrede";
+            this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblAnrede.SizeF = new System.Drawing.SizeF(317F, 17F);
+            this.lblAnrede.StylePriority.UseFont = false;
+            this.lblAnrede.Text = "Sehr geehrte Damen und Herren,";
+            // 
+            // xrLabel6
+            // 
+            this.xrLabel6.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel6.CanShrink = true;
+            this.xrLabel6.Font = new DevExpress.Drawing.DXFont("ARial", 10F);
+            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(24.99997F, 305.625F);
+            this.xrLabel6.Multiline = true;
+            this.xrLabel6.Name = "xrLabel6";
+            this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel6.SizeF = new System.Drawing.SizeF(642F, 131.7917F);
+            this.xrLabel6.StylePriority.UseBackColor = false;
+            this.xrLabel6.StylePriority.UseFont = false;
+            this.xrLabel6.Text = resources.GetString("xrLabel6.Text");
+            // 
             // xrLabel8
             // 
             this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 6F);
@@ -192,7 +218,7 @@ namespace PariMobil
             this.lblKontaktdaten.SizeF = new System.Drawing.SizeF(251.375F, 97.74997F);
             this.lblKontaktdaten.StylePriority.UseFont = false;
             this.lblKontaktdaten.StylePriority.UseTextAlignment = false;
-            this.lblKontaktdaten.Text = "Mühlenstr. 42\r\n47798 Krefeld\r\nTelefon: +49 2151 84 33 -50\r\n\r\ntimo.schuermann@pari" +
+            this.lblKontaktdaten.Text = "Mühlenstr. 42\r\n47798 Krefeld\r\nTelefon: +49 2151 84 33 -44\r\n\r\ntimo.schuermann@pari" +
     "mobil.de\r\nRückfragen an: Timo Schürman";
             this.lblKontaktdaten.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
             // 
@@ -201,7 +227,7 @@ namespace PariMobil
             this.xrLabel10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
             this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(455.7F, 149.8334F);
+            this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(454.625F, 160.2501F);
             this.xrLabel10.Name = "xrLabel10";
             this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel10.SizeF = new System.Drawing.SizeF(251.375F, 23F);
@@ -652,6 +678,19 @@ namespace PariMobil
             this.GroupFooter1.HeightF = 239.875F;
             this.GroupFooter1.Name = "GroupFooter1";
             // 
+            // xrLabel7
+            // 
+            this.xrLabel7.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel7.Font = new DevExpress.Drawing.DXFont("ARial", 10F);
+            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(25F, 63.50002F);
+            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(642F, 176.375F);
+            this.xrLabel7.StylePriority.UseBackColor = false;
+            this.xrLabel7.StylePriority.UseFont = false;
+            this.xrLabel7.Text = resources.GetString("xrLabel7.Text");
+            // 
             // xrLabel1
             // 
             this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -667,47 +706,24 @@ namespace PariMobil
             this.xrLabel1.Text = "xrLabel1";
             this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
             // 
-            // lblAnrede
-            // 
-            this.lblAnrede.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(25F, 275.75F);
-            this.lblAnrede.Name = "lblAnrede";
-            this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.lblAnrede.SizeF = new System.Drawing.SizeF(317F, 17F);
-            this.lblAnrede.StylePriority.UseFont = false;
-            this.lblAnrede.Text = "Sehr geehrte Damen und Herren,";
-            // 
-            // xrLabel6
-            // 
-            this.xrLabel6.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel6.CanShrink = true;
-            this.xrLabel6.Font = new DevExpress.Drawing.DXFont("ARial", 10F);
-            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(25F, 304.5834F);
-            this.xrLabel6.Multiline = true;
-            this.xrLabel6.Name = "xrLabel6";
-            this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel6.SizeF = new System.Drawing.SizeF(642F, 119.0834F);
-            this.xrLabel6.StylePriority.UseBackColor = false;
-            this.xrLabel6.StylePriority.UseFont = false;
-            this.xrLabel6.Text = resources.GetString("xrLabel6.Text");
-            // 
-            // xrLabel7
-            // 
-            this.xrLabel7.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel7.Font = new DevExpress.Drawing.DXFont("ARial", 10F);
-            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(25F, 63.50002F);
-            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(642F, 176.375F);
-            this.xrLabel7.StylePriority.UseBackColor = false;
-            this.xrLabel7.StylePriority.UseFont = false;
-            this.xrLabel7.Text = resources.GetString("xrLabel7.Text");
-            // 
             // bindingSource1
             // 
             this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
             // 
+            // xrLabel9
+            // 
+            this.xrLabel9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "BusinessPartnerId")});
+            this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(455.7F, 130.4167F);
+            this.xrLabel9.Name = "xrLabel9";
+            this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel9.SizeF = new System.Drawing.SizeF(251.375F, 23F);
+            this.xrLabel9.StylePriority.UseFont = false;
+            this.xrLabel9.StylePriority.UseTextAlignment = false;
+            this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrLabel9.TextFormatString = "GP-Nr.: {0}";
+            // 
             // ServiceInvoiceReport
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -786,5 +802,6 @@ namespace PariMobil
         private DevExpress.XtraReports.UI.XRLabel lblAnrede;
         private DevExpress.XtraReports.UI.XRLabel xrLabel6;
         private DevExpress.XtraReports.UI.XRLabel xrLabel7;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel9;
     }
 }

ReportImp/PariMobil/Reporting/ServiceInvoiceReport.resx

@@ -125,8 +125,10 @@
   </data>
   <data name="xrLabel6.Text" xml:space="preserve">
     <value>anbei übersenden wir Ihnen unsere Abrechnung über geleistete Fachleistungsstunden (Steuerbefreiung nach § 4 Nr. 16 Buchstabe E des UStG) für:
+
 [CustomerSalutation] [CustomerFirstName] [CustomerLastName], geb. [CustomerBirthdate!dd.MM.yyyy]
 GP: [CustomerReferenceNumber]
+
 Bewilligungszeitraum: vom [AccountingPeriodStart!dd.MM.yyyy] bis [AccountingPeriodEnd!dd.MM.yyyy]
 
 In der Anlage befinden sich die Nachweise unserer Betreuungsleistungen</value>

ReportImp/PariMobil/Reporting/SettlementReport2.Designer.cs

@@ -103,6 +103,7 @@ namespace PariMobil
             this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
             this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow31 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -121,7 +122,6 @@ namespace PariMobil
             this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -129,8 +129,8 @@ namespace PariMobil
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
             // 
             // Detail
@@ -188,7 +188,7 @@ namespace PariMobil
             this.lblKontaktdaten.SizeF = new System.Drawing.SizeF(251.375F, 97.74997F);
             this.lblKontaktdaten.StylePriority.UseFont = false;
             this.lblKontaktdaten.StylePriority.UseTextAlignment = false;
-            this.lblKontaktdaten.Text = "Mühlenstr. 42\r\n47798 Krefeld\r\nTelefon: +49 2151 84 33 -50\r\n\r\ntimo.schuermann@pari" +
+            this.lblKontaktdaten.Text = "Mühlenstr. 42\r\n47798 Krefeld\r\nTelefon: +49 2151 84 33 -44\r\n\r\ntimo.schuermann@pari" +
     "mobil.de\r\nRückfragen an: Timo Schürman";
             this.lblKontaktdaten.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
             // 
@@ -942,6 +942,10 @@ namespace PariMobil
             this.xrTableCell7.StylePriority.UsePadding = false;
             this.xrTableCell7.Weight = 3D;
             // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
+            // 
             // GroupFooter1
             // 
             this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -1144,10 +1148,6 @@ namespace PariMobil
             this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
             this.xrTableCell60.Weight = 0.16397432767427886D;
             // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
-            // 
             // Spitzabrechnung
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1177,8 +1177,8 @@ namespace PariMobil
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 
         }

ReportImp/PariMobil/Reporting/SettlementReport2.resx

@@ -119,14 +119,17 @@
   </resheader>
   <data name="xrLabel6.Text" xml:space="preserve">
     <value>anbei übersenden wir Ihnen unsere Abrechnung über geleistete Fachleistungsstunden (Steuerbefreiung nach § 4 Nr. 16 Buchstabe E des UStG) für:
+
 [Salutation2] [CustomerFirstName] [CustomerLastName], geb. [CustomerBirthday!dd.MM.yyyy]
 GP: [CustomerReferenceNumber]
+
 Bewilligungszeitraum: vom [AccountingStartDate!dd.MM.yyyy] bis [AccountingEndDate!dd.MM.yyyy]
 
-In der Anlage befinden sich die Nachweise unserer Betreuungsleistungen</value>
+In der Anlage befinden sich die Nachweise unserer Betreuungsleistungen.</value>
   </data>
   <data name="xrLabel5.Text" xml:space="preserve">
     <value>Wir bitten Sie um Zusendung der Endabrechnung unter Berücksichtigung der Ihrerseits geleisteten Abschlagszahlungen.
+
 Bitte überweisen Sie ausstehende Beträge auf das Konto: Sparkasse Krefeld
 IBAN: DE94 3205 0000 0000 3309 69    SWIFT/BIC: SPKRDE33