diff --git a/ReportImp/AutismusKoelnBonn/BasisRechnung.Designer.cs b/ReportImp/AutismusKoelnBonn/BasisRechnung.Designer.cs
index e44ea3331..7fe167e7b 100644
--- a/ReportImp/AutismusKoelnBonn/BasisRechnung.Designer.cs
+++ b/ReportImp/AutismusKoelnBonn/BasisRechnung.Designer.cs
@@ -684,6 +684,8 @@ namespace AutismusKoelnBonn
this.xrTableCell40.BorderColor = System.Drawing.Color.Black;
this.xrTableCell40.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.ServiceDescription")});
this.xrTableCell40.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell40.Name = "xrTableCell40";
this.xrTableCell40.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
diff --git a/ReportImp/AutismusKoelnBonn/BasisRechnung.cs b/ReportImp/AutismusKoelnBonn/BasisRechnung.cs
index ecbda615c..5901933dc 100644
--- a/ReportImp/AutismusKoelnBonn/BasisRechnung.cs
+++ b/ReportImp/AutismusKoelnBonn/BasisRechnung.cs
@@ -98,8 +98,17 @@ namespace AutismusKoelnBonn
lblTeamKoeln.Visible = false;
}
+ foreach (var sip in pRO.ServiceInvoicePeriods)
+ {
+ foreach (var ii in sip.ServiceInvoiceItems)
+ {
+ if (ii.ServiceDescription != "Fallpauschale")
+ ii.ServiceDescription = "Fachleistungsstunden";
+ }
+ }
+
//Anpassungen um die Selbstzahler Rechnung mit abzubilden
- if (pRO.RecipientOrganisation.ToLower() == "selbstzahler")
+ if (pRO.RecipientOrganisation.ToLower() == "selbstzahler")
{
lbl1.Visible = false;
lbl2.Visible = false;
diff --git a/ReportImp/BeWoAuxilio/BeWoAuxilio.csproj b/ReportImp/BeWoAuxilio/BeWoAuxilio.csproj
index 5803e3488..ad38336ac 100644
--- a/ReportImp/BeWoAuxilio/BeWoAuxilio.csproj
+++ b/ReportImp/BeWoAuxilio/BeWoAuxilio.csproj
@@ -140,6 +140,7 @@
Teamstundenkonto.cs
+
diff --git a/ReportImp/BeWoAuxilio/Validation/ServiceRecordValidator.cs b/ReportImp/BeWoAuxilio/Validation/ServiceRecordValidator.cs
new file mode 100644
index 000000000..cc5d9cd04
--- /dev/null
+++ b/ReportImp/BeWoAuxilio/Validation/ServiceRecordValidator.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using BeWo.Data;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Service.DCEntityMapper;
+using BeWo.Service.Plugins;
+using BS.Shared;
+using BS.Shared.DataContracts;
+using BS.Shared.Extensions;
+
+namespace BeWoAuxilio.Validation
+{
+ public class CustomServiceRecordValidator : ServiceRecordValidator
+ {
+ public override string[] GetIgnoreCategoriesForOverlappingCheck()
+ {
+ return new[] { "Arbeitszeit" };
+ }
+ }
+}
\ No newline at end of file
diff --git a/ReportImp/VSDHammReports/LeistungsnachweisJAHamm.cs b/ReportImp/VSDHammReports/LeistungsnachweisJAHamm.cs
index e64254be0..28de5ccf3 100644
--- a/ReportImp/VSDHammReports/LeistungsnachweisJAHamm.cs
+++ b/ReportImp/VSDHammReports/LeistungsnachweisJAHamm.cs
@@ -110,20 +110,23 @@ namespace VSDHammReports
{
if (pRo.SupportConceptCostBearer.StartDate != null)
{
- foreach (var ap in pRo.SupportConceptCostBearer.ApprovalPeriodList)
+ if (pRo.SupportConceptCostBearer.ApprovalPeriodList.Count > 1)
{
- if (ap.StartDate <= pRo.EndDate && ap.EndDate >= pRo.StartDate && ap.StartDate >= pRo.StartDate && ap.EndDate <= pRo.EndDate)
+ foreach (var ap in pRo.SupportConceptCostBearer.ApprovalPeriodList)
{
- lblExtraFLS.Visible = true;
- if (ap.ApprovedBETotal != null)
- lblExtraFLS.Text = String.Format("zzgl. {0:0.##} FLS vom {1:dd.MM.yy} bis {2:dd.MM.yy}", ap.ApprovedBETotal, ap.StartDate, ap.EndDate);
- else if (ap.ApprovedBEPerInterval != null && ap.ApprovedBEInterval != null)
- lblExtraFLS.Text = String.Format("zzgl. {0:0.##} FLS pro {1} vom {2:dd.MM.yy} bis {3:dd.MM.yy}", ap.ApprovedBEPerInterval,
- ap.ApprovedBEInterval != null ? EnumTranslations.SupportConceptApprovalInterval2Translations[(SupportConceptApprovalInterval)ap.ApprovedBEInterval] : null, ap.StartDate, ap.EndDate);
- else
- lblExtraFLS.Text = String.Format("zzgl. Extra FLS vom {0:dd.MM.yy} bis {1:dd.MM.yy}", ap.StartDate, ap.EndDate);
+ if (ap.StartDate <= pRo.EndDate && ap.EndDate >= pRo.StartDate && ap.StartDate >= pRo.StartDate && ap.EndDate <= pRo.EndDate)
+ {
+ lblExtraFLS.Visible = true;
+ if (ap.ApprovedBETotal != null)
+ lblExtraFLS.Text = String.Format("zzgl. {0:0.##} FLS vom {1:dd.MM.yy} bis {2:dd.MM.yy}", ap.ApprovedBETotal, ap.StartDate, ap.EndDate);
+ else if (ap.ApprovedBEPerInterval != null && ap.ApprovedBEInterval != null)
+ lblExtraFLS.Text = String.Format("zzgl. {0:0.##} FLS pro {1} vom {2:dd.MM.yy} bis {3:dd.MM.yy}", ap.ApprovedBEPerInterval,
+ ap.ApprovedBEInterval != null ? EnumTranslations.SupportConceptApprovalInterval2Translations[(SupportConceptApprovalInterval)ap.ApprovedBEInterval] : null, ap.StartDate, ap.EndDate);
+ else
+ lblExtraFLS.Text = String.Format("zzgl. Extra FLS vom {0:dd.MM.yy} bis {1:dd.MM.yy}", ap.StartDate, ap.EndDate);
+ }
}
- }
+ }
}
}
}
diff --git a/ReportImp/VSDHammReports/QuittierungsbelegJAHamm.cs b/ReportImp/VSDHammReports/QuittierungsbelegJAHamm.cs
index 4c0e2fba3..d466577b6 100644
--- a/ReportImp/VSDHammReports/QuittierungsbelegJAHamm.cs
+++ b/ReportImp/VSDHammReports/QuittierungsbelegJAHamm.cs
@@ -85,18 +85,21 @@ namespace VSDHammReports
{
if (pRo.SupportConceptCostBearer.StartDate != null)
{
- foreach (var ap in pRo.SupportConceptCostBearer.ApprovalPeriodList)
+ if (pRo.SupportConceptCostBearer.ApprovalPeriodList.Count > 1)
{
- if (ap.StartDate <= pRo.EndDate && ap.EndDate >= pRo.StartDate && ap.StartDate >= pRo.StartDate && ap.EndDate <= pRo.EndDate)
+ foreach (var ap in pRo.SupportConceptCostBearer.ApprovalPeriodList)
{
- lblExtraFLS.Visible = true;
- if (ap.ApprovedBETotal != null)
- lblExtraFLS.Text = String.Format("zzgl. {0:0.##} FLS vom {1:dd.MM.yy} bis {2:dd.MM.yy}", ap.ApprovedBETotal, ap.StartDate, ap.EndDate);
- else if (ap.ApprovedBEPerInterval != null && ap.ApprovedBEInterval != null)
- lblExtraFLS.Text = String.Format("zzgl. {0:0.##} FLS pro {1} vom {2:dd.MM.yy} bis {3:dd.MM.yy}", ap.ApprovedBEPerInterval,
- ap.ApprovedBEInterval != null ? EnumTranslations.SupportConceptApprovalInterval2Translations[(SupportConceptApprovalInterval)ap.ApprovedBEInterval] : null, ap.StartDate, ap.EndDate);
- else
- lblExtraFLS.Text = String.Format("zzgl. Extra FLS vom {0:dd.MM.yy} bis {1:dd.MM.yy}", ap.StartDate, ap.EndDate);
+ if (ap.StartDate <= pRo.EndDate && ap.EndDate >= pRo.StartDate && ap.StartDate >= pRo.StartDate && ap.EndDate <= pRo.EndDate)
+ {
+ lblExtraFLS.Visible = true;
+ if (ap.ApprovedBETotal != null)
+ lblExtraFLS.Text = String.Format("zzgl. {0:0.##} FLS vom {1:dd.MM.yy} bis {2:dd.MM.yy}", ap.ApprovedBETotal, ap.StartDate, ap.EndDate);
+ else if (ap.ApprovedBEPerInterval != null && ap.ApprovedBEInterval != null)
+ lblExtraFLS.Text = String.Format("zzgl. {0:0.##} FLS pro {1} vom {2:dd.MM.yy} bis {3:dd.MM.yy}", ap.ApprovedBEPerInterval,
+ ap.ApprovedBEInterval != null ? EnumTranslations.SupportConceptApprovalInterval2Translations[(SupportConceptApprovalInterval)ap.ApprovedBEInterval] : null, ap.StartDate, ap.EndDate);
+ else
+ lblExtraFLS.Text = String.Format("zzgl. Extra FLS vom {0:dd.MM.yy} bis {1:dd.MM.yy}", ap.StartDate, ap.EndDate);
+ }
}
}
}
diff --git a/ReportImp/VSDHammReports/ServicesOverviewReport.cs b/ReportImp/VSDHammReports/ServicesOverviewReport.cs
index 12d4e01f5..2f03e6ec9 100644
--- a/ReportImp/VSDHammReports/ServicesOverviewReport.cs
+++ b/ReportImp/VSDHammReports/ServicesOverviewReport.cs
@@ -61,26 +61,29 @@ namespace VSDHammReports
private void AnzeigeExtraStunden(ServicesOverviewRO pRo)
{
- if (pRo.SupportConceptCostBearer != null && pRo.SupportConceptCostBearer.CostBearer2SupportConceptOid != null && pRo.SupportConceptCostBearer.ApprovalPeriodList != null)
- {
- if (pRo.SupportConceptCostBearer.StartDate != null)
- {
- foreach (var ap in pRo.SupportConceptCostBearer.ApprovalPeriodList)
- {
- if (ap.StartDate <= pRo.EndDate && ap.EndDate >= pRo.StartDate && ap.StartDate >= pRo.StartDate && ap.EndDate <= pRo.EndDate)
+ if (pRo.SupportConceptCostBearer != null && pRo.SupportConceptCostBearer.CostBearer2SupportConceptOid != null && pRo.SupportConceptCostBearer.ApprovalPeriodList != null)
+ {
+ if (pRo.SupportConceptCostBearer.StartDate != null)
+ {
+ if (pRo.SupportConceptCostBearer.ApprovalPeriodList.Count > 1)
+ {
+ foreach (var ap in pRo.SupportConceptCostBearer.ApprovalPeriodList)
{
- lblExtraFLS.Visible = true;
- if (ap.ApprovedBETotal != null)
- lblExtraFLS.Text = String.Format("zzgl. {0:0.##} FLS vom {1:dd.MM.yy} bis {2:dd.MM.yy}", ap.ApprovedBETotal, ap.StartDate, ap.EndDate);
- else if (ap.ApprovedBEPerInterval != null && ap.ApprovedBEInterval != null)
- lblExtraFLS.Text = String.Format("zzgl. {0:0.##} FLS pro {1} vom {2:dd.MM.yy} bis {3:dd.MM.yy}", ap.ApprovedBEPerInterval,
- ap.ApprovedBEInterval != null ? EnumTranslations.SupportConceptApprovalInterval2Translations[(SupportConceptApprovalInterval)ap.ApprovedBEInterval] : null, ap.StartDate, ap.EndDate);
- else
- lblExtraFLS.Text = String.Format("zzgl. Extra FLS vom {0:dd.MM.yy} bis {1:dd.MM.yy}", ap.StartDate, ap.EndDate);
+ if (ap.StartDate <= pRo.EndDate && ap.EndDate >= pRo.StartDate && ap.StartDate >= pRo.StartDate && ap.EndDate <= pRo.EndDate)
+ {
+ lblExtraFLS.Visible = true;
+ if (ap.ApprovedBETotal != null)
+ lblExtraFLS.Text = String.Format("zzgl. {0:0.##} FLS vom {1:dd.MM.yy} bis {2:dd.MM.yy}", ap.ApprovedBETotal, ap.StartDate, ap.EndDate);
+ else if (ap.ApprovedBEPerInterval != null && ap.ApprovedBEInterval != null)
+ lblExtraFLS.Text = String.Format("zzgl. {0:0.##} FLS pro {1} vom {2:dd.MM.yy} bis {3:dd.MM.yy}", ap.ApprovedBEPerInterval,
+ ap.ApprovedBEInterval != null ? EnumTranslations.SupportConceptApprovalInterval2Translations[(SupportConceptApprovalInterval)ap.ApprovedBEInterval] : null, ap.StartDate, ap.EndDate);
+ else
+ lblExtraFLS.Text = String.Format("zzgl. Extra FLS vom {0:dd.MM.yy} bis {1:dd.MM.yy}", ap.StartDate, ap.EndDate);
+ }
}
}
}
- }
- }
+ }
+ }
}
}
\ No newline at end of file
diff --git a/ReportImp/VSDHammReports/VsdHammReportCreator.cs b/ReportImp/VSDHammReports/VsdHammReportCreator.cs
index aefe0b0ae..6f53b0a34 100644
--- a/ReportImp/VSDHammReports/VsdHammReportCreator.cs
+++ b/ReportImp/VSDHammReports/VsdHammReportCreator.cs
@@ -111,8 +111,8 @@ namespace VSDHammReports
{
report = new VSDHammReports.QuittierungsbelegJA();
}
- else if (kt.Contains("Jugendamt") || kt.Contains("jugendamt") || kt == "Jugendamt der Stadt Hamm" || kt == "Jugendamt der Stadt Aachen"
- || kt == "Stadt Hamm Jugendamt Clearing" || kt == "Stadt Hamm Jugendamt Wohnprojekt" || kt == "Jugendamt Ahlen Wohnprojekt" || kt.Contains("Wohnprojekt")
+ else if (kt.Contains("Jugendamt") || kt.Contains("jugendamt") || kt.Contains("Jugendamt der Stadt Hamm") || kt == "Jugendamt der Stadt Aachen"
+ || kt == "Stadt Hamm Jugendamt Clearing" || kt == "Jugendamt Ahlen Wohnprojekt" || kt.Contains("Wohnprojekt")
|| function == "Jugendamt")
{
if (ro.StartDate < new DateTime(2016, 7, 1))