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

cb

Browse Source
This commit is contained in:
Christian
2022-06-08 11:59:49 +02:00
parent 3f91eb9dfd
commit 253b7f87e2
16 changed files with 409 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
BeWo/View/Report/FLSReport/FLSReportView.xaml.cs
View File

@@ -895,9 +895,18 @@ namespace BeWo.View.Report.FLSReport
content.Add(sr.Start.Value.ToShortDateString());
if (sr.Start != null && sr.Start.Value.Second == 0)
{
content.Add(sr.Start.Value.ToShortTimeString());
//content.Add(sr.Start.Value.AddMinutes((double)sr.RoundedDuration).ToShortTimeString());
content.Add(string.Format("TEST DURATIONXXX 7"));
var contentVorher = sr.Start.Value.ToShortTimeString();
content.Add(String.Format("{0:HH:mm}", sr.Start));
content.Add(String.Format("{0:HH:mm}", sr.End));
//lbl.Content = sr.DateTimeRange;
//if (contentVorher != sr.DateTimeRange)
//{
// int test = 0;
//}
}
else
{
@@ -905,9 +914,8 @@ namespace BeWo.View.Report.FLSReport
content.Add(string.Empty);
}
//content.Add(String.Format("{0}", (int)sr.RoundedDuration));
content.Add(string.Format("TEST DURATIONXXX 8"));
content.Add(String.Format("{0}", (int)sr.RoundedDuration));
if (this._FLSOverview.FLSOverviewConfig.ShowOnlyTotalRows)
{
content.Add(sr.GroupName);

27
BeWoAllReports.sln
View File

@@ -718,6 +718,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MuenchenerAidsHilfeEV", "Re
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PerspektivenEV", "ReportImp\PerspektivenEV\PerspektivenEV.csproj", "{443E3556-DDEC-42DE-A97E-FD394579A1B3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CaritasverbandDuerenJuelichEV", "ReportImp\CaritasverbandDuerenJuelichEV\CaritasverbandDuerenJuelichEV.csproj", "{86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET
@@ -8717,6 +8719,30 @@ Global
{443E3556-DDEC-42DE-A97E-FD394579A1B3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{443E3556-DDEC-42DE-A97E-FD394579A1B3}.Release|x86.ActiveCfg = Release|Any CPU
{443E3556-DDEC-42DE-A97E-FD394579A1B3}.Release|x86.Build.0 = Release|Any CPU
{86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB}.Debug|.NET.ActiveCfg = Debug|Any CPU
{86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB}.Debug|.NET.Build.0 = Debug|Any CPU
{86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB}.Debug|x86.ActiveCfg = Debug|Any CPU
{86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB}.Debug|x86.Build.0 = Debug|Any CPU
{86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
{86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB}.DebugRemote|.NET.Build.0 = Debug|Any CPU
{86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
{86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
{86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
{86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
{86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
{86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB}.DebugRemote|x86.Build.0 = Debug|Any CPU
{86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB}.Release|.NET.ActiveCfg = Release|Any CPU
{86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB}.Release|.NET.Build.0 = Release|Any CPU
{86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB}.Release|Any CPU.Build.0 = Release|Any CPU
{86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB}.Release|x86.ActiveCfg = Release|Any CPU
{86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -9074,6 +9100,7 @@ Global
{AA0D5E5F-9690-4EDA-B1D8-7C883CC63DE4} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{F781BCF9-647F-441E-A3BD-9DC1FDBCA1A4} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{443E3556-DDEC-42DE-A97E-FD394579A1B3} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB} = {D8A691C5-146D-4613-86CC-438F02FE9106}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9}

35
ReportImp/AlphaEv/CustomMitarbeiterstundenkontoBerechnung.cs
View File

@@ -44,6 +44,7 @@ namespace AlphaEv
}
empDetail.FlsIst = empDetail.Custom1 + empDetail.Custom2;
empDetail.FlsSoll = (empDetail.StundenSollOhneUrlaubKrankheit - empDetail.Custom4) * 0.75m;
empDetail.StundenMittelbarIst = empDetail.StundenGesamtIst - empDetail.FlsIst;
empDetail.FlsDiff = empDetail.StundenGesamtIst - empDetail.StundenSollOhneUrlaubKrankheit;
//empDetail.FlsDiff = Math.Round(empDetail.FlsDiff, 2, MidpointRounding.AwayFromZero) * (4m / 3m);
@@ -334,7 +335,11 @@ namespace AlphaEv
empDetail.Custom4 += (item.RoundedDuration / 60);
//}
ath.StundenSonstiges += item.RoundedDuration / 60;
if (item.Start.Value < new DateTime(2022, 1, 1))
{
ath.StundenSonstiges += item.RoundedDuration / 60;
}
}
}
}
@@ -402,6 +407,34 @@ namespace AlphaEv
return sum;
}
public override bool ShouldCreateDayDetails()
{
return true;
}
public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed)
{
var dd = base.CreateDayDetail(date, ed);
DateTime stichtag = new DateTime(2022, 7, 1);
if (dd.Date >= stichtag)
{
dd.MaxHoursUntilBreak = 6;
dd.MaxHoursUntilBreak2 = 9;
dd.BreakMinutes = 30;
dd.BreakMinutes2 = 15;
}
else
{
dd.MaxHoursUntilBreak = null;
dd.MaxHoursUntilBreak2 = null;
dd.BreakMinutes = null;
dd.BreakMinutes2 = null;
}
return dd;
}
//protected override decimal? BerechneUeberstunden(MitarbeiterstundenkontoRO.EmployeeDetail ed, decimal? ueberstundenStd, Contract contract, DateTime start,
// DateTime ende)
//{

6
ReportImp/AlphaEv/MitarbeiterstundenkontoJahr.cs
View File

@@ -54,9 +54,9 @@ namespace AlphaEv
ed.EmployeeDetail.Custom8 = gesamtProzent;
ed.EmployeeDetail.Custom7 = ed.EmployeeDetail.StundenSollOhneUrlaubKrankheit * 0.25m;
ed.EmployeeDetail.Custom11 = (info.Custom2 ?? 0) + (ed.EmployeeDetail.FlsIst + (ed.EmployeeDetail.FlsIst / 0.75m * 0.25m)) - ed.EmployeeDetail.StundenSollOhneUrlaubKrankheit;
//ed.EmployeeDetail.Custom7 = (ed.EmployeeDetail.StundenSollOhneUrlaubKrankheit * 0.25m;
ed.EmployeeDetail.Custom7 = (ed.EmployeeDetail.StundenSollOhneUrlaubKrankheit - ed.EmployeeDetail.Custom4) * 0.25m;
ed.EmployeeDetail.Custom11 = (info.Custom2 ?? 0) + (ed.EmployeeDetail.FlsIst + (ed.EmployeeDetail.FlsIst / 0.75m * 0.25m)) - ed.EmployeeDetail.StundenSollOhneUrlaubKrankheit;
//cellGesamt.Text = String.Format("{0:0.0}%", gesamtProzent);
info.Custom3 = ed.EmployeeDetail.SollProWoche;
info.Custom4 = ed.EmployeeDetail.SollProTag;

1
ReportImp/AwoDortmund/AwoDortmund.csproj
View File

@@ -58,6 +58,7 @@
<Compile Include="Export\DiamantExporter.cs" />
<Compile Include="Invoicing\CustomInvoiceFactory.cs" />
<Compile Include="Invoicing\DefaultInvoiceCreation.cs" />
<Compile Include="Invoicing\SoziotherapieInvoiceCreation.cs" />
<Compile Include="Mitarbeiterstundenkonto.cs">
<SubType>Component</SubType>
</Compile>

15
ReportImp/AwoDortmund/Invoicing/CustomInvoiceFactory.cs
View File

@@ -11,7 +11,20 @@ namespace AwoDortmund.Invoicing
public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
{
foreach (var list in supportConcepts2ServiceRecords.Values)
{
foreach (var sr in list)
{
var cat = sr.ServiceDescription.Category;
if (!String.IsNullOrEmpty(cat.Name) && cat.Name.ToLower().Contains("soziotherapie"))
{
return new SoziotherapieInvoiceCreation();
}
}
}
return new DefaultInvoiceCreation();
}

26
ReportImp/AwoDortmund/Invoicing/DefaultInvoiceCreation.cs
View File

@@ -17,6 +17,32 @@ namespace AwoDortmund.Invoicing
{
public class DefaultInvoiceCreation : InvoiceCreation
{
public override void CreateFixedAmounts(ServiceInvoicePeriod serviceInvoicePeriod, SupportConceptApprovalPeriodDC supportConceptApprovalPeriod, CostBearer2SupportConcept cb2sc)
{
var calc = PluginLoader.FindClass<Calculations>(_SpecificID) ?? Calculations.GetInstance(_SpecificID);
var data = calc.GetFixedBillingData(supportConceptApprovalPeriod, serviceInvoicePeriod.Start, serviceInvoicePeriod.End);
foreach (var billingData in data)
{
var ii = new InvoiceItem
{
AmountTotal = billingData.AmountTotal,
GrossAmountTotal = billingData.GrossAmountTotal,
ItemPeriodStart = billingData.BillingPeriodStart,
ItemPeriodEnd = billingData.BillingPeriodEnd,
AccountingInterval = billingData.AccountingInterval,
AmountPerUnit = billingData.AmountPerUnit,
UnitCount = billingData.UnitCount
};
if (supportConceptApprovalPeriod.ServiceCategory != null)
{
ii.ItemDescription = supportConceptApprovalPeriod.ServiceCategory.Name;
ii.UnitCount = null;
}
serviceInvoicePeriod.InvoiceItemList.Add(ii);
}
}
public override IList<InvoiceItem> CreateSummaryInvoiceItems(IList<InvoiceItem> itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, Calculations calc, bool summaryPerMonth)
{

219
ReportImp/AwoDortmund/Invoicing/SoziotherapieInvoiceCreation.cs Normal file
View File

@@ -0,0 +1,219 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.Invoicing;
using BeWo.Service.Plugins;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using BS.Shared.Services;
namespace AwoDortmund.Invoicing
{
public class SoziotherapieInvoiceCreation : InvoiceCreation
{
private decimal preisSoziotherapie60min = 0;
private decimal preisSoziotherapie30min = 0;
public override void SetInvoiceId(ServiceInvoice invoice)
{
invoice.InvoiceBase.InvoiceId = "RechnungSoziotherapie";
invoice.InvoiceBase.InvoiceTypeText = "Soziotherapie";
}
//public override ServiceInvoice CreateSingleInvoice(int invoiceCounter, CostBearer costBearer, DateTimeSpan invoicePeriod, CompactSupportConceptDC supportConcept, List<ServiceRecordDC> serviceRecords)
//{
// var invoice = base.CreateSingleInvoice(invoiceCounter, costBearer, invoicePeriod, supportConcept, serviceRecords);
// if (invoicePeriod != null)
// {
// SetAmountEquityContribution(invoice);
// }
// return invoice;
//}
//public override void SetAmountEquityContribution(ServiceInvoice invoice)
//{
// decimal equity = 0;
// IList<InvoiceBase> EquityInvoiceList = DAOFactory.SearchDAO.GetInvoiceBaseByTypeAndSupportConceptOid(InvoiceType.CustomerEquity, invoice.InvoiceBase.SupportConceptOid.Value);
// EquityInvoiceList = EquityInvoiceList.Where(i =>
// {
// if (i.AccountingPeriodEnd >= invoice.InvoiceBase.AccountingPeriodStart && i.AccountingPeriodStart <= invoice.InvoiceBase.AccountingPeriodEnd)
// {
// return true;
// }
// return false;
// }).ToList();
// foreach (InvoiceBase iEquityInvoice in EquityInvoiceList)
// {
// foreach (InvoiceItem item in iEquityInvoice.InvoiceItems)
// {
// if (item.AmountTotal != null)
// {
// equity += item.AmountTotal.Value;
// }
// }
// }
// invoice.AmountEquityContribution = equity;
//}
public override void SetInvoiceItems(ServiceInvoice invoice,
ServiceInvoicePeriod serviceInvoicePeriod,
SupportConceptApprovalPeriodDC supportConceptApprovalPeriod,
CostBearer2SupportConcept cb2sc,
DateTimeSpan invoicePeriod,
List<ServiceRecordDC> serviceRecords)
{
Calculations calc = PluginLoader.FindClass<Calculations>(_SpecificID) ?? Calculations.GetInstance(_SpecificID);
List<ServiceRecordDC> serviceRecordsInPeriod = serviceRecords.Where(
i =>
{
bool valid = i.Start.Value.InBetween(serviceInvoicePeriod.Start.Value,
serviceInvoicePeriod.End.Value, true);
if (valid && serviceInvoicePeriod.SupportConceptApprovalPeriod != null && serviceInvoicePeriod.SupportConceptApprovalPeriod.ServiceCategory != null)
valid = serviceInvoicePeriod.SupportConceptApprovalPeriod.ServiceCategory.Oid ==
i.ServiceDescription.Category.ServiceCategoryOid;
return valid;
}).ToList();
var itemList = CreateInvoiceItems(serviceRecordsInPeriod, invoicePeriod, serviceInvoicePeriod.SupportConceptApprovalPeriod, calc);
serviceInvoicePeriod.InvoiceItemList.AddRange(itemList);
}
public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, Calculations calc)
{
var ii = base.CreateInvoiceItem(iServiceRecord, scap, calc);
//if (ii.ItemDescription.ToLower().Contains("probe"))
//{
// ii.UnitDescription = "GPos: 2001607";
//}
//else if (ii.ItemDescription.ToLower().Contains("telefon"))
//{
// if (iServiceRecord.RoundedDuration <= 30)
// {
// ii.UnitDescription = "GPos: 2001618";
// }
// else if (iServiceRecord.RoundedDuration > 30)
// {
// ii.UnitDescription = "GPos: 2001617";
// }
//}
//else
//{
//if (iServiceRecord.RoundedDuration <= 30)
//{
// ii.AmountPerUnit = preisSoziotherapie30min;
// ii.ItemDescription = "Soziotherapie 30 min.";
//}
//else if (iServiceRecord.RoundedDuration > 30)
//{
// ii.AmountPerUnit = preisSoziotherapie60min;
// ii.ItemDescription = "Soziotherapie 60 min.";
//}
ii.AmountPerUnit = preisSoziotherapie60min;
ii.ItemDescription = "Soziotherapie";
ii.RateFactor = null;
ii.AmountTotal = ii.AmountPerUnit * ii.UnitCount;
ii.GrossAmountTotal = ii.AmountTotal;
//}
return ii;
}
public override IList<InvoiceItem> CreateInvoiceItems(List<ServiceRecordDC> serviceRecordsInPeriod, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap,
Calculations calc)
{
var preise = DAOFactory.GenericDAO.GetAllActive<Preis>();
preisSoziotherapie60min = GetPreis(preise, "Soziotherapie 60 min", invoicePeriod.StartDate);
preisSoziotherapie30min = GetPreis(preise, "Soziotherapie 30 min", invoicePeriod.StartDate);
var list = base.CreateInvoiceItems(serviceRecordsInPeriod, invoicePeriod, scap, calc);
var ii = CreateHausbesuchspauschale(serviceRecordsInPeriod, invoicePeriod, scap);
list.AddRange(ii);
return list;
}
private static decimal GetPreis(IList<Preis> allePreise, String name, DateTime datum)
{
var tagessatz = allePreise.Where(p => p.Name.Contains(name)).FirstOrDefault();
if (tagessatz != null)
{
var crlist = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(tagessatz.CostRatePeriods);
var cr = crlist.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, datum);
if (cr != null && cr.CostRateValue.HasValue)
{
return cr.CostRateValue.Value;
}
}
return 0;
}
public virtual IList<InvoiceItem> CreateHausbesuchspauschale(List<ServiceRecordDC> serviceRecordsInPeriod, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap)
{
//Dictionary<String, int> differentDays = new Dictionary<string, int>();
IList<InvoiceItem> items = new List<InvoiceItem>();
decimal hausbesuchspauschale = 7.8m;
int countHausbesuch = 0;
foreach (var sr in serviceRecordsInPeriod)
{
if (sr.ServiceDescription.Name.ToLower().Contains("hausbesuch"))
{
countHausbesuch++;
}
}
if (countHausbesuch > 0)
{
var invoiceItem = new InvoiceItem();
//decimal anzahlHausbesuche = differentDays.Count;
decimal anzahlHausbesuche = countHausbesuch;
invoiceItem.AmountPerUnit = hausbesuchspauschale;
invoiceItem.UnitCount = anzahlHausbesuche;
invoiceItem.AmountTotal = anzahlHausbesuche * hausbesuchspauschale;
invoiceItem.ItemPeriodStart = invoicePeriod.StartDate;
invoiceItem.ItemPeriodEnd = invoicePeriod.EndDate;
invoiceItem.RateFactor = null;
invoiceItem.GrossAmountTotal = invoiceItem.AmountTotal;
invoiceItem.ItemDescription = "Hausbesuchspauschale";
//invoiceItem.UnitDescription = "GPos: 2002672";
if (scap != null)
invoiceItem.SupportConceptApprovalPeriodOid = scap.Oid;
items.Add(invoiceItem);
}
return items;
}
public override IList<InvoiceItem> CreateSummaryInvoiceItems(IList<InvoiceItem> itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, Calculations calc, bool summaryPerMonth, bool addRateFactorToUnitCount)
{
return base.CreateSummaryInvoiceItems(itemList, invoicePeriod, scap, calc, true, true);
}
}
}

70
ReportImp/AwoDortmund/ServiceInvoiceReport.Designer.cs generated
View File

@@ -34,8 +34,8 @@ namespace AwoDortmund
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
@@ -76,9 +76,9 @@ namespace AwoDortmund
this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
@@ -113,6 +113,14 @@ namespace AwoDortmund
this.topMarginBand1.HeightF = 202.2917F;
this.topMarginBand1.Name = "topMarginBand1";
//
// xrPictureBox1
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(421.0002F, 40.8333F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(214.5833F, 161.4584F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrLabel6
//
this.xrLabel6.BackColor = System.Drawing.Color.Transparent;
@@ -128,14 +136,6 @@ namespace AwoDortmund
this.xrLabel6.Text = "Arbeiterwohlfahrt\r\nUnterbezirk Dortmund\r\n";
this.xrLabel6.WordWrap = false;
//
// xrPictureBox1
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(421.0002F, 40.8333F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(214.5833F, 161.4584F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// bottomMarginBand1
//
this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -171,6 +171,7 @@ namespace AwoDortmund
// Page1
//
this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable5,
this.xrLabel6,
this.xrRichText2,
this.xrLabel7,
@@ -180,7 +181,7 @@ namespace AwoDortmund
this.xrLabel5,
this.xrLabel8,
this.lblAbrechnungszeitraum});
this.Page1.HeightF = 354.0833F;
this.Page1.HeightF = 379.0833F;
this.Page1.Name = "Page1";
this.Page1.StylePriority.UseFont = false;
//
@@ -280,7 +281,7 @@ namespace AwoDortmund
//
// xrLabel15
//
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 114.5833F);
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(2.041829F, 114.5833F);
this.xrLabel15.Name = "xrLabel15";
this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel15.SizeF = new System.Drawing.SizeF(175F, 17F);
@@ -289,7 +290,7 @@ namespace AwoDortmund
//
// xrTable4
//
this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 68.75F);
this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(2.041829F, 68.75F);
this.xrTable4.Name = "xrTable4";
this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow10,
@@ -330,7 +331,7 @@ namespace AwoDortmund
//
this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CreatorName")});
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 189.5833F);
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(2.041829F, 189.5833F);
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel14.SizeF = new System.Drawing.SizeF(225F, 17F);
@@ -340,7 +341,7 @@ namespace AwoDortmund
// xrLabel9
//
this.xrLabel9.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 43.75F);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(2.041829F, 43.75F);
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(250F, 17F);
@@ -359,14 +360,12 @@ namespace AwoDortmund
//
// Detail1
//
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable5});
this.Detail1.HeightF = 25F;
this.Detail1.HeightF = 0F;
this.Detail1.Name = "Detail1";
//
// xrTable5
//
this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 354.0833F);
this.xrTable5.Name = "xrTable5";
this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow23});
@@ -495,13 +494,11 @@ namespace AwoDortmund
// DetailReport2
//
this.DetailReport2.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail3,
this.GroupFooter1});
this.Detail3});
this.DetailReport2.DataMember = "ServiceInvoicePeriods.ServiceInvoiceItems";
this.DetailReport2.DataSource = this.bindingSource1;
this.DetailReport2.Level = 0;
this.DetailReport2.Name = "DetailReport2";
this.DetailReport2.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand;
//
// Detail3
//
@@ -630,23 +627,12 @@ namespace AwoDortmund
this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell47.Weight = 0.39881829732987356D;
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel1,
this.xrLabel9,
this.xrTable4,
this.xrLabel14,
this.xrLabel15});
this.GroupFooter1.HeightF = 206.5833F;
this.GroupFooter1.Name = "GroupFooter1";
//
// xrLabel1
//
this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim", "Gesamtsumme: {0}")});
this.xrLabel1.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(392.1249F, 0F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(394.1667F, 0F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(255.8333F, 25F);
@@ -660,6 +646,17 @@ namespace AwoDortmund
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// GroupFooter2
//
this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel15,
this.xrLabel9,
this.xrTable4,
this.xrLabel14,
this.xrLabel1});
this.GroupFooter2.HeightF = 206.5833F;
this.GroupFooter2.Name = "GroupFooter2";
//
// ServiceInvoiceReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -668,7 +665,8 @@ namespace AwoDortmund
this.topMarginBand1,
this.bottomMarginBand1,
this.Page1,
this.DetailReport});
this.DetailReport,
this.GroupFooter2});
this.DataSource = this.bindingSource1;
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -731,12 +729,12 @@ namespace AwoDortmund
private DevExpress.XtraReports.UI.XRTableCell xrTableCell46;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell47;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
private DevExpress.XtraReports.UI.XRRichText xrRichText2;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2;
}
}

10
ReportImp/AwoDortmund/ServiceInvoiceReport.cs
View File

@@ -15,7 +15,15 @@ namespace AwoDortmund
public void SetReportDataSource(ServiceInvoiceRO pRO)
{
DateTime start = pRO.AccountingPeriodStart;
if (!String.IsNullOrEmpty(pRO.CustomerName))
{
pRO.CustomerName = pRO.CustomerName.Replace("_", "");
}
if (!String.IsNullOrEmpty(pRO.CustomerSalutation) && pRO.CustomerSalutation == "Herr")
{
pRO.CustomerSalutation = "Herrn";
}
DateTime start = pRO.AccountingPeriodStart;
DateTime end = pRO.AccountingPeriodEnd;
if (start.Month == end.Month && start.Year == end.Year)
{

32
ReportImp/HphBersenbrueckFreizeitUndReisen/Rechnung.Designer.cs generated
View File

@@ -82,6 +82,7 @@ namespace HphBersenbrueckFreizeitUndReisen
this.lblAnzahl = new DevExpress.XtraReports.UI.XRTableCell();
this.lblBetrag = new DevExpress.XtraReports.UI.XRTableCell();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.lblAbschlusssatz = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
@@ -89,7 +90,6 @@ namespace HphBersenbrueckFreizeitUndReisen
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail2 = new DevExpress.XtraReports.UI.DetailBand();
this.lblAbschlusssatz = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
@@ -543,7 +543,7 @@ namespace HphBersenbrueckFreizeitUndReisen
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 40F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(686.9999F, 2.000002F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(699.7083F, 2F);
this.xrLabel1.StylePriority.UseBorderColor = false;
this.xrLabel1.StylePriority.UseBorders = false;
this.xrLabel1.StylePriority.UseFont = false;
@@ -753,6 +753,20 @@ namespace HphBersenbrueckFreizeitUndReisen
this.ReportFooter.StylePriority.UseBorderWidth = false;
this.ReportFooter.StylePriority.UseFont = false;
//
// lblAbschlusssatz
//
this.lblAbschlusssatz.BackColor = System.Drawing.Color.Transparent;
this.lblAbschlusssatz.Font = new System.Drawing.Font("Arial", 8F);
this.lblAbschlusssatz.LocationFloat = new DevExpress.Utils.PointFloat(2.291667F, 60F);
this.lblAbschlusssatz.Multiline = true;
this.lblAbschlusssatz.Name = "lblAbschlusssatz";
this.lblAbschlusssatz.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblAbschlusssatz.SizeF = new System.Drawing.SizeF(699.7083F, 27.00003F);
this.lblAbschlusssatz.StylePriority.UseBackColor = false;
this.lblAbschlusssatz.StylePriority.UseFont = false;
this.lblAbschlusssatz.StylePriority.UseTextAlignment = false;
this.lblAbschlusssatz.WordWrap = false;
//
// xrLabel20
//
this.xrLabel20.BackColor = System.Drawing.Color.Transparent;
@@ -850,20 +864,6 @@ namespace HphBersenbrueckFreizeitUndReisen
this.Detail2.HeightF = 25F;
this.Detail2.Name = "Detail2";
//
// lblAbschlusssatz
//
this.lblAbschlusssatz.BackColor = System.Drawing.Color.Transparent;
this.lblAbschlusssatz.Font = new System.Drawing.Font("Arial", 8F);
this.lblAbschlusssatz.LocationFloat = new DevExpress.Utils.PointFloat(2.291667F, 60F);
this.lblAbschlusssatz.Multiline = true;
this.lblAbschlusssatz.Name = "lblAbschlusssatz";
this.lblAbschlusssatz.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblAbschlusssatz.SizeF = new System.Drawing.SizeF(699.7083F, 27.00003F);
this.lblAbschlusssatz.StylePriority.UseBackColor = false;
this.lblAbschlusssatz.StylePriority.UseFont = false;
this.lblAbschlusssatz.StylePriority.UseTextAlignment = false;
this.lblAbschlusssatz.WordWrap = false;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);

1
ReportImp/LebenshilfeDuisburgHPFH/Stundenkonto/CustomMitarbeiterstundenkontoBerechnungMonate.cs
View File

@@ -11,7 +11,6 @@ namespace LebenshilfeDuisburg.Stundenkonto
{
public class CustomMitarbeiterstundenkontoBerechnungMonate : MitarbeiterstundenkontoBerechnungMonate
{
public override MitarbeiterstundenkontoBerechnung CreateMitarbeiterstundenkontoBerechnung()
{
return new CustomMitarbeiterstundenkontoBerechnungTagesansicht();

1
ReportImp/PerspektivenEV/PerspektivenEV.csproj
View File

@@ -118,7 +118,6 @@
<EmbeddedResource Include="CollectiveBillingReportTab.resx">
<DependentUpon>CollectiveBillingReportTab.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="Quittierungsbeleg.resx">
<DependentUpon>Quittierungsbeleg.cs</DependentUpon>
<SubType>Designer</SubType>

6
ReportImp/PraxisPusteblume/IfsSammelRechnung.cs
View File

@@ -270,7 +270,11 @@ namespace PraxisPusteblume
{
preisTeam = 11.63m;
}
if (pRO.AccountingPeriodStart >= new DateTime(2022, 5, 1))
{
preisTeam = 11.77m;
preisGruppe = 35.22m;
}
if (DateTime.Now >= new DateTime(2021, 8, 17))
{
preisInvest = 6.86m;

4
ReportImp/PraxisPusteblume/Invoicing/IFSSammelInvoiceCreation.cs
View File

@@ -163,6 +163,10 @@ namespace PraxisPusteblume.Invoicing
{
betrag = 11.63m;
}
if (invoicePeriod.StartDateTime >= new DateTime(2022, 5, 1))
{
betrag = 11.77m;
}
var invoiceItem = new InvoiceItem();
invoiceItem.AmountPerUnit = betrag;

5
Service/Plugins/PluginLoader.cs
View File

@@ -90,7 +90,7 @@ namespace BeWo.Service.Plugins
//t = "5700328131"; // Betreutes Wohnen St. Ludgerus Essen-Werden
//t = "1907984777"; // Soziale Dienste Katrin Schmidt
//t = "9033246467"; // SKM Menden
t = "9290510010"; // Soziale Dienste Schilling (ehemals BeWo Schilling)
//t = "9290510010"; // Soziale Dienste Schilling (ehemals BeWo Schilling)
//t = "5251218094"; // KOMO e.V.
//t = "3529871747"; // Vivat gemeinnützige GmbH
//t = "8561513464"; // Caritasverband Wuppertal/Solingen
@@ -280,7 +280,8 @@ namespace BeWo.Service.Plugins
//t = "8283849714"; // Forum e.V. (proviel GmbH)
//t = "3915346496"; // Sprungbrett 2. DB (Haus Theresia)
//t = "2387527289"; // Lebenshilfe Duisburg HPFH
t = "5595701056"; // Domiziel Ansbach
t = "2314784470"; // Lebenshilfe Duisburg BeWo
//t = "5595701056"; // Domiziel Ansbach
//t = "9430188510"; // Pro INTEGRA
//t = "4820371076"; // Zuhause Wohnen Iris Thimm
//t = "1078667960"; // FAM Rhein-Sieg Gbr