BetreuwoWesel: GP-Nummer auf Sammelrechnung & Co (nur für LVR)

This commit is contained in:
2024-09-04 14:48:23 +02:00
parent 746ea7dea0
commit 2f06c1bc98
6 changed files with 94 additions and 2927 deletions

View File

@@ -74,6 +74,7 @@ namespace BetreuWoWesel
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.lblGpNummer = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
@@ -205,6 +206,7 @@ namespace BetreuWoWesel
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.lblGpNummer,
this.xrLabel11,
this.xrPageInfo1,
this.xrLabel9,
@@ -398,7 +400,7 @@ namespace BetreuWoWesel
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 320F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 20F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(675.003F, 20F);
this.xrLabel3.StylePriority.UseBackColor = false;
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.Text = "Abrechnung für [RecipientFirstName] [RecipientLastName]";
@@ -412,7 +414,7 @@ namespace BetreuWoWesel
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 300F);
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.SizeF = new System.Drawing.SizeF(460.4196F, 20F);
this.xrLabel2.StylePriority.UseBackColor = false;
this.xrLabel2.StylePriority.UseFont = false;
this.xrLabel2.Text = "Rechnung Nr. [InvoiceNumber]";
@@ -569,6 +571,23 @@ namespace BetreuWoWesel
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.InvoiceCustomerRO);
//
// lblGpNummer
//
this.lblGpNummer.BackColor = System.Drawing.Color.Transparent;
this.lblGpNummer.CanShrink = true;
this.lblGpNummer.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
this.lblGpNummer.LocationFloat = new DevExpress.Utils.PointFloat(460.4195F, 300F);
this.lblGpNummer.Multiline = true;
this.lblGpNummer.Name = "lblGpNummer";
this.lblGpNummer.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblGpNummer.SizeF = new System.Drawing.SizeF(214.5836F, 19.99997F);
this.lblGpNummer.StylePriority.UseBackColor = false;
this.lblGpNummer.StylePriority.UseFont = false;
this.lblGpNummer.StylePriority.UseTextAlignment = false;
this.lblGpNummer.Text = "Geschäftsnummer: 2000256442";
this.lblGpNummer.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.lblGpNummer.WordWrap = false;
//
// InvoiceCustomerReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -643,6 +662,7 @@ namespace BetreuWoWesel
private DevExpress.XtraReports.UI.XRLabel xrLabel22;
private DevExpress.XtraReports.UI.XRRichText xrRichText4;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
private DevExpress.XtraReports.UI.XRRichText xrRichText5;
private DevExpress.XtraReports.UI.XRRichText xrRichText5;
private DevExpress.XtraReports.UI.XRLabel lblGpNummer;
}
}

View File

@@ -1,8 +1,3 @@
using System;
using System.Drawing;
using System.Collections;
using System.ComponentModel;
using DevExpress.XtraReports.UI;
using BeWo.Report.ReportObjects;
using BeWo.Report;
@@ -17,6 +12,11 @@ namespace BetreuWoWesel
public void SetReportDataSource(InvoiceCustomerRO pRO)
{
if (pRO.RecipientOrganisation != null && !pRO.RecipientOrganisation.ToLower().Contains("lvr"))
{
lblGpNummer.Visible = false;
}
this.bindingSource1.DataSource = pRO;
}
}

View File

@@ -50,7 +50,6 @@ namespace BetreuWoWesel
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText();
this.xrLabel24 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel25 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel();
@@ -62,6 +61,7 @@ namespace BetreuWoWesel
this.lblAbrechnungstext = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.lblGpNummer = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText5)).BeginInit();
@@ -115,7 +115,7 @@ namespace BetreuWoWesel
//
// xrRichText1
//
this.xrRichText1.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 57.29167F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
@@ -124,7 +124,7 @@ namespace BetreuWoWesel
//
// 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(415.9991F, 0F);
this.xrRichText2.Name = "xrRichText2";
this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
@@ -179,7 +179,7 @@ namespace BetreuWoWesel
//
// xrPictureBox2
//
this.xrPictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox2.Image")));
this.xrPictureBox2.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox2.ImageSource"));
this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(415.9991F, 16.66659F);
this.xrPictureBox2.Name = "xrPictureBox2";
this.xrPictureBox2.SizeF = new System.Drawing.SizeF(261.0005F, 116.6667F);
@@ -196,7 +196,7 @@ namespace BetreuWoWesel
//
// xrRichText5
//
this.xrRichText5.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText5.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrRichText5.LocationFloat = new DevExpress.Utils.PointFloat(440.6252F, 0F);
this.xrRichText5.Name = "xrRichText5";
this.xrRichText5.SerializableRtfString = resources.GetString("xrRichText5.SerializableRtfString");
@@ -205,7 +205,7 @@ namespace BetreuWoWesel
//
// xrRichText4
//
this.xrRichText4.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText4.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrRichText4.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 0F);
this.xrRichText4.Name = "xrRichText4";
this.xrRichText4.SerializableRtfString = resources.GetString("xrRichText4.SerializableRtfString");
@@ -214,7 +214,7 @@ namespace BetreuWoWesel
//
// xrPictureBox1
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(290.3758F, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(139.1942F, 65.97227F);
@@ -226,7 +226,7 @@ namespace BetreuWoWesel
this.xrLabel3,
this.xrLabel2,
this.xrRichText3,
this.xrLabel24,
this.lblGpNummer,
this.xrLabel25,
this.xrLabel26,
this.xrLabel21,
@@ -237,7 +237,8 @@ namespace BetreuWoWesel
this.xrLabel18,
this.lblAbrechnungstext,
this.xrLabel1});
this.Page1.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Page1.Font = new DevExpress.Drawing.DXFont("Calibri", 12F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.Page1.HeightF = 641.184F;
this.Page1.Name = "Page1";
this.Page1.StylePriority.UseFont = false;
@@ -245,7 +246,8 @@ namespace BetreuWoWesel
// xrLabel3
//
this.xrLabel3.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel3.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(404.5835F, 609.6007F);
this.xrLabel3.Multiline = true;
this.xrLabel3.Name = "xrLabel3";
@@ -257,7 +259,8 @@ namespace BetreuWoWesel
//
// xrLabel2
//
this.xrLabel2.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Calibri", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 362.2587F);
this.xrLabel2.Multiline = true;
this.xrLabel2.Name = "xrLabel2";
@@ -269,34 +272,23 @@ namespace BetreuWoWesel
//
// xrRichText3
//
this.xrRichText3.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText3.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 177.7101F);
this.xrRichText3.Name = "xrRichText3";
this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString");
this.xrRichText3.SizeF = new System.Drawing.SizeF(680.971F, 118.0556F);
this.xrRichText3.StylePriority.UseFont = false;
//
// xrLabel24
//
this.xrLabel24.CanShrink = true;
this.xrLabel24.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(558.3738F, 0F);
this.xrLabel24.Name = "xrLabel24";
this.xrLabel24.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel24.SizeF = new System.Drawing.SizeF(142.3747F, 17F);
this.xrLabel24.StylePriority.UseFont = false;
this.xrLabel24.StylePriority.UsePadding = false;
//
// xrLabel25
//
this.xrLabel25.CanShrink = true;
this.xrLabel25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDateTime", "{0:dd. MMMM yyyy}")});
this.xrLabel25.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(558.3738F, 17.00001F);
this.xrLabel25.Font = new DevExpress.Drawing.DXFont("Calibri", 11F);
this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(558.3738F, 19.00001F);
this.xrLabel25.Name = "xrLabel25";
this.xrLabel25.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel25.SizeF = new System.Drawing.SizeF(142.3747F, 17F);
this.xrLabel25.SizeF = new System.Drawing.SizeF(142.37F, 19F);
this.xrLabel25.StylePriority.UseFont = false;
this.xrLabel25.StylePriority.UsePadding = false;
//
@@ -305,11 +297,11 @@ namespace BetreuWoWesel
this.xrLabel26.CanShrink = true;
this.xrLabel26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceNumber")});
this.xrLabel26.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(558.3738F, 34.00002F);
this.xrLabel26.Font = new DevExpress.Drawing.DXFont("Calibri", 11F);
this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(558.3738F, 38.00002F);
this.xrLabel26.Name = "xrLabel26";
this.xrLabel26.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel26.SizeF = new System.Drawing.SizeF(142.3747F, 17F);
this.xrLabel26.SizeF = new System.Drawing.SizeF(142.37F, 19F);
this.xrLabel26.StylePriority.UseFont = false;
this.xrLabel26.StylePriority.UsePadding = false;
this.xrLabel26.Text = "Rechnungsnummer:";
@@ -317,23 +309,23 @@ namespace BetreuWoWesel
// xrLabel21
//
this.xrLabel21.CanShrink = true;
this.xrLabel21.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel21.Font = new DevExpress.Drawing.DXFont("Calibri", 11F);
this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(415.9991F, 0F);
this.xrLabel21.Name = "xrLabel21";
this.xrLabel21.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel21.SizeF = new System.Drawing.SizeF(142.3747F, 17F);
this.xrLabel21.SizeF = new System.Drawing.SizeF(142.37F, 19F);
this.xrLabel21.StylePriority.UseFont = false;
this.xrLabel21.StylePriority.UsePadding = false;
this.xrLabel21.Text = "Kundennummer:";
this.xrLabel21.Text = "Geschäftsnummer:";
//
// xrLabel22
//
this.xrLabel22.CanShrink = true;
this.xrLabel22.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(415.9991F, 17.00001F);
this.xrLabel22.Font = new DevExpress.Drawing.DXFont("Calibri", 11F);
this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(415.9991F, 19.00001F);
this.xrLabel22.Name = "xrLabel22";
this.xrLabel22.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel22.SizeF = new System.Drawing.SizeF(142.3747F, 17F);
this.xrLabel22.SizeF = new System.Drawing.SizeF(142.37F, 19F);
this.xrLabel22.StylePriority.UseFont = false;
this.xrLabel22.StylePriority.UsePadding = false;
this.xrLabel22.Text = "Datum:";
@@ -341,11 +333,11 @@ namespace BetreuWoWesel
// xrLabel23
//
this.xrLabel23.CanShrink = true;
this.xrLabel23.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(415.9991F, 34.00002F);
this.xrLabel23.Font = new DevExpress.Drawing.DXFont("Calibri", 11F);
this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(415.9991F, 38.00002F);
this.xrLabel23.Name = "xrLabel23";
this.xrLabel23.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel23.SizeF = new System.Drawing.SizeF(142.3747F, 17F);
this.xrLabel23.SizeF = new System.Drawing.SizeF(142.37F, 19F);
this.xrLabel23.StylePriority.UseFont = false;
this.xrLabel23.StylePriority.UsePadding = false;
this.xrLabel23.Text = "Rechnungsnummer:";
@@ -353,7 +345,8 @@ namespace BetreuWoWesel
// xrLabel10
//
this.xrLabel10.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel10.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 609.6007F);
this.xrLabel10.Multiline = true;
this.xrLabel10.Name = "xrLabel10";
@@ -407,8 +400,9 @@ namespace BetreuWoWesel
//
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, 72.70832F);
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Calibri", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 83.70832F);
this.xrLabel1.Multiline = true;
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -421,6 +415,18 @@ namespace BetreuWoWesel
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// lblGpNummer
//
this.lblGpNummer.CanShrink = true;
this.lblGpNummer.Font = new DevExpress.Drawing.DXFont("Calibri", 11F);
this.lblGpNummer.LocationFloat = new DevExpress.Utils.PointFloat(558.3738F, 0F);
this.lblGpNummer.Name = "lblGpNummer";
this.lblGpNummer.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.lblGpNummer.SizeF = new System.Drawing.SizeF(142.37F, 19F);
this.lblGpNummer.StylePriority.UseFont = false;
this.lblGpNummer.StylePriority.UsePadding = false;
this.lblGpNummer.Text = "2000256442";
//
// ServiceInvoiceReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -431,14 +437,15 @@ namespace BetreuWoWesel
this.Page1});
this.DataSource = this.bindingSource1;
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
this.Margins = new System.Drawing.Printing.Margins(80, 40, 133, 97);
this.Margins = new DevExpress.Drawing.DXMargins(80F, 40F, 133.3333F, 97.22223F);
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.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText5)).EndInit();
@@ -470,7 +477,6 @@ namespace BetreuWoWesel
private DevExpress.XtraReports.UI.XRRichText xrRichText2;
private DevExpress.XtraReports.UI.XRLabel xrLabel19;
private DevExpress.XtraReports.UI.XRLabel xrLabel20;
private DevExpress.XtraReports.UI.XRLabel xrLabel24;
private DevExpress.XtraReports.UI.XRLabel xrLabel25;
private DevExpress.XtraReports.UI.XRLabel xrLabel26;
private DevExpress.XtraReports.UI.XRLabel xrLabel21;
@@ -481,6 +487,7 @@ namespace BetreuWoWesel
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
private DevExpress.XtraReports.UI.XRRichText xrRichText4;
private DevExpress.XtraReports.UI.XRRichText xrRichText5;
private DevExpress.XtraReports.UI.XRRichText xrRichText5;
private DevExpress.XtraReports.UI.XRLabel lblGpNummer;
}
}

View File

@@ -31,10 +31,15 @@ namespace BetreuWoWesel
//}
if (!String.IsNullOrWhiteSpace(pRO.RecipientOrganisation))
{
pRO.RecipientOrganisation = pRO.RecipientOrganisation.Replace(" HD", "").Trim();
}
decimal hourlyRate = 0;
pRO.RecipientOrganisation = pRO.RecipientOrganisation.Replace(" HD", "").Trim();
if (!pRO.RecipientOrganisation.ToLower().Contains("lvr"))
{
lblGpNummer.Visible = false;
}
}
decimal hourlyRate = 0;
decimal rateFactor = 1;
decimal hours = 0;
if (pRO.ServiceInvoicePeriods != null && pRO.ServiceInvoicePeriods.Count > 0)

File diff suppressed because one or more lines are too long

View File

@@ -13,7 +13,6 @@ namespace BetreuWoWesel.Alt
public void SetReportDataSource(SettlementRO pRO)
{
string orga = pRO.RecipientOrganisation;
if (pRO.RecipientOrganisation != null && !pRO.RecipientOrganisation.ToLower().Contains("lvr"))
{
lblGpNummer.Visible = false;