FaerberReports: Zusatz Inhaber/Geschäftsführung ergänzt (nur für Rechnungsersteller Herrn Nellessen)

This commit is contained in:
2024-08-14 14:12:10 +02:00
parent 886022cabe
commit b60e1af29c
6 changed files with 100 additions and 92 deletions

View File

@@ -83,11 +83,11 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.lblCreatorDivision = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
@@ -714,7 +714,7 @@ namespace BeWo.Report.DefaultReports
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel6,
this.lblCreatorDivision,
this.xrLabel10,
this.xrLabel12,
this.xrLabel1,
@@ -723,6 +723,18 @@ namespace BeWo.Report.DefaultReports
this.GroupFooter1.HeightF = 242.2499F;
this.GroupFooter1.Name = "GroupFooter1";
//
// lblCreatorDivision
//
this.lblCreatorDivision.CanShrink = true;
this.lblCreatorDivision.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CreatorDivision")});
this.lblCreatorDivision.Font = new DevExpress.Drawing.DXFont("Verdana", 8F);
this.lblCreatorDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 225.2499F);
this.lblCreatorDivision.Name = "lblCreatorDivision";
this.lblCreatorDivision.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblCreatorDivision.SizeF = new System.Drawing.SizeF(225F, 17F);
this.lblCreatorDivision.StylePriority.UseFont = false;
//
// xrLabel10
//
this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
@@ -765,19 +777,6 @@ namespace BeWo.Report.DefaultReports
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// xrLabel6
//
this.xrLabel6.CanShrink = true;
this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CreatorDivision")});
this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Verdana", 8F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 225.2499F);
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(225F, 17F);
this.xrLabel6.StylePriority.UseFont = false;
this.xrLabel6.Text = "Daniel Schmid";
//
// ServiceInvoiceReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -865,6 +864,6 @@ namespace BeWo.Report.DefaultReports
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.XRLabel xrLabel12;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.XRLabel lblCreatorDivision;
}
}

View File

@@ -25,6 +25,11 @@ namespace BeWo.Report.DefaultReports
lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Zeitraum {0:MMMM yyyy} - {1:MMMM yyyy} folgende erbrachte Tätigkeiten:", start, end);
}
if(pRO.CreatorName != null && pRO.CreatorName.ToLower().Contains("sebastian nellessen") && String.IsNullOrEmpty(pRO.CreatorDivision))
{
pRO.CreatorDivision = "Inhaber/Geschäftsleitung";
}
this.bindingSource1.DataSource = pRO;
}
}

View File

@@ -33,6 +33,7 @@ namespace BeWo.FaerberReport
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.xrLabel9 = 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();
@@ -60,6 +61,7 @@ namespace BeWo.FaerberReport
this.xrLabel_RecipientContactPerson = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.lblCreatorDivision = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -102,8 +104,6 @@ namespace BeWo.FaerberReport
this.xrTableRow28 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
@@ -139,6 +139,22 @@ namespace BeWo.FaerberReport
this.ReportHeader.HeightF = 493.3333F;
this.ReportHeader.Name = "ReportHeader";
//
// xrLabel9
//
this.xrLabel9.BackColor = System.Drawing.Color.Transparent;
this.xrLabel9.CanShrink = true;
this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 334F);
this.xrLabel9.Multiline = true;
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(650F, 17F);
this.xrLabel9.StylePriority.UseBackColor = false;
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.Text = "GP-Nr. Anbieter: 2000086865-01";
this.xrLabel9.WordWrap = false;
//
// xrTable1
//
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 425.3333F);
@@ -449,7 +465,7 @@ namespace BeWo.FaerberReport
// ReportFooter
//
this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel8,
this.lblCreatorDivision,
this.xrTable3,
this.xrLabel12,
this.xrLabel10,
@@ -458,6 +474,16 @@ namespace BeWo.FaerberReport
this.ReportFooter.KeepTogether = true;
this.ReportFooter.Name = "ReportFooter";
//
// lblCreatorDivision
//
this.lblCreatorDivision.CanShrink = true;
this.lblCreatorDivision.Font = new DevExpress.Drawing.DXFont("Verdana", 8F);
this.lblCreatorDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 175.125F);
this.lblCreatorDivision.Name = "lblCreatorDivision";
this.lblCreatorDivision.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblCreatorDivision.SizeF = new System.Drawing.SizeF(225F, 17F);
this.lblCreatorDivision.StylePriority.UseFont = false;
//
// xrTable3
//
this.xrTable3.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
@@ -888,35 +914,6 @@ namespace BeWo.FaerberReport
this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell42.Weight = 0.33384615384615385D;
//
// xrLabel9
//
this.xrLabel9.BackColor = System.Drawing.Color.Transparent;
this.xrLabel9.CanShrink = true;
this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 334F);
this.xrLabel9.Multiline = true;
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(650F, 17F);
this.xrLabel9.StylePriority.UseBackColor = false;
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.Text = "GP-Nr. Anbieter: 2000086865-01";
this.xrLabel9.WordWrap = false;
//
// xrLabel8
//
this.xrLabel8.CanShrink = true;
this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CreatorDivision")});
this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Verdana", 8F);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 175.125F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(225F, 17F);
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.Text = "Daniel Schmid";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
@@ -1026,6 +1023,6 @@ namespace BeWo.FaerberReport
private DevExpress.XtraReports.UI.XRTableCell xrTableCell51;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell52;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.XRLabel lblCreatorDivision;
}
}

View File

@@ -15,7 +15,12 @@ namespace BeWo.FaerberReport
public void SetReportDataSource(SettlementRO pRO)
{
if (pRO.ClaimWithEigenbeteiligung > 0)
if (pRO.CreatorName != null && pRO.CreatorName.ToLower().Contains("sebastian nellessen"))
{
lblCreatorDivision.Text = "Inhaber/Geschäftsleitung";
}
if (pRO.ClaimWithEigenbeteiligung > 0)
{
pRO.FinalSentence = "Bitte überweisen Sie unsere Forderung nach Prüfung der Schlussabrechnung auf folgendes Konto: IBAN DE57 3706 2600 3110 2420 25 BIC GENODED1PAF (VR Bank Berg. Gladbach)";
}

View File

@@ -33,6 +33,7 @@ namespace BeWo.FaerberReport.Neu
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.xrLabel9 = 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();
@@ -60,6 +61,7 @@ namespace BeWo.FaerberReport.Neu
this.xrLabel_RecipientContactPerson = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.lblCreatorDivision = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -82,6 +84,7 @@ namespace BeWo.FaerberReport.Neu
this.xrTableRow34 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell52 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow22 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -102,15 +105,12 @@ namespace BeWo.FaerberReport.Neu
this.xrTableRow28 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -139,6 +139,22 @@ namespace BeWo.FaerberReport.Neu
this.ReportHeader.HeightF = 493.5833F;
this.ReportHeader.Name = "ReportHeader";
//
// xrLabel9
//
this.xrLabel9.BackColor = System.Drawing.Color.Transparent;
this.xrLabel9.CanShrink = true;
this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 334F);
this.xrLabel9.Multiline = true;
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(650F, 17F);
this.xrLabel9.StylePriority.UseBackColor = false;
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.Text = "GP-Nr. Anbieter: 2000086865-01";
this.xrLabel9.WordWrap = false;
//
// xrTable1
//
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 425.5833F);
@@ -449,7 +465,7 @@ namespace BeWo.FaerberReport.Neu
// ReportFooter
//
this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel11,
this.lblCreatorDivision,
this.xrTable3,
this.xrLabel12,
this.xrLabel10,
@@ -458,6 +474,16 @@ namespace BeWo.FaerberReport.Neu
this.ReportFooter.KeepTogether = true;
this.ReportFooter.Name = "ReportFooter";
//
// lblCreatorDivision
//
this.lblCreatorDivision.CanShrink = true;
this.lblCreatorDivision.Font = new DevExpress.Drawing.DXFont("Verdana", 8F);
this.lblCreatorDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 173.2083F);
this.lblCreatorDivision.Name = "lblCreatorDivision";
this.lblCreatorDivision.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblCreatorDivision.SizeF = new System.Drawing.SizeF(225F, 17F);
this.lblCreatorDivision.StylePriority.UseFont = false;
//
// xrTable3
//
this.xrTable3.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
@@ -657,6 +683,10 @@ namespace BeWo.FaerberReport.Neu
this.xrTableCell52.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell52.Weight = 0.33384615384615385D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -886,39 +916,6 @@ namespace BeWo.FaerberReport.Neu
this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell42.Weight = 0.33384615384615385D;
//
// xrLabel9
//
this.xrLabel9.BackColor = System.Drawing.Color.Transparent;
this.xrLabel9.CanShrink = true;
this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 334F);
this.xrLabel9.Multiline = true;
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(650F, 17F);
this.xrLabel9.StylePriority.UseBackColor = false;
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.Text = "GP-Nr. Anbieter: 2000086865-01";
this.xrLabel9.WordWrap = false;
//
// xrLabel11
//
this.xrLabel11.CanShrink = true;
this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CreatorDivision")});
this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Verdana", 8F);
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 173.2083F);
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(225F, 17F);
this.xrLabel11.StylePriority.UseFont = false;
this.xrLabel11.Text = "Daniel Schmid";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
//
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -943,8 +940,8 @@ namespace BeWo.FaerberReport.Neu
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -1024,6 +1021,6 @@ namespace BeWo.FaerberReport.Neu
private DevExpress.XtraReports.UI.XRTableCell xrTableCell51;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell52;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
private DevExpress.XtraReports.UI.XRLabel lblCreatorDivision;
}
}

View File

@@ -12,8 +12,13 @@ namespace BeWo.FaerberReport.Neu
}
public void SetReportDataSource(Settlement2RO pRO)
{
if (pRO.Claim > 0)
{
if (pRO.CreatorName != null && pRO.CreatorName.ToLower().Contains("sebastian nellessen"))
{
lblCreatorDivision.Text = "Inhaber/Geschäftsleitung";
}
if (pRO.Claim > 0)
{
pRO.FinalSentence = "Bitte überweisen Sie unsere Forderung nach Prüfung der Schlussabrechnung auf folgendes Konto: IBAN DE57 3706 2600 3110 2420 25 BIC GENODED1PAF (VR Bank Berg. Gladbach)";
}