BetreuwoWesel: GP-Nummer nür für LVR

This commit is contained in:
2024-08-30 10:57:38 +02:00
parent 1414b9be61
commit a369cd9a6d
6 changed files with 77 additions and 69 deletions

View File

@@ -32,6 +32,7 @@ namespace BetreuWoWesel
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RechnungFud));
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.lblGpNummer = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.lblGebAz = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
@@ -85,7 +86,6 @@ namespace BetreuWoWesel
this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText5)).BeginInit();
@@ -105,7 +105,7 @@ namespace BetreuWoWesel
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel4,
this.lblGpNummer,
this.xrLabel7,
this.lblGebAz,
this.xrLabel1,
@@ -121,6 +121,21 @@ namespace BetreuWoWesel
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
// lblGpNummer
//
this.lblGpNummer.BackColor = System.Drawing.Color.Transparent;
this.lblGpNummer.CanShrink = true;
this.lblGpNummer.LocationFloat = new DevExpress.Utils.PointFloat(419.795F, 365.2083F);
this.lblGpNummer.Name = "lblGpNummer";
this.lblGpNummer.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblGpNummer.SizeF = new System.Drawing.SizeF(255.2083F, 20F);
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;
//
// xrLabel7
//
this.xrLabel7.BackColor = System.Drawing.Color.Transparent;
@@ -727,21 +742,6 @@ namespace BetreuWoWesel
"egebene Konto. Vielen Dank für Ihr Vertrauen";
this.xrLabel22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel4
//
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(419.795F, 365.2083F);
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(255.2083F, 20F);
this.xrLabel4.StylePriority.UseBackColor = false;
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.StylePriority.UseTextAlignment = false;
this.xrLabel4.Text = "Geschäftsnummer: 2000256442";
this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrLabel4.WordWrap = false;
//
// RechnungFud
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -828,6 +828,6 @@ namespace BetreuWoWesel
private DevExpress.XtraReports.UI.XRLabel xrLabel22;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
private DevExpress.XtraReports.UI.XRRichText xrRichText5;
private DevExpress.XtraReports.UI.XRLabel xrLabel4;
private DevExpress.XtraReports.UI.XRLabel lblGpNummer;
}
}

View File

@@ -1,9 +1,6 @@
using System;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared;
using BS.Shared.Core;
using DevExpress.XtraReports.UI;
@@ -28,19 +25,19 @@ namespace BetreuWoWesel
pRO.RecipientOrganisation = pRO.RecipientOrganisation.Replace(" ALS", "").Trim();
lblGebAz.Text = lblGebAz.Text.Replace("Vers.-Nr.:", "AZ:");
}
if (!pRO.RecipientOrganisation.ToLower().Contains("lvr"))
{
lblGpNummer.Visible = false;
}
}
if (!String.IsNullOrEmpty(pRO.CustomerSalutation) && pRO.CustomerSalutation.ToLower() == "herr")
}
if (!String.IsNullOrEmpty(pRO.CustomerSalutation) && pRO.CustomerSalutation.ToLower() == "herr")
pRO.CustomerSalutation = "Herrn";
this.bindingSource1.DataSource = pRO;
}
}
}

View File

@@ -34,6 +34,7 @@ namespace BetreuWoWesel.Alt
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.lblGpNummer = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
@@ -104,7 +105,6 @@ namespace BetreuWoWesel.Alt
this.xrRichText5 = new DevExpress.XtraReports.UI.XRRichText();
this.xrRichText4 = new DevExpress.XtraReports.UI.XRRichText();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -125,7 +125,7 @@ namespace BetreuWoWesel.Alt
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel1,
this.lblGpNummer,
this.xrLabel8,
this.xrRichText1,
this.xrLabel9,
@@ -141,6 +141,23 @@ namespace BetreuWoWesel.Alt
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
// lblGpNummer
//
this.lblGpNummer.BackColor = System.Drawing.Color.Transparent;
this.lblGpNummer.CanShrink = true;
this.lblGpNummer.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.lblGpNummer.LocationFloat = new DevExpress.Utils.PointFloat(460.42F, 289.9167F);
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, 17F);
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;
//
// xrLabel8
//
this.xrLabel8.CanShrink = true;
@@ -893,23 +910,6 @@ namespace BetreuWoWesel.Alt
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(139.1942F, 65.97227F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrLabel1
//
this.xrLabel1.BackColor = System.Drawing.Color.Transparent;
this.xrLabel1.CanShrink = true;
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(460.42F, 289.9167F);
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(214.5836F, 17F);
this.xrLabel1.StylePriority.UseBackColor = false;
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.StylePriority.UseTextAlignment = false;
this.xrLabel1.Text = "Geschäftsnummer: 2000256442";
this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrLabel1.WordWrap = false;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
@@ -1021,6 +1021,6 @@ namespace BetreuWoWesel.Alt
private DevExpress.XtraReports.UI.XRRichText xrRichText4;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
private DevExpress.XtraReports.UI.XRRichText xrRichText5;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.XRLabel lblGpNummer;
}
}

View File

@@ -13,6 +13,12 @@ namespace BetreuWoWesel.Alt
public void SetReportDataSource(SettlementRO pRO)
{
string orga = pRO.RecipientOrganisation;
if (pRO.RecipientOrganisation != null && !pRO.RecipientOrganisation.ToLower().Contains("lvr"))
{
lblGpNummer.Visible = false;
}
if (!String.IsNullOrEmpty(pRO.CustomerBirthdayString))
{
xrLabel3.Text += ", geb. " + pRO.CustomerBirthdayString;

View File

@@ -71,6 +71,7 @@ namespace BetreuWoWesel
this.xrRichText4 = new DevExpress.XtraReports.UI.XRRichText();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.lblGpNummer = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -121,7 +122,6 @@ namespace BetreuWoWesel
this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit();
@@ -502,7 +502,7 @@ namespace BetreuWoWesel
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel7,
this.lblGpNummer,
this.xrTable1,
this.xrRichText1,
this.xrLabel9,
@@ -522,6 +522,23 @@ namespace BetreuWoWesel
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
// lblGpNummer
//
this.lblGpNummer.BackColor = System.Drawing.Color.Transparent;
this.lblGpNummer.CanShrink = true;
this.lblGpNummer.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.lblGpNummer.LocationFloat = new DevExpress.Utils.PointFloat(460.42F, 268.5F);
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, 17F);
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;
//
// xrTable1
//
this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight;
@@ -1078,23 +1095,6 @@ namespace BetreuWoWesel
this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell60.Weight = 0.2553230872521034D;
//
// xrLabel7
//
this.xrLabel7.BackColor = System.Drawing.Color.Transparent;
this.xrLabel7.CanShrink = true;
this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(460.42F, 268.5F);
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(214.5836F, 17F);
this.xrLabel7.StylePriority.UseBackColor = false;
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.StylePriority.UseTextAlignment = false;
this.xrLabel7.Text = "Geschäftsnummer: 2000256442";
this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrLabel7.WordWrap = false;
//
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1220,6 +1220,6 @@ namespace BetreuWoWesel
private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow24;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell31;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRLabel lblGpNummer;
}
}

View File

@@ -15,6 +15,11 @@ namespace BetreuWoWesel
public void SetReportDataSource(Settlement2RO pRO)
{
if (pRO.RecipientOrganisation != null && !pRO.RecipientOrganisation.ToLower().Contains("lvr"))
{
lblGpNummer.Visible = false;
}
if (pRO.CustomerBirthday != null)
{
xrLabel3.Text += String.Format(", geb. {0:dd.MM.yyyy}", pRO.CustomerBirthday);