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

Merge branch 'master' of ssh://float.ownsoft.de/git/beyondSoft/BeWo

Browse Source
This commit is contained in:
HirschleM
2024-10-14 08:05:15 +02:00
parent 21bae804f1 9f5020dc22
commit aa1c8eb9d0
4 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ReportImp/LebenshilfeWolfsburg/Reporting/Leistungsnachweis2024.Designer.cs generated
View File

@@ -61,7 +61,6 @@ namespace LebenshilfeWolfsburg.Reporting
this.columnWegepauschaleQuali = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
@@ -103,6 +102,7 @@ namespace LebenshilfeWolfsburg.Reporting
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField();
this.wennGruppeAnzPersonen = new DevExpress.XtraReports.UI.CalculatedField();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -519,10 +519,6 @@ namespace LebenshilfeWolfsburg.Reporting
this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell32.Weight = 1.0307263240210649D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
@@ -851,7 +847,8 @@ namespace LebenshilfeWolfsburg.Reporting
this.xrLabel18.StylePriority.UseFont = false;
this.xrLabel18.StylePriority.UseForeColor = false;
this.xrLabel18.StylePriority.UseTextAlignment = false;
this.xrLabel18.Text = "[CustomerLastName], [CustomerFirstName]";
this.xrLabel18.Text = "[CustomerLastName], [CustomerFirstName] ([CostBearer2SupportConceptList.SupportCo" +
"ncept.Customer.CustomerAlias])";
this.xrLabel18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel17
@@ -1147,6 +1144,10 @@ namespace LebenshilfeWolfsburg.Reporting
this.wennGruppeAnzPersonen.Expression = "Iif([CustomerCount] > 1,[CustomerCount],\'\')";
this.wennGruppeAnzPersonen.Name = "wennGruppeAnzPersonen";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// Leistungsnachweis2024
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {

2
ReportImp/LebenshilfeWolfsburg/Reporting/Leistungsnachweis2024.cs
View File

@@ -83,7 +83,7 @@ namespace LebenshilfeWolfsburg.Reporting
lblRestbudget.Text = String.Format("{0:0.00}", pRO.ApprovedFLSTotal - pRO.MinutenGeleistetBisVormonat);
//lblHeader je nach Art der Leistung des Hilfeplans
if (pRO.Costbearer.Contains("Helfer"))
if (pRO.Costbearer.Contains("Helfer") || pRO.Costbearer.ToLower().Contains("ka"))
{
lblHeader.Text = "Kompensatorische Assistenz";
}

8
ReportImp/MalteserJohanniterJohanneshaus/Invoicing/CollectiveInvoiceCreation.cs
View File

@@ -138,14 +138,8 @@ namespace MalteserJohanniterJohanneshaus.Invoicing
if (scap.StartDate <= serviceInvoicePeriod.Start)
start = serviceInvoicePeriod.Start.Value;
else
start = (DateTime)scap.StartDate; //Einzugstag wird mit abgerechnet
start = (DateTime)scap.StartDate;
if (cb2sc.SupportConcept.Customer.TerminationDate.HasValue &&
cb2sc.SupportConcept.Customer.TerminationDate.Value <= scap.EndDate.Value
&& cb2sc.SupportConcept.Customer.TerminationDate >= scap.StartDate.Value)
{
ende = cb2sc.SupportConcept.Customer.TerminationDate.Value.AddDays(-1); //Auszugstag wird NICHT abgerechnet
}
if (scap.EndDate >= serviceInvoicePeriod.End)
ende = serviceInvoicePeriod.End.Value;
else

23
ReportImp/Wabe/Invoicing/CollectiveInvoiceCreation.cs
View File

@@ -101,13 +101,30 @@ namespace Wabe.Invoicing
DateTime start;
DateTime ende;
if (scap.StartDate <= serviceInvoicePeriod.Start)
{
start = serviceInvoicePeriod.Start.Value;
}
else
{
start = (DateTime)scap.StartDate; //Einzugstag wird mit abgerechnet
if (scap.EndDate >= serviceInvoicePeriod.End)
ende = serviceInvoicePeriod.End.Value;
}
if (cb2sc.SupportConcept.Customer.TerminationDate.HasValue &&
cb2sc.SupportConcept.Customer.TerminationDate.Value <= scap.EndDate.Value
&& cb2sc.SupportConcept.Customer.TerminationDate >= scap.StartDate.Value)
{
ende = cb2sc.SupportConcept.Customer.TerminationDate.Value.AddDays(-1); // finaler Auszugstag wird NICHT abgerechnet
}
else
ende = (DateTime)scap.EndDate.Value.AddDays(-1); //Auszugstag wird NICHT abgerechnet
{
if (scap.EndDate >= serviceInvoicePeriod.End)
{
ende = serviceInvoicePeriod.End.Value;
}
else
{
ende = (DateTime)scap.EndDate.Value;
}
}
decimal tagessatz = 0;
var crList = scap.ServiceCategory.CostRatePeriods;