HshCologne Invoicing - nochmal Formatfinetuning

This commit is contained in:
2025-10-30 13:19:54 +01:00
parent e0d48efea5
commit 51c0102a89
5 changed files with 282 additions and 225 deletions

View File

@@ -14,11 +14,6 @@ namespace HshCologne
public void SetReportDataSource(InvoiceCustomerRO pRO)
{
if (String.IsNullOrEmpty(pRO.Notice))
{
lblNotice.Visible = false;
}
StringBuilder sb = new StringBuilder();
if (!String.IsNullOrEmpty(pRO.RecipientOrganisation) && !String.IsNullOrEmpty(pRO.RecipientOrganisation.Trim()))
{

View File

@@ -44,7 +44,6 @@ namespace HshCologne.Invoicing
public override IList<InvoiceItem> CreateInvoiceItems(List<ServiceRecordDC> serviceRecordsInPeriod, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, Calculations calc)
{
var list = base.CreateInvoiceItems(serviceRecordsInPeriod, invoicePeriod, scap, calc);
var fitem = CreateFahrkostenInvoiceItem(serviceRecordsInPeriod, scap, calc);
if (fitem != null)
list.Add(fitem);
@@ -63,36 +62,42 @@ namespace HshCologne.Invoicing
// Grundsätzlich Unterscheidung nach Fachkraft nur in Schulbegleitung, da diverse Kostenträger
// daher liegen den Stundensätze unter Preise
if (iServiceRecord.ServiceDescription.Category.Abbreviation.ToLower().Contains("sb"))
if (iServiceRecord.ServiceDescription.Category.Abbreviation.ToLower().Contains("sb") || iServiceRecord.CostBearer.Name.Contains("Wesseling"))
{
decimal stundensatz = 0;
var qOid = iServiceRecord.Employee.ValueListEntries
.Where(i => i.Value == ValueListEntryType.StaffQualificationsType)
.Select(i => i.Key)
.ToList();
foreach (var qualiOid in qOid)
if (iServiceRecord.CostBearer.Name.Contains("Wesseling"))
{
if (qualiOid == 1461)
stundensatz = GetStundensatz(scap.CostBearer2SupportConcept, iServiceRecord.Start);
}
if (iServiceRecord.ServiceDescription.Category.Abbreviation.ToLower().Contains("sb"))
{
var qOid = iServiceRecord.Employee.ValueListEntries
.Where(i => i.Value == ValueListEntryType.StaffQualificationsType)
.Select(i => i.Key)
.ToList();
foreach (var qualiOid in qOid)
{
stundensatz = preisFK;
}
else if (qualiOid == 1462)
{
stundensatz = preisAK2Jahre;
ii.UnitDescription = "Assistenzkraft mit 2 jähriger BE";
}
else if (qualiOid == 1463)
{
stundensatz = preisAK2Jahre;
ii.UnitDescription = "Assistenzkraft UMA Erftstadt";
}
else if (qualiOid == 1460)
{
stundensatz = preisAK2Jahre;
ii.UnitDescription = "Assistenzkraft";
if (qualiOid == 1461)
{
stundensatz = preisFK;
}
else if (qualiOid == 1462)
{
stundensatz = preisAK2Jahre;
ii.UnitDescription = "Assistenzkraft mit 2 jähriger BE";
}
else if (qualiOid == 1463)
{
stundensatz = preisAK2Jahre;
ii.UnitDescription = "Assistenzkraft UMA Erftstadt";
}
else if (qualiOid == 1460)
{
stundensatz = preisAK2Jahre;
ii.UnitDescription = "Assistenzkraft";
}
}
}
if (stundensatz != 0)
{
ii.AmountPerUnit = stundensatz;
@@ -103,6 +108,21 @@ namespace HshCologne.Invoicing
return ii;
}
private decimal GetStundensatz(CostBearer2SupportConcept c2s, DateTime? date)
{
if (c2s.CostBearer.CostRatePeriods != null)
{
var crpList = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(c2s.CostBearer.CostRatePeriods);
var cp = crpList.GetCostRatePeriodForDate(CostRatePeriodType.HourlyRate, (DateTime)date);
if (cp != null && cp.CostRateValue.HasValue)
{
return cp.CostRateValue.Value;
}
}
return 0;
}
private InvoiceItem CreateFahrkostenInvoiceItem(List<ServiceRecordDC> serviceRecordsInPeriod, SupportConceptApprovalPeriod scap, Calculations calc)
{
int km = 0;

View File

@@ -67,6 +67,12 @@ namespace HshCologne
this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail2 = new DevExpress.XtraReports.UI.DetailBand();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
@@ -83,20 +89,14 @@ namespace HshCologne
this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrSubreport1 = new DevExpress.XtraReports.UI.XRSubreport();
((System.ComponentModel.ISupportInitialize)(this.xrTable8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
@@ -333,7 +333,9 @@ namespace HshCologne
this.xrTableCell34.Name = "xrTableCell34";
this.xrTableCell34.StylePriority.UseBorders = false;
this.xrTableCell34.StylePriority.UseFont = false;
this.xrTableCell34.StylePriority.UseTextAlignment = false;
this.xrTableCell34.Text = "RG-Datum:";
this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell34.Weight = 0.91511956056489674D;
//
// xrTableCell38
@@ -496,6 +498,103 @@ namespace HshCologne
this.ReportFooter.HeightF = 199.1666F;
this.ReportFooter.Name = "ReportFooter";
//
// xrTable3
//
this.xrTable3.Font = new DevExpress.Drawing.DXFont("Verdana", 8.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable3.Name = "xrTable3";
this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2});
this.xrTable3.SizeF = new System.Drawing.SizeF(476.0416F, 25F);
this.xrTable3.StylePriority.UseFont = false;
//
// xrTableRow2
//
this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell4,
this.xrTableCell5,
this.xrTableCell6,
this.xrTableCell7});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Weight = 0.35064941948917794D;
//
// xrTableCell4
//
this.xrTableCell4.BorderColor = System.Drawing.Color.Black;
this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("calibri", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell4.StylePriority.UseBorderColor = false;
this.xrTableCell4.StylePriority.UseBorders = false;
this.xrTableCell4.StylePriority.UseFont = false;
this.xrTableCell4.StylePriority.UsePadding = false;
this.xrTableCell4.StylePriority.UseTextAlignment = false;
this.xrTableCell4.Text = "Summe";
this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell4.Weight = 0.89050960840166338D;
//
// xrTableCell5
//
this.xrTableCell5.BorderColor = System.Drawing.Color.Black;
this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell5.Font = new DevExpress.Drawing.DXFont("calibri", 11F);
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell5.StylePriority.UseBorderColor = false;
this.xrTableCell5.StylePriority.UseBorders = false;
this.xrTableCell5.StylePriority.UseFont = false;
this.xrTableCell5.StylePriority.UsePadding = false;
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell5.TextFormatString = "{0:0.00}";
this.xrTableCell5.Weight = 0.2658790434633459D;
//
// xrTableCell6
//
this.xrTableCell6.BorderColor = System.Drawing.Color.Black;
this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("calibri", 11F);
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell6.StylePriority.UseBorderColor = false;
this.xrTableCell6.StylePriority.UseBorders = false;
this.xrTableCell6.StylePriority.UseFont = false;
this.xrTableCell6.StylePriority.UsePadding = false;
this.xrTableCell6.StylePriority.UseTextAlignment = false;
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell6.TextFormatString = "{0:0.00 €}";
this.xrTableCell6.Weight = 0.37481519034214572D;
//
// xrTableCell7
//
this.xrTableCell7.BorderColor = System.Drawing.Color.Black;
this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.NetAmount")});
this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("calibri", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell7.StylePriority.UseBorderColor = false;
this.xrTableCell7.StylePriority.UseBorders = false;
this.xrTableCell7.StylePriority.UseFont = false;
this.xrTableCell7.StylePriority.UsePadding = false;
this.xrTableCell7.StylePriority.UseTextAlignment = false;
xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
this.xrTableCell7.Summary = xrSummary1;
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell7.TextFormatString = "{0:C2}";
this.xrTableCell7.Weight = 0.57828646962424135D;
//
// xrLabel15
//
this.xrLabel15.Font = new DevExpress.Drawing.DXFont("calibri", 11F);
@@ -611,7 +710,7 @@ namespace HshCologne
this.xrTableCell14.StylePriority.UsePadding = false;
this.xrTableCell14.StylePriority.UseTextAlignment = false;
this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell14.Weight = 0.89050960840166338D;
this.xrTableCell14.Weight = 0.89051711383343335D;
//
// xrTableCell33
//
@@ -630,7 +729,7 @@ namespace HshCologne
this.xrTableCell33.StylePriority.UseTextAlignment = false;
this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell33.TextFormatString = "{0:0.00}";
this.xrTableCell33.Weight = 0.39881819229280957D;
this.xrTableCell33.Weight = 0.26587140279857091D;
//
// xrTableCell35
//
@@ -649,7 +748,7 @@ namespace HshCologne
this.xrTableCell35.StylePriority.UseTextAlignment = false;
this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell35.TextFormatString = "{0:0.00 €}";
this.xrTableCell35.Weight = 0.39881847396563552D;
this.xrTableCell35.Weight = 0.37481546080815553D;
//
// xrTableCell46
//
@@ -669,7 +768,7 @@ namespace HshCologne
this.xrTableCell46.Text = "xrTableCell45";
this.xrTableCell46.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell46.TextFormatString = "{0:C2}";
this.xrTableCell46.Weight = 0.42134403717128793D;
this.xrTableCell46.Weight = 0.57828633439123656D;
//
// GroupHeader1
//
@@ -678,103 +777,6 @@ namespace HshCologne
this.GroupHeader1.HeightF = 90F;
this.GroupHeader1.Name = "GroupHeader1";
//
// xrTable3
//
this.xrTable3.Font = new DevExpress.Drawing.DXFont("Verdana", 8.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable3.Name = "xrTable3";
this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2});
this.xrTable3.SizeF = new System.Drawing.SizeF(476.0416F, 25F);
this.xrTable3.StylePriority.UseFont = false;
//
// xrTableRow2
//
this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell4,
this.xrTableCell5,
this.xrTableCell6,
this.xrTableCell7});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Weight = 0.35064941948917794D;
//
// xrTableCell4
//
this.xrTableCell4.BorderColor = System.Drawing.Color.Black;
this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("calibri", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell4.StylePriority.UseBorderColor = false;
this.xrTableCell4.StylePriority.UseBorders = false;
this.xrTableCell4.StylePriority.UseFont = false;
this.xrTableCell4.StylePriority.UsePadding = false;
this.xrTableCell4.StylePriority.UseTextAlignment = false;
this.xrTableCell4.Text = "Summe";
this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell4.Weight = 0.89050960840166338D;
//
// xrTableCell5
//
this.xrTableCell5.BorderColor = System.Drawing.Color.Black;
this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell5.Font = new DevExpress.Drawing.DXFont("calibri", 11F);
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell5.StylePriority.UseBorderColor = false;
this.xrTableCell5.StylePriority.UseBorders = false;
this.xrTableCell5.StylePriority.UseFont = false;
this.xrTableCell5.StylePriority.UsePadding = false;
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell5.TextFormatString = "{0:0.00}";
this.xrTableCell5.Weight = 0.39881819229280957D;
//
// xrTableCell6
//
this.xrTableCell6.BorderColor = System.Drawing.Color.Black;
this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("calibri", 11F);
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell6.StylePriority.UseBorderColor = false;
this.xrTableCell6.StylePriority.UseBorders = false;
this.xrTableCell6.StylePriority.UseFont = false;
this.xrTableCell6.StylePriority.UsePadding = false;
this.xrTableCell6.StylePriority.UseTextAlignment = false;
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell6.TextFormatString = "{0:0.00 €}";
this.xrTableCell6.Weight = 0.39881847396563552D;
//
// xrTableCell7
//
this.xrTableCell7.BorderColor = System.Drawing.Color.Black;
this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.NetAmount")});
this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("calibri", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell7.StylePriority.UseBorderColor = false;
this.xrTableCell7.StylePriority.UseBorders = false;
this.xrTableCell7.StylePriority.UseFont = false;
this.xrTableCell7.StylePriority.UsePadding = false;
this.xrTableCell7.StylePriority.UseTextAlignment = false;
xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
this.xrTableCell7.Summary = xrSummary1;
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell7.TextFormatString = "{0:C2}";
this.xrTableCell7.Weight = 0.42134403717128793D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
@@ -809,9 +811,9 @@ namespace HshCologne
((System.ComponentModel.ISupportInitialize)(this.xrTable8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();

View File

@@ -41,13 +41,19 @@ namespace HshCologne
GetBetreuungsart(pRO, c);
pRO.CustomerCostCenter = GetSozialarbeiter(pRO, c);
aggregiert = pRO.ServiceInvoicePeriods;
aggregiert = new List<ServiceInvoicePeriodRO>();
foreach (var sip in pRO.ServiceInvoicePeriods)
{
var copySip = new ServiceInvoicePeriodRO();
CopyServiceInvoicePeriod(sip, copySip);
aggregiert.Add(copySip);
}
ServiceInvoiceRO flsRO;
flsRO = new ServiceInvoiceRO
{
InvoiceBase = pRO.InvoiceBase,
RecipientOrganisation = pRO.RecipientOrganisation,
ServiceInvoicePeriods = pRO.ServiceInvoicePeriods
ServiceInvoicePeriods = aggregiert
};
ServiceInvoiceReportFLS subReport = xrSubreport1.ReportSource as ServiceInvoiceReportFLS;
@@ -80,6 +86,40 @@ namespace HshCologne
this.bindingSource1.DataSource = pRO;
}
private void CopyServiceInvoicePeriod(ServiceInvoicePeriodRO existingSip, ServiceInvoicePeriodRO copySip)
{
copySip.ApprovalPeriod = existingSip.ApprovalPeriod;
copySip.Claim = existingSip.Claim;
copySip.ApprovedHours = existingSip.ApprovedHours;
copySip.Claim = existingSip.Claim;
copySip.Notice = existingSip.Notice;
copySip.Customer = existingSip.Customer;
copySip.SupportConceptApprovalPeriod = existingSip.SupportConceptApprovalPeriod;
copySip.ServiceInvoiceItems = new List<ServiceInvoiceItemRO>();
foreach (var ii in existingSip.ServiceInvoiceItems)
{
var copyItem = new ServiceInvoiceItemRO();
CopyInvoiceItem(ii, copyItem);
copySip.ServiceInvoiceItems.Add(copyItem);
}
}
public void CopyInvoiceItem(ServiceInvoiceItemRO existingItem, ServiceInvoiceItemRO copyItem)
{
copyItem.AccountingPeriodEnd = existingItem.AccountingPeriodEnd;
copyItem.AccountingPeriodStart = existingItem.AccountingPeriodStart;
copyItem.AmountPerUnit = existingItem.AmountPerUnit;
copyItem.NetAmount = existingItem.NetAmount;
copyItem.RateFactor = existingItem.RateFactor;
copyItem.UnitDescription = existingItem.UnitDescription;
copyItem.UnitCount = existingItem.UnitCount;
copyItem.Hours = existingItem.Hours;
copyItem.ServiceDescription = existingItem.ServiceDescription;
copyItem.Duration = existingItem.Duration;
copyItem.ServiceRecord = existingItem.ServiceRecord;
}
public void GetBetreuungsart(ServiceInvoiceRO pRO, Customer c)
{
var betreuungsarten = c.ValueList.Where(v2o => v2o.Entry.Type == ValueListEntryType.CustomerCareType).ToList();

View File

@@ -39,6 +39,7 @@ namespace HshCologne
this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
this.Spalte3 = new DevExpress.XtraReports.UI.XRTableCell();
this.Spalte4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell();
this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
@@ -53,7 +54,9 @@ namespace HshCologne
this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -61,15 +64,12 @@ namespace HshCologne
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -95,7 +95,7 @@ namespace HshCologne
this.xrTable5.ProcessHiddenCellMode = DevExpress.XtraReports.UI.ProcessHiddenCellMode.DecreaseTableWidth;
this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow23});
this.xrTable5.SizeF = new System.Drawing.SizeF(660F, 25F);
this.xrTable5.SizeF = new System.Drawing.SizeF(670.004F, 25F);
//
// xrTableRow23
//
@@ -126,7 +126,7 @@ namespace HshCologne
this.xrTableCell32.StylePriority.UseTextAlignment = false;
this.xrTableCell32.Text = "Datum";
this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell32.Weight = 0.57287601399490307D;
this.xrTableCell32.Weight = 0.70035185436262093D;
//
// xrTableCell37
//
@@ -145,7 +145,7 @@ namespace HshCologne
this.xrTableCell37.StylePriority.UseTextAlignment = false;
this.xrTableCell37.Text = "FLS";
this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell37.Weight = 0.31763362820850688D;
this.xrTableCell37.Weight = 0.29810661962133678D;
//
// Spalte3
//
@@ -164,7 +164,7 @@ namespace HshCologne
this.Spalte3.StylePriority.UseTextAlignment = false;
this.Spalte3.Text = "km";
this.Spalte3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.Spalte3.Weight = 0.39881832128613859D;
this.Spalte3.Weight = 0.29810662025350343D;
//
// Spalte4
//
@@ -183,7 +183,28 @@ namespace HshCologne
this.Spalte4.StylePriority.UseTextAlignment = false;
this.Spalte4.Text = "zusätzl. Km";
this.Spalte4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.Spalte4.Weight = 0.48162532415708581D;
this.Spalte4.Weight = 0.47438819340917321D;
//
// xrTableCell1
//
this.xrTableCell1.BackColor = System.Drawing.Color.Gainsboro;
this.xrTableCell1.BorderColor = System.Drawing.Color.Black;
this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("calibri", 11F);
this.xrTableCell1.Multiline = true;
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell1.StylePriority.UseBackColor = false;
this.xrTableCell1.StylePriority.UseBorderColor = false;
this.xrTableCell1.StylePriority.UseBorders = false;
this.xrTableCell1.StylePriority.UseFont = false;
this.xrTableCell1.StylePriority.UsePadding = false;
this.xrTableCell1.StylePriority.UseTextAlignment = false;
this.xrTableCell1.Text = "Gruppe";
this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell1.Visible = false;
this.xrTableCell1.Weight = 0.3160113187221727D;
//
// xrTableCell36
//
@@ -203,7 +224,7 @@ namespace HshCologne
this.xrTableCell36.StylePriority.UseTextAlignment = false;
this.xrTableCell36.Text = "Beschreibung";
this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell36.Weight = 1.1922082124664395D;
this.xrTableCell36.Weight = 1.2419122845358259D;
//
// ruleRateFactorNull
//
@@ -261,7 +282,7 @@ namespace HshCologne
this.xrTable6.ProcessHiddenCellMode = DevExpress.XtraReports.UI.ProcessHiddenCellMode.DecreaseTableWidth;
this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow25});
this.xrTable6.SizeF = new System.Drawing.SizeF(660F, 25F);
this.xrTable6.SizeF = new System.Drawing.SizeF(670.004F, 25F);
this.xrTable6.StylePriority.UseFont = false;
//
// xrTableRow25
@@ -291,7 +312,7 @@ namespace HshCologne
this.xrTableCell40.StylePriority.UsePadding = false;
this.xrTableCell40.StylePriority.UseTextAlignment = false;
this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell40.Weight = 0.57287600552653584D;
this.xrTableCell40.Weight = 0.70035177075283D;
//
// xrTableCell42
//
@@ -309,7 +330,7 @@ namespace HshCologne
this.xrTableCell42.StylePriority.UseTextAlignment = false;
this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell42.TextFormatString = "{0:0.00}";
this.xrTableCell42.Weight = 0.31763360287512749D;
this.xrTableCell42.Weight = 0.29810684057558196D;
//
// xrTableCell43
//
@@ -327,7 +348,7 @@ namespace HshCologne
this.xrTableCell43.StylePriority.UseTextAlignment = false;
this.xrTableCell43.Text = "xrTableCell43";
this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell43.Weight = 0.398818462758802D;
this.xrTableCell43.Weight = 0.29810655271184389D;
//
// xrTableCell44
//
@@ -345,7 +366,26 @@ namespace HshCologne
this.xrTableCell44.StylePriority.UseTextAlignment = false;
this.xrTableCell44.Text = "xrTableCell44";
this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell44.Weight = 0.4816248654970271D;
this.xrTableCell44.Weight = 0.47438777261723664D;
//
// xrTableCell2
//
this.xrTableCell2.BorderColor = System.Drawing.Color.Black;
this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Notice")});
this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("calibri", 11F);
this.xrTableCell2.Multiline = true;
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell2.StylePriority.UseBorderColor = false;
this.xrTableCell2.StylePriority.UseBorders = false;
this.xrTableCell2.StylePriority.UseFont = false;
this.xrTableCell2.StylePriority.UsePadding = false;
this.xrTableCell2.StylePriority.UseTextAlignment = false;
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell2.Visible = false;
this.xrTableCell2.Weight = 0.31601154150225907D;
//
// xrTableCell45
//
@@ -364,7 +404,11 @@ namespace HshCologne
this.xrTableCell45.StylePriority.UseTextAlignment = false;
this.xrTableCell45.Text = "xrTableCell45";
this.xrTableCell45.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell45.Weight = 1.1922083579364873D;
this.xrTableCell45.Weight = 1.24191265770481D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// ReportFooter
//
@@ -380,7 +424,7 @@ namespace HshCologne
this.xrTable3.ProcessHiddenCellMode = DevExpress.XtraReports.UI.ProcessHiddenCellMode.DecreaseTableWidth;
this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow5});
this.xrTable3.SizeF = new System.Drawing.SizeF(660F, 25F);
this.xrTable3.SizeF = new System.Drawing.SizeF(670.004F, 25F);
//
// xrTableRow5
//
@@ -410,7 +454,7 @@ namespace HshCologne
this.xrTableCell15.StylePriority.UseTextAlignment = false;
this.xrTableCell15.Text = "Gesamt";
this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell15.Weight = 0.57287608340425189D;
this.xrTableCell15.Weight = 0.70035186373082614D;
//
// xrTableCell16
//
@@ -432,7 +476,7 @@ namespace HshCologne
this.xrTableCell16.Summary = xrSummary1;
this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell16.TextFormatString = "{0:0.00}";
this.xrTableCell16.Weight = 0.317633558799158D;
this.xrTableCell16.Weight = 0.29810688895210269D;
//
// xrTableCell17
//
@@ -449,7 +493,7 @@ namespace HshCologne
this.xrTableCell17.StylePriority.UsePadding = false;
this.xrTableCell17.StylePriority.UseTextAlignment = false;
this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell17.Weight = 0.39881818605314867D;
this.xrTableCell17.Weight = 0.29810658627913567D;
//
// xrTableCell18
//
@@ -466,65 +510,7 @@ namespace HshCologne
this.xrTableCell18.StylePriority.UsePadding = false;
this.xrTableCell18.StylePriority.UseTextAlignment = false;
this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell18.Weight = 0.48162570219470874D;
//
// xrTableCell19
//
this.xrTableCell19.BackColor = System.Drawing.Color.Transparent;
this.xrTableCell19.BorderColor = System.Drawing.Color.Black;
this.xrTableCell19.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell19.Font = new DevExpress.Drawing.DXFont("calibri", 11F);
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell19.StylePriority.UseBackColor = false;
this.xrTableCell19.StylePriority.UseBorderColor = false;
this.xrTableCell19.StylePriority.UseBorders = false;
this.xrTableCell19.StylePriority.UseFont = false;
this.xrTableCell19.StylePriority.UsePadding = false;
this.xrTableCell19.StylePriority.UseTextAlignment = false;
this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell19.Weight = 1.1922079420004597D;
//
// xrTableCell1
//
this.xrTableCell1.BackColor = System.Drawing.Color.Gainsboro;
this.xrTableCell1.BorderColor = System.Drawing.Color.Black;
this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("calibri", 11F);
this.xrTableCell1.Multiline = true;
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell1.StylePriority.UseBackColor = false;
this.xrTableCell1.StylePriority.UseBorderColor = false;
this.xrTableCell1.StylePriority.UseBorders = false;
this.xrTableCell1.StylePriority.UseFont = false;
this.xrTableCell1.StylePriority.UsePadding = false;
this.xrTableCell1.StylePriority.UseTextAlignment = false;
this.xrTableCell1.Text = "Gruppe";
this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell1.Visible = false;
this.xrTableCell1.Weight = 0.3160113187221727D;
//
// xrTableCell2
//
this.xrTableCell2.BorderColor = System.Drawing.Color.Black;
this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Notice")});
this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("calibri", 11F);
this.xrTableCell2.Multiline = true;
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell2.StylePriority.UseBorderColor = false;
this.xrTableCell2.StylePriority.UseBorders = false;
this.xrTableCell2.StylePriority.UseFont = false;
this.xrTableCell2.StylePriority.UsePadding = false;
this.xrTableCell2.StylePriority.UseTextAlignment = false;
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell2.Visible = false;
this.xrTableCell2.Weight = 0.31601154150225907D;
this.xrTableCell18.Weight = 0.4743881914892028D;
//
// xrTableCell3
//
@@ -545,9 +531,23 @@ namespace HshCologne
this.xrTableCell3.Visible = false;
this.xrTableCell3.Weight = 0.31601175208248883D;
//
// bindingSource1
// xrTableCell19
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
this.xrTableCell19.BackColor = System.Drawing.Color.Transparent;
this.xrTableCell19.BorderColor = System.Drawing.Color.Black;
this.xrTableCell19.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell19.Font = new DevExpress.Drawing.DXFont("calibri", 11F);
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell19.StylePriority.UseBackColor = false;
this.xrTableCell19.StylePriority.UseBorderColor = false;
this.xrTableCell19.StylePriority.UseBorders = false;
this.xrTableCell19.StylePriority.UseFont = false;
this.xrTableCell19.StylePriority.UsePadding = false;
this.xrTableCell19.StylePriority.UseTextAlignment = false;
this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell19.Weight = 1.2419123992814456D;
//
// ServiceInvoiceReportFLS
//
@@ -563,7 +563,7 @@ namespace HshCologne
this.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
this.Margins = new DevExpress.Drawing.DXMargins(75F, 92F, 23.125F, 0F);
this.Margins = new DevExpress.Drawing.DXMargins(75F, 70F, 23.125F, 0F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
@@ -572,8 +572,8 @@ namespace HshCologne
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}