diff --git a/ReportImp/LebenshilfeDuisburgAtz/RechnungAtz.Designer.cs b/ReportImp/LebenshilfeDuisburgAtz/RechnungAtz.Designer.cs index d1403721b..10c0b92bc 100644 --- a/ReportImp/LebenshilfeDuisburgAtz/RechnungAtz.Designer.cs +++ b/ReportImp/LebenshilfeDuisburgAtz/RechnungAtz.Designer.cs @@ -54,7 +54,7 @@ namespace LebenshilfeDuisburgAtz this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); - this.txtBelegnr = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -62,11 +62,11 @@ namespace LebenshilfeDuisburgAtz this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); - this.lblKreditor = new DevExpress.XtraReports.UI.XRTableCell(); - this.txtKreditor = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow(); - this.lblMittelbindung = new DevExpress.XtraReports.UI.XRTableCell(); - this.txtMittelbindung = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.txtMittelbindungsnr = new DevExpress.XtraReports.UI.XRTableCell(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); this.xrRichText4 = new DevExpress.XtraReports.UI.XRRichText(); this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo(); @@ -78,7 +78,7 @@ namespace LebenshilfeDuisburgAtz this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); - this.txtLeistung = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -174,19 +174,19 @@ namespace LebenshilfeDuisburgAtz // xrLabel8 // this.xrLabel8.Font = new System.Drawing.Font("Segoe UI", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 106.0816F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 115F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel8.SizeF = new System.Drawing.SizeF(120.125F, 17F); this.xrLabel8.StylePriority.UseFont = false; - this.xrLabel8.Text = "GP-Nr.:"; + this.xrLabel8.Text = "Aktenzeichen:"; // // lblAZ // this.lblAZ.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerReferenceNumber")}); this.lblAZ.Font = new System.Drawing.Font("Segoe UI", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblAZ.LocationFloat = new DevExpress.Utils.PointFloat(120.1251F, 106.0816F); + this.lblAZ.LocationFloat = new DevExpress.Utils.PointFloat(120.1251F, 115F); this.lblAZ.Multiline = true; this.lblAZ.Name = "lblAZ"; this.lblAZ.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -289,8 +289,7 @@ namespace LebenshilfeDuisburgAtz this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel2.SizeF = new System.Drawing.SizeF(235.755F, 81.08164F); this.xrLabel2.StylePriority.UseFont = false; - this.xrLabel2.Text = "[CustomerName]\r\ngeb. [CustomerBirthdate!dd.MM.yyyy]\r\n[CustomerStreet]\r\n[CustomerP" + - "ostalCode] [CustomerTown]"; + this.xrLabel2.Text = "[CustomerName]\r\n\r\n[CustomerStreet]\r\n[CustomerPostalCode] [CustomerTown]"; // // xrTable2 // @@ -308,7 +307,7 @@ namespace LebenshilfeDuisburgAtz // this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { this.xrTableCell11, - this.txtBelegnr}); + this.xrTableCell2}); this.xrTableRow2.Name = "xrTableRow2"; this.xrTableRow2.Weight = 0.139636369834711D; // @@ -326,15 +325,15 @@ namespace LebenshilfeDuisburgAtz this.xrTableCell11.Text = "Belegnummer"; this.xrTableCell11.Weight = 1.4596787374581406D; // - // txtBelegnr + // xrTableCell2 // - this.txtBelegnr.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); - this.txtBelegnr.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.txtBelegnr.Name = "txtBelegnr"; - this.txtBelegnr.StylePriority.UseBackColor = false; - this.txtBelegnr.StylePriority.UseBorders = false; - this.txtBelegnr.Text = "[InvoiceNumber]"; - this.txtBelegnr.Weight = 1.4596787374581406D; + this.xrTableCell2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); + this.xrTableCell2.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.StylePriority.UseBackColor = false; + this.xrTableCell2.StylePriority.UseBorders = false; + this.xrTableCell2.Text = "[InvoiceNumber]"; + this.xrTableCell2.Weight = 1.4596787374581406D; // // xrTableRow3 // @@ -401,56 +400,56 @@ namespace LebenshilfeDuisburgAtz // xrTableRow4 // this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.lblKreditor, - this.txtKreditor}); + this.xrTableCell13, + this.xrTableCell4}); this.xrTableRow4.Name = "xrTableRow4"; this.xrTableRow4.Weight = 0.13963636983471095D; // - // lblKreditor + // xrTableCell13 // - this.lblKreditor.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.lblKreditor.Font = new System.Drawing.Font("Segoe UI", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblKreditor.Name = "lblKreditor"; - this.lblKreditor.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); - this.lblKreditor.StylePriority.UseBorders = false; - this.lblKreditor.StylePriority.UseFont = false; - this.lblKreditor.StylePriority.UsePadding = false; - this.lblKreditor.Text = "Kreditorennummer"; - this.lblKreditor.Weight = 1.4596787374581406D; + this.xrTableCell13.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell13.Font = new System.Drawing.Font("Segoe UI", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell13.Name = "xrTableCell13"; + this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell13.StylePriority.UseBorders = false; + this.xrTableCell13.StylePriority.UseFont = false; + this.xrTableCell13.StylePriority.UsePadding = false; + this.xrTableCell13.Text = "Kreditorennummer"; + this.xrTableCell13.Weight = 1.4596787374581406D; // - // txtKreditor + // xrTableCell4 // - this.txtKreditor.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.txtKreditor.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell4.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "OrganisationDebitorNumber")}); - this.txtKreditor.Name = "txtKreditor"; - this.txtKreditor.StylePriority.UseBorders = false; - this.txtKreditor.Weight = 1.4596787374581406D; + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.StylePriority.UseBorders = false; + this.xrTableCell4.Weight = 1.4596787374581406D; // // xrTableRow5 // this.xrTableRow5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.lblMittelbindung, - this.txtMittelbindung}); + this.xrTableCell6, + this.txtMittelbindungsnr}); this.xrTableRow5.Name = "xrTableRow5"; this.xrTableRow5.StylePriority.UseBackColor = false; this.xrTableRow5.Weight = 0.13963636983471095D; // - // lblMittelbindung + // xrTableCell6 // - this.lblMittelbindung.Font = new System.Drawing.Font("Segoe UI", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblMittelbindung.Name = "lblMittelbindung"; - this.lblMittelbindung.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); - this.lblMittelbindung.StylePriority.UseFont = false; - this.lblMittelbindung.StylePriority.UsePadding = false; - this.lblMittelbindung.Text = "Mittelbindungsnummer"; - this.lblMittelbindung.Weight = 1.4596787374581406D; + this.xrTableCell6.Font = new System.Drawing.Font("Segoe UI", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell6.StylePriority.UseFont = false; + this.xrTableCell6.StylePriority.UsePadding = false; + this.xrTableCell6.Text = "Mittelbindungsnummer"; + this.xrTableCell6.Weight = 1.4596787374581406D; // - // txtMittelbindung + // txtMittelbindungsnr // - this.txtMittelbindung.Name = "txtMittelbindung"; - this.txtMittelbindung.Weight = 1.4596787374581406D; + this.txtMittelbindungsnr.Name = "txtMittelbindungsnr"; + this.txtMittelbindungsnr.Weight = 1.4596787374581406D; // // ReportFooter // @@ -532,7 +531,7 @@ namespace LebenshilfeDuisburgAtz // this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { this.xrTableCell12, - this.txtLeistung, + this.xrTableCell15, this.xrTableCell17, this.xrTableCell19, this.xrTableCell20}); @@ -547,19 +546,19 @@ namespace LebenshilfeDuisburgAtz this.xrTableCell12.Text = "xrTableCell43"; this.xrTableCell12.Weight = 0.12307692307692306D; // - // txtLeistung + // xrTableCell15 // - this.txtLeistung.CanShrink = true; - this.txtLeistung.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell15.CanShrink = true; + this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.ServiceDescription")}); - this.txtLeistung.Multiline = true; - this.txtLeistung.Name = "txtLeistung"; - this.txtLeistung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.txtLeistung.StylePriority.UseBorderColor = false; - this.txtLeistung.StylePriority.UseBorders = false; - this.txtLeistung.StylePriority.UseFont = false; - this.txtLeistung.StylePriority.UsePadding = false; - this.txtLeistung.Weight = 0.4307691838191105D; + this.xrTableCell15.Multiline = true; + this.xrTableCell15.Name = "xrTableCell15"; + this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell15.StylePriority.UseBorderColor = false; + this.xrTableCell15.StylePriority.UseBorders = false; + this.xrTableCell15.StylePriority.UseFont = false; + this.xrTableCell15.StylePriority.UsePadding = false; + this.xrTableCell15.Weight = 0.4307691838191105D; // // xrTableCell17 // @@ -706,13 +705,13 @@ namespace LebenshilfeDuisburgAtz private DevExpress.XtraReports.UI.XRTable xrTable2; private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; - private DevExpress.XtraReports.UI.XRTableCell txtBelegnr; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; private DevExpress.XtraReports.UI.XRTableRow xrTableRow4; - private DevExpress.XtraReports.UI.XRTableCell lblKreditor; - private DevExpress.XtraReports.UI.XRTableCell txtKreditor; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; private DevExpress.XtraReports.UI.XRLabel xrLabel5; private DevExpress.XtraReports.UI.XRLabel xrLabel2; private DevExpress.XtraReports.UI.XRTable xrTable3; @@ -734,7 +733,7 @@ namespace LebenshilfeDuisburgAtz private DevExpress.XtraReports.UI.XRTable xrTable4; private DevExpress.XtraReports.UI.XRTableRow xrTableRow10; private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; - private DevExpress.XtraReports.UI.XRTableCell txtLeistung; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; private DevExpress.XtraReports.UI.XRTableCell xrTableCell17; private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; @@ -749,7 +748,7 @@ namespace LebenshilfeDuisburgAtz private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1; private DevExpress.XtraReports.UI.XRRichText xrRichText4; private DevExpress.XtraReports.UI.XRTableRow xrTableRow5; - private DevExpress.XtraReports.UI.XRTableCell lblMittelbindung; - private DevExpress.XtraReports.UI.XRTableCell txtMittelbindung; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; + private DevExpress.XtraReports.UI.XRTableCell txtMittelbindungsnr; } } diff --git a/ReportImp/LebenshilfeDuisburgAtz/RechnungAtz.cs b/ReportImp/LebenshilfeDuisburgAtz/RechnungAtz.cs index eedd44868..fabd016e1 100644 --- a/ReportImp/LebenshilfeDuisburgAtz/RechnungAtz.cs +++ b/ReportImp/LebenshilfeDuisburgAtz/RechnungAtz.cs @@ -41,7 +41,7 @@ namespace LebenshilfeDuisburgAtz lblAdresse.Text = sb.ToString(); pRO.Notice = ""; - //pRO.CustomerReferenceNumber = pRO.CustomerReferenceNumber.Replace("Az.:", "GP:"); + lblAZ.Text = pRO.CustomerReferenceNumber; if (pRO.InvoiceDateTime.HasValue) pRO.Notice = String.Format("{0:dd.MM.yyyy}", pRO.InvoiceDateTime.Value.AddDays(30)); @@ -120,19 +120,9 @@ namespace LebenshilfeDuisburgAtz } } - if (!pRO.RecipientOrganisation.Contains("LVR")) - { - txtMittelbindung.Text = mnr; - } - else - { - txtMittelbindung.Text = pRO.InvoiceNumber.Replace("-IFF", "-FF:"); - //txtLeistung.Text = pRO.Ser - lblKreditor.Visible = false; - lblMittelbindung.Visible = false; - txtKreditor.Visible = false; - txtMittelbindung.Visible = false; - } + + txtMittelbindungsnr.Text = mnr; + } } } \ No newline at end of file