CaritasverbandOstvest: Rechnungsanpassungen (Bankverbindung, Debitor-Nr., Schlussatz, Faktor+Spalten für KT Haltern am See)

This commit is contained in:
2025-06-02 16:42:23 +02:00
parent 7d28d29bcc
commit ef2e8cd665
4 changed files with 111 additions and 53 deletions

View File

@@ -38,6 +38,10 @@ namespace CaritasOstvest
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel();
this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
@@ -81,12 +85,10 @@ namespace CaritasOstvest
this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
@@ -145,10 +147,54 @@ namespace CaritasOstvest
this.xrLabel18});
this.bottomMarginBand1.HeightF = 123.0356F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// xrPictureBox3
//
this.xrPictureBox3.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox3.ImageSource"));
this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(437.2083F, 0F);
this.xrPictureBox3.Name = "xrPictureBox3";
this.xrPictureBox3.SizeF = new System.Drawing.SizeF(239.7917F, 109.5578F);
this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrLabel21
//
this.xrLabel21.Font = new DevExpress.Drawing.DXFont("Calibri", 8F);
this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(222.5483F, 53.99998F);
this.xrLabel21.Multiline = true;
this.xrLabel21.Name = "xrLabel21";
this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel21.SizeF = new System.Drawing.SizeF(209.4899F, 46F);
this.xrLabel21.StylePriority.UseFont = false;
this.xrLabel21.Text = "Volksbank Westmünsterland eG\r\nIBAN: DE13 4286 1387 7119 4113 00\r\nBIC: GENODEM1BOB" +
"\r\n";
//
// xrLabel19
//
this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Calibri", 8F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(222.5484F, 38F);
this.xrLabel19.Multiline = true;
this.xrLabel19.Name = "xrLabel19";
this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel19.SizeF = new System.Drawing.SizeF(209.4898F, 16.00002F);
this.xrLabel19.StylePriority.UseFont = false;
this.xrLabel19.Text = "Bankverbindung:";
//
// xrLabel18
//
this.xrLabel18.Font = new DevExpress.Drawing.DXFont("Calibri", 8F);
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(0F, 38F);
this.xrLabel18.Multiline = true;
this.xrLabel18.Name = "xrLabel18";
this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel18.SizeF = new System.Drawing.SizeF(209.83F, 54.75001F);
this.xrLabel18.StylePriority.UseFont = false;
this.xrLabel18.Text = "Vorständin: Carolin Lindinger\r\nSitz des Vereins: Datteln\r\nRegister Nr.: VR 1037 A" +
"G Recklinghausen\r\nSteuernummer: 340/5941/1012";
//
// Page1
//
this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel22,
this.xrLabel6,
this.xrLabel17,
this.xrLabel16,
@@ -347,7 +393,7 @@ namespace CaritasOstvest
// xrLabel15
//
this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Calibri", 10F);
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 107.7498F);
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 136.7498F);
this.xrLabel15.Name = "xrLabel15";
this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel15.SizeF = new System.Drawing.SizeF(175F, 17F);
@@ -359,7 +405,7 @@ namespace CaritasOstvest
this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CreatorName")});
this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Calibri", 10F);
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 169.7498F);
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 198.7498F);
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);
@@ -701,16 +747,18 @@ namespace CaritasOstvest
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel20,
this.xrLabel9,
this.xrLabel1,
this.lblNoticeHeader,
this.xrLabel14,
this.xrLabel15});
this.GroupFooter1.HeightF = 200.0158F;
this.GroupFooter1.HeightF = 215.7498F;
this.GroupFooter1.Name = "GroupFooter1";
//
// xrLabel9
//
this.xrLabel9.CanShrink = true;
this.xrLabel9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")});
this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Calibri", 10F);
@@ -719,49 +767,6 @@ namespace CaritasOstvest
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(676.8299F, 46.98798F);
this.xrLabel9.StylePriority.UseFont = false;
//
// xrPictureBox3
//
this.xrPictureBox3.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox3.ImageSource"));
this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(437.2083F, 0F);
this.xrPictureBox3.Name = "xrPictureBox3";
this.xrPictureBox3.SizeF = new System.Drawing.SizeF(239.7917F, 109.5578F);
this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrLabel21
//
this.xrLabel21.Font = new DevExpress.Drawing.DXFont("Calibri", 8F);
this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(222.5483F, 53.99998F);
this.xrLabel21.Multiline = true;
this.xrLabel21.Name = "xrLabel21";
this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel21.SizeF = new System.Drawing.SizeF(209.4899F, 46F);
this.xrLabel21.StylePriority.UseFont = false;
this.xrLabel21.Text = "Volksbank Südmünsterland-Mitte eG\r\nIBAN: DE53 4016 4528 0103 5934 00\r\nBIC: GENODE" +
"M1LHN\r\n";
//
// xrLabel19
//
this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Calibri", 8F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(222.5484F, 38F);
this.xrLabel19.Multiline = true;
this.xrLabel19.Name = "xrLabel19";
this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel19.SizeF = new System.Drawing.SizeF(209.4898F, 16.00002F);
this.xrLabel19.StylePriority.UseFont = false;
this.xrLabel19.Text = "Bankverbindung:";
//
// xrLabel18
//
this.xrLabel18.Font = new DevExpress.Drawing.DXFont("Calibri", 8F);
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(0F, 38F);
this.xrLabel18.Multiline = true;
this.xrLabel18.Name = "xrLabel18";
this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel18.SizeF = new System.Drawing.SizeF(209.83F, 54.75001F);
this.xrLabel18.StylePriority.UseFont = false;
this.xrLabel18.Text = "Vorständin: Carolin Lindinger\r\nSitz des Vereins: Datteln\r\nRegister Nr.: VR 1037 A" +
"G Recklinghausen\r\nSteuernummer: 340/5941/1012";
//
// xrLabel1
//
@@ -777,11 +782,36 @@ namespace CaritasOstvest
this.xrLabel1.StylePriority.UseTextAlignment = false;
this.xrLabel1.Text = "xrLabel1";
this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
//
// xrLabel20
//
this.xrLabel20.Font = new DevExpress.Drawing.DXFont("Calibri", 10F);
this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(0F, 98.74979F);
this.xrLabel20.Name = "xrLabel20";
this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel20.SizeF = new System.Drawing.SizeF(677.0001F, 17F);
this.xrLabel20.StylePriority.UseFont = false;
this.xrLabel20.Text = "Bitte überweisen sie den Rechnungsbetrag unter Angabe der Rechnungs- und Debitore" +
"nnummer auf unser Konto.";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// xrLabel22
//
this.xrLabel22.BackColor = System.Drawing.Color.Transparent;
this.xrLabel22.CanShrink = true;
this.xrLabel22.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(467.17F, 290.8333F);
this.xrLabel22.Name = "xrLabel22";
this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel22.SizeF = new System.Drawing.SizeF(209.6599F, 20.00003F);
this.xrLabel22.StylePriority.UseBackColor = false;
this.xrLabel22.StylePriority.UseFont = false;
this.xrLabel22.Text = "Debitorennummer: [DebitorNumber]";
this.xrLabel22.WordWrap = false;
//
// ServiceInvoiceReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -868,5 +898,7 @@ namespace CaritasOstvest
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox3;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRLabel xrLabel20;
private DevExpress.XtraReports.UI.XRLabel xrLabel22;
}
}

View File

@@ -42,6 +42,32 @@ namespace CaritasOstvest
pRO.SenderContactPersonFax = pRO.SenderContactPersonFax.Replace("Fax:", "").Trim();
}
// Für KT Stadt Haltern am See: pausch. Faktor auf Stunden aufschlagen, Betrag und pauschFaktor-Spalten ausblenden
if (pRO.RecipientOrganisation != null && pRO.RecipientOrganisation.Equals("Stadt Haltern am See"))
{
decimal rateFactor = 1;
foreach (var sip in pRO.ServiceInvoicePeriods)
{
foreach (var ii in sip.ServiceInvoiceItems)
{
if (!String.IsNullOrEmpty(ii.RateFactor))
{
var rfStr = ii.RateFactor.Replace("%", "").Replace(",00", "").Trim();
int rfInt = 0;
Int32.TryParse(rfStr, out rfInt);
rateFactor = (100m + rfInt) / 100m;
ii.Hours = ii.Hours * rateFactor;
}
ii.NetAmount = null;
ii.RateFactor = "";
}
}
xrTableCell38.Text = "";
xrTableCell36.Text = "";
}
if (String.IsNullOrEmpty(pRO.Notice))
{
lblNoticeHeader.Visible = false;

File diff suppressed because one or more lines are too long

View File

@@ -120,7 +120,7 @@
<data name="xrLabel4.Text" xml:space="preserve">
<value>Sollte sich bei der Abrechnung der FLS ein Auszahlungsbetrag zu unseren Gunsten ergeben, bitten wir um Erstattung auf folgendes Konto des Caritasverband Ostvest e.V.:
Kreditinstitut: Volksbank Südmünsterland-Mitte eG IBAN: DE53 4016 4528 0103 5934 00
Kreditinstitut: Volksbank Westmünsterland eG IBAN: DE13 4286 1387 7119 4113 00
</value>
</data>
<data name="xrLabel12.Text" xml:space="preserve">