ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MH: Alpha eV Sammelrechnung

Browse Source
This commit is contained in:
Marcel Hirschle
2024-08-28 12:05:02 +02:00
parent 42c0afeea7
commit 844ae80c4f
4 changed files with 124 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ReportImp/AlphaEv/Invoicing/CustomInvoiceCreation.cs
View File

@@ -3,6 +3,7 @@ using BeWo.Service.Invoicing;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Services;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -25,5 +26,13 @@ namespace AlphaEv.Invoicing
return invoice;
}
public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, Calculations calc)
{
var invoiceItem = base.CreateInvoiceItem(iServiceRecord, scap, calc);
invoiceItem.ItemDescription = iServiceRecord.ServiceDescription.CategoryName;
return invoiceItem;
}
}
}

8
ReportImp/AlphaEv/Invoicing/CustomInvoiceFactory.cs
View File

@@ -14,7 +14,9 @@ namespace AlphaEv.Invoicing
{
public override SettlementInvoiceCreation CreateSettlementInvoiceCreator(string costbearerId, string tenant, CostBearer2SupportConcept lCb2Sc)
{
if (lCb2Sc.CostBearer.Organisation.Name.Contains("Stadt") && lCb2Sc.CostBearer.Organisation.Name.Contains("Wuppertal") || lCb2Sc.CostBearer.Organisation.Name.Contains("Stadt Remscheid") || lCb2Sc.CostBearer.Organisation.Name.Contains("Oberbergischer Kreis"))
if (lCb2Sc.CostBearer.Organisation.Name.Contains("Stadt") && lCb2Sc.CostBearer.Organisation.Name.Contains("Wuppertal") ||
lCb2Sc.CostBearer.Organisation.Name.Contains("Stadt Remscheid") || lCb2Sc.CostBearer.Organisation.Name.Contains("Oberbergischer Kreis") ||
lCb2Sc.CostBearer.Organisation.Name.Contains("Jugendamt Köln") || lCb2Sc.CostBearer.Organisation.Name.Contains("Stadt Wermelskirchen (fls)"))
return new WuppertalSettlementInvoiceCreation();
return base.CreateSettlementInvoiceCreator(costbearerId, tenant, lCb2Sc);
@@ -23,7 +25,9 @@ namespace AlphaEv.Invoicing
{
foreach (var sc2sr in supportConcepts2ServiceRecords)
{
if (sc2sr.Key.CostBearer.Contains("Stadt") && sc2sr.Key.CostBearer.Contains("Wuppertal") || sc2sr.Key.CostBearer.Contains("Stadt Remscheid") || sc2sr.Key.CostBearer.Contains("Oberbergischer Kreis"))
if (sc2sr.Key.CostBearer.Contains("Stadt") && sc2sr.Key.CostBearer.Contains("Wuppertal") || sc2sr.Key.CostBearer.Contains("Stadt Remscheid") ||
sc2sr.Key.CostBearer.Contains("Oberbergischer Kreis") || sc2sr.Key.CostBearer.Contains("Jugendamt Köln") ||
sc2sr.Key.CostBearer.Contains("Stadt Wermelskirchen (fls)"))
return new CustomInvoiceCreation();
}

133
ReportImp/AlphaEv/SammelrechnungWuppertal.Designer.cs generated
View File

@@ -30,6 +30,8 @@ namespace AlphaEv
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SammelrechnungWuppertal));
DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
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.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
@@ -63,7 +65,6 @@ namespace AlphaEv
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -92,12 +93,18 @@ namespace AlphaEv
this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -151,7 +158,7 @@ namespace AlphaEv
this.xrLabel12.SizeF = new System.Drawing.SizeF(371.88F, 18F);
this.xrLabel12.StylePriority.UseBorders = false;
this.xrLabel12.StylePriority.UseFont = false;
this.xrLabel12.Text = "Abrechnung ";
this.xrLabel12.Text = "Abrechnung Betreutes Wohnen";
//
// xrRichText2
//
@@ -333,7 +340,7 @@ namespace AlphaEv
this.lblParagrafen.Multiline = true;
this.lblParagrafen.Name = "lblParagrafen";
this.lblParagrafen.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblParagrafen.SizeF = new System.Drawing.SizeF(623.25F, 52.89577F);
this.lblParagrafen.SizeF = new System.Drawing.SizeF(664.9999F, 52.89577F);
this.lblParagrafen.StylePriority.UseFont = false;
this.lblParagrafen.Text = "Diese Leistungen sind umsatzsteuerfrei nach § 53, 54 SGB XII.\r\n\r\nDie Rechnung ist" +
" zahlbar innerhalb von 30 Tagen.";
@@ -391,7 +398,7 @@ namespace AlphaEv
this.xrTable5.Name = "xrTable5";
this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow15});
this.xrTable5.SizeF = new System.Drawing.SizeF(577.5F, 40F);
this.xrTable5.SizeF = new System.Drawing.SizeF(665F, 40F);
this.xrTable5.StylePriority.UseBorderColor = false;
//
// xrTableRow15
@@ -399,6 +406,7 @@ namespace AlphaEv
this.xrTableRow15.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell3,
this.xrTableCell2,
this.xrTableCell27,
this.xrTableCell14,
this.xrTableCell4,
this.xrTableCell23});
@@ -441,7 +449,7 @@ namespace AlphaEv
this.xrTableCell14.StylePriority.UsePadding = false;
this.xrTableCell14.StylePriority.UseTextAlignment = false;
this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell14.Weight = 0.21410231242593519D;
this.xrTableCell14.Weight = 0.21410221852569442D;
//
// xrTableCell4
//
@@ -469,11 +477,7 @@ namespace AlphaEv
this.xrTableCell23.StylePriority.UseTextAlignment = false;
this.xrTableCell23.Text = "xrTableCell23";
this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell23.Weight = 0.14615382464290688D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
this.xrTableCell23.Weight = 0.14615394201820783D;
//
// GroupHeader1
//
@@ -489,7 +493,7 @@ namespace AlphaEv
this.xrTable1.Name = "xrTable1";
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
this.xrTable1.SizeF = new System.Drawing.SizeF(577.5F, 20F);
this.xrTable1.SizeF = new System.Drawing.SizeF(665F, 20F);
this.xrTable1.StylePriority.UseBorderColor = false;
//
// xrTableRow1
@@ -497,6 +501,7 @@ namespace AlphaEv
this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell6,
this.xrTableCell7,
this.xrTableCell26,
this.xrTableCell8,
this.xrTableCell10,
this.xrTableCell12});
@@ -571,7 +576,7 @@ namespace AlphaEv
this.xrTableRow2,
this.tableRowAbschlagszahlungen1,
this.tableRowAbschlagszahlungen2});
this.xrTable2.SizeF = new System.Drawing.SizeF(577.5F, 69.99333F);
this.xrTable2.SizeF = new System.Drawing.SizeF(665F, 69.99333F);
this.xrTable2.StylePriority.UseBorderColor = false;
this.xrTable2.StylePriority.UseBorders = false;
//
@@ -581,6 +586,7 @@ namespace AlphaEv
this.xrTableCell1,
this.xrTableCell5,
this.xrTableCell9,
this.xrTableCell28,
this.xrTableCell13,
this.xrTableCell11});
this.xrTableRow2.Name = "xrTableRow2";
@@ -602,12 +608,17 @@ namespace AlphaEv
//
// xrTableCell5
//
this.xrTableCell5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.UnitCount")});
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell5.StylePriority.UseBorders = false;
this.xrTableCell5.StylePriority.UsePadding = false;
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
xrSummary1.FormatString = "{0:0.00}";
xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell5.Summary = xrSummary1;
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell5.Weight = 0.11378204464766376D;
//
// xrTableCell9
@@ -618,7 +629,7 @@ namespace AlphaEv
this.xrTableCell9.StylePriority.UsePadding = false;
this.xrTableCell9.StylePriority.UseTextAlignment = false;
this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell9.Weight = 0.21410213661867283D;
this.xrTableCell9.Weight = 0.134615373301415D;
//
// xrTableCell13
//
@@ -627,7 +638,7 @@ namespace AlphaEv
this.xrTableCell13.StylePriority.UsePadding = false;
this.xrTableCell13.StylePriority.UseTextAlignment = false;
this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell13.Weight = 0.13461548044921318D;
this.xrTableCell13.Weight = 0.13461529264873581D;
//
// xrTableCell11
//
@@ -644,7 +655,7 @@ namespace AlphaEv
this.xrTableCell11.StylePriority.UseTextAlignment = false;
this.xrTableCell11.Text = "Betrag";
this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell11.Weight = 0.1461538938457071D;
this.xrTableCell11.Weight = 0.14615394079582642D;
//
// tableRowAbschlagszahlungen1
//
@@ -652,6 +663,7 @@ namespace AlphaEv
this.xrTableCell15,
this.xrTableCell16,
this.xrTableCell17,
this.xrTableCell29,
this.xrTableCell18,
this.xrTableCell19});
this.tableRowAbschlagszahlungen1.Name = "tableRowAbschlagszahlungen1";
@@ -691,7 +703,7 @@ namespace AlphaEv
this.xrTableCell17.StylePriority.UsePadding = false;
this.xrTableCell17.StylePriority.UseTextAlignment = false;
this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell17.Weight = 0.21410213661867283D;
this.xrTableCell17.Weight = 0.134615373301415D;
//
// xrTableCell18
//
@@ -703,7 +715,7 @@ namespace AlphaEv
this.xrTableCell18.StylePriority.UseTextAlignment = false;
this.xrTableCell18.Text = "-";
this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell18.Weight = 0.13461548044921318D;
this.xrTableCell18.Weight = 0.13461529264873581D;
//
// xrTableCell19
//
@@ -718,7 +730,7 @@ namespace AlphaEv
this.xrTableCell19.StylePriority.UsePadding = false;
this.xrTableCell19.StylePriority.UseTextAlignment = false;
this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell19.Weight = 0.1461538938457071D;
this.xrTableCell19.Weight = 0.14615394079582642D;
//
// tableRowAbschlagszahlungen2
//
@@ -726,6 +738,7 @@ namespace AlphaEv
this.xrTableCell20,
this.xrTableCell21,
this.xrTableCell22,
this.xrTableCell30,
this.xrTableCell24,
this.xrTableCell25});
this.tableRowAbschlagszahlungen2.Name = "tableRowAbschlagszahlungen2";
@@ -765,7 +778,7 @@ namespace AlphaEv
this.xrTableCell22.StylePriority.UsePadding = false;
this.xrTableCell22.StylePriority.UseTextAlignment = false;
this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell22.Weight = 0.21410213661867283D;
this.xrTableCell22.Weight = 0.134615373301415D;
//
// xrTableCell24
//
@@ -776,7 +789,7 @@ namespace AlphaEv
this.xrTableCell24.StylePriority.UsePadding = false;
this.xrTableCell24.StylePriority.UseTextAlignment = false;
this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell24.Weight = 0.13461548044921318D;
this.xrTableCell24.Weight = 0.13461529264873581D;
//
// xrTableCell25
//
@@ -791,7 +804,70 @@ namespace AlphaEv
this.xrTableCell25.StylePriority.UsePadding = false;
this.xrTableCell25.StylePriority.UseTextAlignment = false;
this.xrTableCell25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell25.Weight = 0.1461538938457071D;
this.xrTableCell25.Weight = 0.14615394079582642D;
//
// xrTableCell26
//
this.xrTableCell26.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrTableCell26.Multiline = true;
this.xrTableCell26.Name = "xrTableCell26";
this.xrTableCell26.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell26.StylePriority.UseBorders = false;
this.xrTableCell26.StylePriority.UsePadding = false;
this.xrTableCell26.Text = "Faktor";
this.xrTableCell26.Weight = 0.2731899045499907D;
//
// xrTableCell27
//
this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.RateFactor")});
this.xrTableCell27.Multiline = true;
this.xrTableCell27.Name = "xrTableCell27";
this.xrTableCell27.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell27.StylePriority.UseBorders = false;
this.xrTableCell27.StylePriority.UsePadding = false;
this.xrTableCell27.StylePriority.UseTextAlignment = false;
this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell27.Weight = 0.13461538572743859D;
//
// xrTableCell28
//
this.xrTableCell28.Multiline = true;
this.xrTableCell28.Name = "xrTableCell28";
this.xrTableCell28.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell28.StylePriority.UseBorders = false;
this.xrTableCell28.StylePriority.UsePadding = false;
this.xrTableCell28.StylePriority.UseTextAlignment = false;
this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell28.Weight = 0.21410230094409052D;
//
// xrTableCell29
//
this.xrTableCell29.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTableCell29.Multiline = true;
this.xrTableCell29.Name = "xrTableCell29";
this.xrTableCell29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell29.StylePriority.UseBorders = false;
this.xrTableCell29.StylePriority.UsePadding = false;
this.xrTableCell29.StylePriority.UseTextAlignment = false;
this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell29.Weight = 0.21410230094409052D;
//
// xrTableCell30
//
this.xrTableCell30.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTableCell30.Multiline = true;
this.xrTableCell30.Name = "xrTableCell30";
this.xrTableCell30.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell30.StylePriority.UseBorders = false;
this.xrTableCell30.StylePriority.UsePadding = false;
this.xrTableCell30.StylePriority.UseTextAlignment = false;
this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell30.Weight = 0.21410230094409052D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// SammelrechnungWuppertal
//
@@ -814,12 +890,14 @@ namespace AlphaEv
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "23.2";
xrWatermark1.Id = "Watermark1";
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -886,6 +964,11 @@ namespace AlphaEv
private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell27;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
}
}

1
ReportImp/AlphaEv/SammelrechnungWuppertal.cs
View File

@@ -76,6 +76,7 @@ namespace AlphaEv
Int32.TryParse(rfStr, out rfInt);
rateFactor = (100m + rfInt)/100m;
i.RateFactor = string.Format("0:0.00", rateFactor);
}
}