MH: Kette AssL Rechnung erweiterung

This commit is contained in:
2026-01-29 15:18:44 +01:00
parent 48bc49d969
commit 543ee0d393
2 changed files with 63 additions and 23 deletions

View File

@@ -57,7 +57,7 @@ namespace KetteReports
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
this.lblCreatorKierspel = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
@@ -82,10 +82,12 @@ namespace KetteReports
this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.lblUnterschrift = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.lblUnterschrift = new DevExpress.XtraReports.UI.XRPictureBox();
this.lblGP = new DevExpress.XtraReports.UI.XRLabel();
this.lblCreatorNichtKierspel = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.lblAbsenderJA)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.lblAbsender)).BeginInit();
@@ -160,6 +162,7 @@ namespace KetteReports
// Page1
//
this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.lblGP,
this.lblAdresszeileJA,
this.lblAbsenderJA,
this.lblKundennr,
@@ -171,7 +174,7 @@ namespace KetteReports
this.xrLabel2,
this.xrLabel5,
this.lblAbrechnungszeitraum});
this.Page1.HeightF = 400.4375F;
this.Page1.HeightF = 394.6042F;
this.Page1.Name = "Page1";
this.Page1.StylePriority.UseFont = false;
//
@@ -296,7 +299,7 @@ namespace KetteReports
//
// xrLabel5
//
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 343.8541F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 338.0209F);
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F);
@@ -305,7 +308,7 @@ namespace KetteReports
//
// lblAbrechnungszeitraum
//
this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 368.8541F);
this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 363.0209F);
this.lblAbrechnungszeitraum.Multiline = true;
this.lblAbrechnungszeitraum.Name = "lblAbrechnungszeitraum";
this.lblAbrechnungszeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -362,16 +365,17 @@ namespace KetteReports
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Weight = 3D;
//
// xrLabel14
// lblCreatorKierspel
//
this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
this.lblCreatorKierspel.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CreatorName")});
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 221.8541F);
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel14.SizeF = new System.Drawing.SizeF(225F, 17F);
this.xrLabel14.StylePriority.UseFont = false;
this.xrLabel14.Text = "[CreatorName]";
this.lblCreatorKierspel.LocationFloat = new DevExpress.Utils.PointFloat(0F, 221.8541F);
this.lblCreatorKierspel.Name = "lblCreatorKierspel";
this.lblCreatorKierspel.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblCreatorKierspel.SizeF = new System.Drawing.SizeF(225F, 17F);
this.lblCreatorKierspel.StylePriority.UseFont = false;
this.lblCreatorKierspel.Text = "[CreatorName]";
this.lblCreatorKierspel.Visible = false;
//
// xrLabel9
//
@@ -705,16 +709,26 @@ namespace KetteReports
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.lblCreatorNichtKierspel,
this.lblUnterschrift,
this.xrLabel8,
this.xrLabel1,
this.xrLabel9,
this.xrTable4,
this.xrLabel14,
this.lblCreatorKierspel,
this.xrLabel15});
this.GroupFooter1.HeightF = 238.8541F;
this.GroupFooter1.Name = "GroupFooter1";
//
// lblUnterschrift
//
this.lblUnterschrift.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("lblUnterschrift.ImageSource"));
this.lblUnterschrift.LocationFloat = new DevExpress.Utils.PointFloat(0F, 168.0417F);
this.lblUnterschrift.Name = "lblUnterschrift";
this.lblUnterschrift.SizeF = new System.Drawing.SizeF(160.4167F, 53.81241F);
this.lblUnterschrift.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
this.lblUnterschrift.Visible = false;
//
// xrLabel8
//
this.xrLabel8.CanShrink = true;
@@ -745,14 +759,31 @@ namespace KetteReports
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// lblUnterschrift
// lblGP
//
this.lblUnterschrift.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("lblUnterschrift.ImageSource"));
this.lblUnterschrift.LocationFloat = new DevExpress.Utils.PointFloat(0F, 168.0417F);
this.lblUnterschrift.Name = "lblUnterschrift";
this.lblUnterschrift.SizeF = new System.Drawing.SizeF(160.4167F, 53.81241F);
this.lblUnterschrift.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
this.lblUnterschrift.Visible = false;
this.lblGP.BackColor = System.Drawing.Color.Transparent;
this.lblGP.CanShrink = true;
this.lblGP.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.lblGP.LocationFloat = new DevExpress.Utils.PointFloat(0F, 221.3542F);
this.lblGP.Name = "lblGP";
this.lblGP.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblGP.SizeF = new System.Drawing.SizeF(650F, 20F);
this.lblGP.StylePriority.UseBackColor = false;
this.lblGP.StylePriority.UseFont = false;
this.lblGP.Text = "GP-Nr.: [BusinessPartnerId]";
this.lblGP.Visible = false;
this.lblGP.WordWrap = false;
//
// lblCreatorNichtKierspel
//
this.lblCreatorNichtKierspel.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CreatorName")});
this.lblCreatorNichtKierspel.LocationFloat = new DevExpress.Utils.PointFloat(0F, 168.0417F);
this.lblCreatorNichtKierspel.Name = "lblCreatorNichtKierspel";
this.lblCreatorNichtKierspel.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblCreatorNichtKierspel.SizeF = new System.Drawing.SizeF(225F, 17F);
this.lblCreatorNichtKierspel.StylePriority.UseFont = false;
this.lblCreatorNichtKierspel.Text = "[CreatorName]";
//
// ServiceInvoiceReport
//
@@ -805,7 +836,7 @@ namespace KetteReports
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow14;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
private DevExpress.XtraReports.UI.XRLabel xrLabel14;
private DevExpress.XtraReports.UI.XRLabel lblCreatorKierspel;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
private DevExpress.XtraReports.UI.DetailBand Detail1;
@@ -842,5 +873,7 @@ namespace KetteReports
private DevExpress.XtraReports.UI.XRRichText lblAbsenderJA;
private DevExpress.XtraReports.UI.XRLabel lblAdresszeileJA;
private DevExpress.XtraReports.UI.XRPictureBox lblUnterschrift;
private DevExpress.XtraReports.UI.XRLabel lblGP;
private DevExpress.XtraReports.UI.XRLabel lblCreatorNichtKierspel;
}
}

View File

@@ -5,7 +5,7 @@ using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared.Extensions;
using DevExpress.XtraReports.UI;
namespace KetteReports
@@ -19,6 +19,11 @@ namespace KetteReports
public void SetReportDataSource(ServiceInvoiceRO pRO)
{
if (pRO.RecipientOrganisation.IsNotNullOrEmpty() && pRO.RecipientOrganisation.ToLower().Contains("lvr"))
{
lblGP.Visible = true;
}
if (!String.IsNullOrEmpty(pRO.SenderContactPersonMail))
{
pRO.SenderContactPersonMail = pRO.SenderContactPersonMail.Replace("E-Mail:", "").Trim();
@@ -78,7 +83,9 @@ namespace KetteReports
if (pRO.CreatorName.Contains("Kierspel"))
{
lblCreatorKierspel.Visible = true;
lblUnterschrift.Visible = true;
lblCreatorNichtKierspel.Visible = false;
}
notice +=