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

DiakoneKKKleve InvoiceCreation - im wesentlichen FK

Browse Source
This commit is contained in:
Alexandra
2023-09-27 17:29:52 +02:00
parent c95b62cd0f
commit b459e14aaf
6 changed files with 110 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ReportImp/DiakonieKKKleve/Finanzauswertung.cs
View File

@@ -299,7 +299,14 @@ namespace BeWo.DiakonieKKKleve
fkRo.StundenNichtFehlkontakte = f.StundenNichtFehlkontakte;
fkRo.StundenFehlkontakteInReportTimeSpan = f.StundenFehlkontakteInReportTimeSpan;
fkRo.StundenNichtFehlkontakteInReportTimeSpan = f.StundenNichtFehlkontakteInReportTimeSpan;
fkRo.CostBearerName = f.CostBearerName;
if (!f.CostBearerName.Contains("LVR"))
{
f.AmountFehlkontakteInReportTimeSpan = f.AmountFehlkontakteInReportTimeSpan / 1.2m;
f.AmountInReportTimeSpan = fkRo.AmountFehlkontakteInReportTimeSpan + fkRo.AmountFehlkontakteInReportTimeSpan;
}
fkRo.AmountFehlkontakteInReportTimeSpan = f.AmountFehlkontakteInReportTimeSpan;
fkRo.AmountInReportTimeSpan = f.AmountInReportTimeSpan;
fkRo.AmountNichtFehlkontakteInReportTimeSpan = f.AmountNichtFehlkontakteInReportTimeSpan;
fkRo.CostBearerName = f.CostBearerName;
fkRo.CustomerName = f.CustomerName;
@@ -307,8 +314,6 @@ namespace BeWo.DiakonieKKKleve
fkRo.Costbearer2Supportconcept = f.Costbearer2Supportconcept;
fkRo.ApprovedHours = f.ApprovedHours;
fkRo.ApprovedHoursInReportTimeSpan = f.ApprovedHoursInReportTimeSpan;
fkRo.AmountInReportTimeSpan = f.AmountInReportTimeSpan;
roFehlKontakte.SupportConceptFinanceList.Add(f);
}

14
ReportImp/DiakonieKKKleve/Invoicing/DiakoneKKKleveDefaultInvoiceCreation.cs
View File

@@ -12,6 +12,20 @@ namespace DiakonieKKKleve.Invoicing
{
public class DiakoneKKKleveDefaultInvoiceCreation : InvoiceCreation
{
public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, Calculations calc)
{
var ii = base.CreateInvoiceItem(iServiceRecord, scap, calc);
//alle Preise außer LVR werden inkl. Faktor von denen eingetragen - funktioniert natürlich nicht für Fehlkontakte :-(
if (!scap.CostBearer2SupportConcept.CostBearer.Organisation.Name.Contains("LVR") && ii.ItemDescription.Contains("Fehlkontakt"))
{
ii.AmountPerUnit = ii.AmountPerUnit / 1.2m;
ii.AmountTotal = ii.AmountPerUnit * ii.UnitCount;
ii.GrossAmountTotal = ii.AmountTotal;
}
return ii;
}
public override IList<InvoiceItem> CreateSummaryInvoiceItems(IList<InvoiceItem> itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap,
Calculations calc)
{

2
ReportImp/DiakonieKKKleve/Invoicing/DiakoneKKKleveSoziotherapieInvoiceCreation.cs
View File

@@ -86,7 +86,7 @@ namespace DiakonieKKKleve.Invoicing
{
ii.UnitDescription = "GPos: 2001607";
}
if (ii.ItemDescription.ToLower().Contains("gruppentherapie"))
else if (ii.ItemDescription.ToLower().Contains("gruppentherapie"))
{
ii.UnitDescription = "GPos: 2002672";
}

30
ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.cs
View File

@@ -60,6 +60,7 @@ namespace BeWo.DiakonieKKKleve
{
gesamtGruppe += s.Minutes;
s.ServiceDescription = "E";
s.Notice5 = "2002672";
}
else
{
@@ -69,11 +70,32 @@ namespace BeWo.DiakonieKKKleve
if (s.ServiceDescription.Contains("Video"))
{
s.ServiceDescription = "V";
if (s.Minutes <= 30)
{
s.Notice5 = "2001615";
}
else
{
s.Notice5 = "2001616";
}
}
else if (s.ServiceDescription.Contains("Telefon"))
{
s.ServiceDescription = "T";
if (s.Minutes <= 30)
{
s.Notice5 = "2001618";
}
else
{
s.Notice5 = "2001617";
}
}
else if (s.ServiceDescription.Contains("Probe"))
{
s.Notice5 = "2001607";
}
else if (s.ServiceDescription.Contains("Einrichtung") || s.ServiceDescription == "E" || s.ServiceDescription.Contains("Gruppe"))
{
s.ServiceDescription = "E";
@@ -81,6 +103,14 @@ namespace BeWo.DiakonieKKKleve
else
{
s.ServiceDescription = "A";
if (s.Minutes <= 30)
{
s.Notice5 = "2001612";
}
else
{
s.Notice5 = "2001610";
}
}
}
}

2
ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.designer.cs generated
View File

@@ -309,7 +309,7 @@ namespace BeWo.DiakonieKKKleve
// xrTableCell12
//
this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldArt")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice5")});
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Weight = 0.138888903265244D;
//

114
ReportImp/DiakonieKKKleve/ServiceInvoiceReport.Designer.cs generated
View File

@@ -52,12 +52,6 @@ namespace BeWo.DiakonieKKKleve
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.fieldMinuten = new DevExpress.XtraReports.UI.CalculatedField();
this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
this.lblKonto = new DevExpress.XtraReports.UI.XRLabel();
@@ -73,12 +67,18 @@ namespace BeWo.DiakonieKKKleve
this.lblFaktorMinuten = new DevExpress.XtraReports.UI.XRLabel();
this.lblGesamtMinuten = new DevExpress.XtraReports.UI.XRLabel();
this.lblZwischensumme = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.fieldMinuten = new DevExpress.XtraReports.UI.CalculatedField();
this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText();
((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -282,54 +282,6 @@ namespace BeWo.DiakonieKKKleve
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell3.Weight = 1D;
//
// fieldMinuten
//
this.fieldMinuten.DataMember = "ServiceInvoicePeriods.ServiceInvoiceItems";
this.fieldMinuten.Expression = "[UnitCount] * 60";
this.fieldMinuten.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldMinuten.Name = "fieldMinuten";
//
// xrRichText2
//
this.xrRichText2.Font = new System.Drawing.Font("Verdana", 10F);
this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(411.33F, 5F);
this.xrRichText2.Name = "xrRichText2";
this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
this.xrRichText2.SizeF = new System.Drawing.SizeF(73.95831F, 155.2917F);
//
// xrRichText1
//
this.xrRichText1.Font = new System.Drawing.Font("Verdana", 10F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(495.71F, 10F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
this.xrRichText1.SizeF = new System.Drawing.SizeF(182.2917F, 155.2917F);
//
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrRichText3,
this.xrRichText1,
this.xrRichText2,
this.lblAddress});
this.GroupHeader1.Font = new System.Drawing.Font("Arial", 12F);
this.GroupHeader1.HeightF = 165.2917F;
this.GroupHeader1.Level = 1;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
// xrRichText3
//
this.xrRichText3.Font = new System.Drawing.Font("Verdana", 10F);
this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrRichText3.Name = "xrRichText3";
this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString");
this.xrRichText3.SizeF = new System.Drawing.SizeF(404.0417F, 13.625F);
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -372,7 +324,7 @@ namespace BeWo.DiakonieKKKleve
this.lblKonto.SizeF = new System.Drawing.SizeF(676.833F, 139.7222F);
this.lblKonto.StylePriority.UseFont = false;
this.lblKonto.Text = "Zahlungsziel 14 Tage nach Rechnungsdatum\r\n\r\nBitte überweisen Sie den Betrag auf u" +
"nser Konto IBAN DE95 3206 1384 0009 9910 18\r\nbei der Volksbank an der Niers e.V." +
"nser Konto IBAN DE13 3206 1384 5103 3680 16\r\nbei der Volksbank an der Niers e.V." +
"\r\n\r\nFreundliche Grüße";
//
// lblRechnungsbetragText2
@@ -533,6 +485,54 @@ namespace BeWo.DiakonieKKKleve
this.lblZwischensumme.Text = "Zwischensumme";
this.lblZwischensumme.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// fieldMinuten
//
this.fieldMinuten.DataMember = "ServiceInvoicePeriods.ServiceInvoiceItems";
this.fieldMinuten.Expression = "[UnitCount] * 60";
this.fieldMinuten.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldMinuten.Name = "fieldMinuten";
//
// xrRichText2
//
this.xrRichText2.Font = new System.Drawing.Font("Verdana", 10F);
this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(411.33F, 5F);
this.xrRichText2.Name = "xrRichText2";
this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
this.xrRichText2.SizeF = new System.Drawing.SizeF(73.95831F, 155.2917F);
//
// xrRichText1
//
this.xrRichText1.Font = new System.Drawing.Font("Verdana", 10F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(495.71F, 10F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
this.xrRichText1.SizeF = new System.Drawing.SizeF(182.2917F, 155.2917F);
//
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrRichText3,
this.xrRichText1,
this.xrRichText2,
this.lblAddress});
this.GroupHeader1.Font = new System.Drawing.Font("Arial", 12F);
this.GroupHeader1.HeightF = 165.2917F;
this.GroupHeader1.Level = 1;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
// xrRichText3
//
this.xrRichText3.Font = new System.Drawing.Font("Verdana", 10F);
this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrRichText3.Name = "xrRichText3";
this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString");
this.xrRichText3.SizeF = new System.Drawing.SizeF(404.0417F, 13.625F);
//
// ServiceInvoiceReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -557,10 +557,10 @@ namespace BeWo.DiakonieKKKleve
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}