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

Pusteblume OBASammel

Browse Source 
RatPlusTat und SBBMainz Quittierungsbelege
This commit is contained in:
Alexandra
2021-11-22 14:32:00 +01:00
parent 8b1c6e1838
commit a5704382b6
10 changed files with 97 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
ReportImp/PraxisPusteblume/Invoicing/OBASammelInvoiceCreation.cs
View File

@@ -48,37 +48,6 @@ namespace PraxisPusteblume.Invoicing
return result.Count > 1 ? result.OrderBy(i => i.InvoiceBase.CustomerLastName).ToList() : result;
//var costBearer = DAOFactory.GenericDAO.LoadByID<CostBearer>(costBearerOid);
//var result = new List<ServiceInvoiceDC>();
//var invoiceList = new List<ServiceInvoice>();
//int invoiceCounter = 0;
//foreach (var iSupportConcept2ServiceRecords in supportConcepts2ServiceRecords)
//{
// var splitList = SplitServiceRecordsToInvoiceType(iSupportConcept2ServiceRecords.Value);
// foreach (var data in splitList)
// {
// var invoice = CreateSingleInvoice(invoiceCounter, costBearer, invoicePeriod, iSupportConcept2ServiceRecords.Key, data.ServiceRecords);
// invoice.InvoiceBase.InvoiceId = data.InvoiceId;
// invoice.InvoiceBase.InvoiceTypeText = data.Title;
// invoiceList.Add(invoice);
// invoiceCounter++;
// }
//}
//foreach (var item in invoiceList)
//{
// result.Add(MapperFactory.ServiceInvoiceDC_ServiceInvoice.MapToNewDC(item));
//}
//if (result.Count > 1)
// return result.OrderBy(i => i.InvoiceBase.CustomerLastName).ToList();
//else
// return result;
}
private IList<InvoiceData> SplitServiceRecordsToInvoiceType(List<ServiceRecordDC> allRecords)
{
@@ -120,14 +89,14 @@ namespace PraxisPusteblume.Invoicing
{
base.SetInvoiceItems(invoice, serviceInvoicePeriod, scap, cb2sc, invoicePeriod, serviceRecords);
if (serviceInvoicePeriod.InvoiceItemList != null && serviceInvoicePeriod.InvoiceItemList.Count > 0)
{
var item = CreateTeamSitzungInvoiceItem(scap, invoicePeriod);
if (item != null)
{
serviceInvoicePeriod.InvoiceItemList.Add(item);
}
}
//if (serviceInvoicePeriod.InvoiceItemList != null && serviceInvoicePeriod.InvoiceItemList.Count > 0)
//{
// var item = CreateTeamSitzungInvoiceItem(scap, invoicePeriod);
// if (item != null)
// {
// serviceInvoicePeriod.InvoiceItemList.Add(item);
// }
//}
if (serviceInvoicePeriod.InvoiceItemList != null && serviceInvoicePeriod.InvoiceItemList.Count > 0)
{
@@ -147,34 +116,38 @@ namespace PraxisPusteblume.Invoicing
}
private InvoiceItem CreateTeamSitzungInvoiceItem(SupportConceptApprovalPeriodDC scap, DateTimeSpan invoicePeriod)
{
decimal betrag = 10.88m;
//private InvoiceItem CreateTeamSitzungInvoiceItem(SupportConceptApprovalPeriodDC scap, DateTimeSpan invoicePeriod)
//{
//decimal betrag = 10.88m;
if (invoicePeriod.StartDateTime >= new DateTime(2019, 4, 1))
{
betrag = 11.26m;
}
if (invoicePeriod.StartDateTime >= new DateTime(2020, 3, 1))
{
betrag = 11.38m;
}
var invoiceItem = new InvoiceItem();
invoiceItem.AmountPerUnit = betrag;
invoiceItem.UnitCount = 1;
invoiceItem.AmountTotal = invoiceItem.AmountPerUnit;
invoiceItem.RateFactor = null;
invoiceItem.ItemPeriodStart = invoicePeriod.StartDate;
invoiceItem.ItemPeriodEnd = invoicePeriod.EndDate;
invoiceItem.GrossAmountTotal = invoiceItem.AmountTotal;
invoiceItem.ItemDescription = String.Format("Team");
//if (invoicePeriod.StartDateTime >= new DateTime(2019, 4, 1))
//{
// betrag = 11.26m;
//}
//if (invoicePeriod.StartDateTime >= new DateTime(2020, 3, 1))
//{
// betrag = 11.38m;
//}
//if (invoicePeriod.StartDateTime >= new DateTime(2021, 5, 1))
//{
// betrag = 0.00m;
//}
//var invoiceItem = new InvoiceItem();
//invoiceItem.AmountPerUnit = betrag;
//invoiceItem.UnitCount = 1;
//invoiceItem.AmountTotal = invoiceItem.AmountPerUnit;
//invoiceItem.RateFactor = null;
//invoiceItem.ItemPeriodStart = invoicePeriod.StartDate;
//invoiceItem.ItemPeriodEnd = invoicePeriod.EndDate;
//invoiceItem.GrossAmountTotal = invoiceItem.AmountTotal;
//invoiceItem.ItemDescription = String.Format("Team");
if (scap != null)
invoiceItem.SupportConceptApprovalPeriodOid = scap.SupportConceptApprovalPeriodOid;
//if (scap != null)
// invoiceItem.SupportConceptApprovalPeriodOid = scap.SupportConceptApprovalPeriodOid;
return invoiceItem;
//return invoiceItem;
}
//}
private InvoiceItem CreateInvestInvoiceItem(SupportConceptApprovalPeriodDC scap, DateTimeSpan invoicePeriod, decimal count)
{

163
ReportImp/PraxisPusteblume/ObaSammelRechnung.Designer.cs generated
View File

@@ -48,10 +48,9 @@ namespace PraxisPusteblume
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellPreisAmbulant = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellPreisTeam = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellPreisInvest = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -65,10 +64,9 @@ namespace PraxisPusteblume
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -80,10 +78,9 @@ namespace PraxisPusteblume
this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -91,9 +88,6 @@ namespace PraxisPusteblume
this.fieldGruppe = new DevExpress.XtraReports.UI.CalculatedField();
this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrRichText4 = new DevExpress.XtraReports.UI.XRRichText();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
@@ -209,14 +203,13 @@ namespace PraxisPusteblume
//
// xrTable3
//
this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable3.Name = "xrTable3";
this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow14});
this.xrTable3.SizeF = new System.Drawing.SizeF(998.3366F, 40F);
this.xrTable3.SizeF = new System.Drawing.SizeF(994.3366F, 40F);
this.xrTable3.StylePriority.UseBorderColor = false;
this.xrTable3.StylePriority.UseBorders = false;
this.xrTable3.StylePriority.UseFont = false;
@@ -233,8 +226,6 @@ namespace PraxisPusteblume
this.xrTableCell4,
this.xrTableCell1,
this.cellPreisAmbulant,
this.xrTableCell22,
this.cellPreisTeam,
this.xrTableCell24,
this.cellPreisInvest,
this.xrTableCell26});
@@ -265,7 +256,7 @@ namespace PraxisPusteblume
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.StylePriority.UseTextAlignment = false;
this.xrTableCell16.Text = "Name";
this.xrTableCell16.Weight = 0.19871786678639977D;
this.xrTableCell16.Weight = 0.30769231759013815D;
//
// xrTableCell18
//
@@ -273,13 +264,20 @@ namespace PraxisPusteblume
this.xrTableCell18.Name = "xrTableCell18";
this.xrTableCell18.StylePriority.UseTextAlignment = false;
this.xrTableCell18.Text = "Vorname";
this.xrTableCell18.Weight = 0.19872308530924671D;
this.xrTableCell18.Weight = 0.29897941478425422D;
//
// xrTableCell4
//
this.xrTableCell4.Multiline = true;
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.Text = "Datum\r\n";
this.xrTableCell4.Weight = 0.10769231419732427D;
//
// xrTableCell1
//
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Text = "OBA";
this.xrTableCell1.Weight = 0.10769231246325929D;
this.xrTableCell1.Weight = 0.10769231246325928D;
//
// cellPreisAmbulant
//
@@ -289,28 +287,13 @@ namespace PraxisPusteblume
this.cellPreisAmbulant.StylePriority.UsePadding = false;
this.cellPreisAmbulant.StylePriority.UseTextAlignment = false;
this.cellPreisAmbulant.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.cellPreisAmbulant.Weight = 0.10769231246325946D;
//
// xrTableCell22
//
this.xrTableCell22.Name = "xrTableCell22";
this.xrTableCell22.Text = "Team";
this.xrTableCell22.Weight = 0.1076923124632589D;
//
// cellPreisTeam
//
this.cellPreisTeam.Name = "cellPreisTeam";
this.cellPreisTeam.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F);
this.cellPreisTeam.StylePriority.UsePadding = false;
this.cellPreisTeam.StylePriority.UseTextAlignment = false;
this.cellPreisTeam.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.cellPreisTeam.Weight = 0.1076923124632589D;
this.cellPreisAmbulant.Weight = 0.1076923124632595D;
//
// xrTableCell24
//
this.xrTableCell24.Name = "xrTableCell24";
this.xrTableCell24.Text = "Invest";
this.xrTableCell24.Weight = 0.10769231248881568D;
this.xrTableCell24.Weight = 0.10769231248881564D;
//
// cellPreisInvest
//
@@ -329,7 +312,7 @@ namespace PraxisPusteblume
this.xrTableCell26.StylePriority.UseTextAlignment = false;
this.xrTableCell26.Text = "Summe";
this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell26.Weight = 0.1076923124632589D;
this.xrTableCell26.Weight = 0.10769231246325894D;
//
// DetailReport
//
@@ -377,7 +360,7 @@ namespace PraxisPusteblume
this.xrTable1.Name = "xrTable1";
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
this.xrTable1.SizeF = new System.Drawing.SizeF(998.3366F, 20F);
this.xrTable1.SizeF = new System.Drawing.SizeF(994.3365F, 20F);
this.xrTable1.StylePriority.UseBorderColor = false;
this.xrTable1.StylePriority.UseBorders = false;
this.xrTable1.StylePriority.UseFont = false;
@@ -394,8 +377,6 @@ namespace PraxisPusteblume
this.xrTableCell9,
this.xrTableCell7,
this.xrTableCell8,
this.xrTableCell15,
this.xrTableCell17,
this.xrTableCell19,
this.xrTableCell20,
this.xrTableCell21});
@@ -431,7 +412,7 @@ namespace PraxisPusteblume
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "Name";
this.xrTableCell5.Weight = 0.1987178667863998D;
this.xrTableCell5.Weight = 0.30769224716495414D;
//
// xrTableCell6
//
@@ -440,14 +421,21 @@ namespace PraxisPusteblume
this.xrTableCell6.Multiline = true;
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.StylePriority.UseTextAlignment = false;
this.xrTableCell6.Weight = 0.19872306183418542D;
this.xrTableCell6.Weight = 0.29897946173437695D;
//
// xrTableCell9
//
this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.SupportConceptApprovalPeriod.EndDate", "{0:dd.MM.yyyy}")});
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.Weight = 0.10769222029707903D;
//
// xrTableCell7
//
this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.HourlyRate", "{0:0.##}")});
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Weight = 0.10769231246325936D;
this.xrTableCell7.Weight = 0.10538471393395971D;
//
// xrTableCell8
//
@@ -459,32 +447,14 @@ namespace PraxisPusteblume
this.xrTableCell8.StylePriority.UsePadding = false;
this.xrTableCell8.StylePriority.UseTextAlignment = false;
this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell8.Weight = 0.10769231246325936D;
//
// xrTableCell15
//
this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.UnitCount", "{0:0.##}")});
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.Weight = 0.10769231246325892D;
//
// xrTableCell17
//
this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.UnitCountString")});
this.xrTableCell17.Name = "xrTableCell17";
this.xrTableCell17.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F);
this.xrTableCell17.StylePriority.UsePadding = false;
this.xrTableCell17.StylePriority.UseTextAlignment = false;
this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell17.Weight = 0.10769231246325892D;
this.xrTableCell8.Weight = 0.11000000489280434D;
//
// xrTableCell19
//
this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.UnitDescription")});
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.Weight = 0.1076923124888157D;
this.xrTableCell19.Weight = 0.10769221858857034D;
//
// xrTableCell20
//
@@ -495,7 +465,7 @@ namespace PraxisPusteblume
this.xrTableCell20.StylePriority.UsePadding = false;
this.xrTableCell20.StylePriority.UseTextAlignment = false;
this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell20.Weight = 0.10769231250159414D;
this.xrTableCell20.Weight = 0.10769221860134876D;
//
// xrTableCell21
//
@@ -506,7 +476,7 @@ namespace PraxisPusteblume
this.xrTableCell21.StylePriority.UsePadding = false;
this.xrTableCell21.StylePriority.UseTextAlignment = false;
this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell21.Weight = 0.10769233593832017D;
this.xrTableCell21.Weight = 0.10769242983856553D;
//
// GroupHeader2
//
@@ -524,14 +494,13 @@ namespace PraxisPusteblume
//
// xrTable2
//
this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable2.Name = "xrTable2";
this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2});
this.xrTable2.SizeF = new System.Drawing.SizeF(998.3366F, 20F);
this.xrTable2.SizeF = new System.Drawing.SizeF(994.3365F, 20F);
this.xrTable2.StylePriority.UseBorderColor = false;
this.xrTable2.StylePriority.UseBorders = false;
this.xrTable2.StylePriority.UseFont = false;
@@ -548,8 +517,6 @@ namespace PraxisPusteblume
this.xrTableCell10,
this.xrTableCell29,
this.xrTableCell30,
this.xrTableCell35,
this.xrTableCell36,
this.xrTableCell37,
this.xrTableCell38,
this.xrTableCell39});
@@ -577,19 +544,24 @@ namespace PraxisPusteblume
this.xrTableCell27.Multiline = true;
this.xrTableCell27.Name = "xrTableCell27";
this.xrTableCell27.StylePriority.UseTextAlignment = false;
this.xrTableCell27.Weight = 0.19871787655894091D;
this.xrTableCell27.Weight = 0.30769226277090878D;
//
// xrTableCell28
//
this.xrTableCell28.Multiline = true;
this.xrTableCell28.Name = "xrTableCell28";
this.xrTableCell28.StylePriority.UseTextAlignment = false;
this.xrTableCell28.Weight = 0.1987230716070402D;
this.xrTableCell28.Weight = 0.29897938297372018D;
//
// xrTableCell10
//
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.Weight = 0.10769241228954907D;
//
// xrTableCell29
//
this.xrTableCell29.Name = "xrTableCell29";
this.xrTableCell29.Weight = 0.10769231246324482D;
this.xrTableCell29.Weight = 0.105384432109668D;
//
// xrTableCell30
//
@@ -599,26 +571,12 @@ namespace PraxisPusteblume
this.xrTableCell30.StylePriority.UsePadding = false;
this.xrTableCell30.StylePriority.UseTextAlignment = false;
this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell30.Weight = 0.10769223030055722D;
//
// xrTableCell35
//
this.xrTableCell35.Name = "xrTableCell35";
this.xrTableCell35.Weight = 0.10769241810103553D;
//
// xrTableCell36
//
this.xrTableCell36.Name = "xrTableCell36";
this.xrTableCell36.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F);
this.xrTableCell36.StylePriority.UsePadding = false;
this.xrTableCell36.StylePriority.UseTextAlignment = false;
this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell36.Weight = 0.10769223030053937D;
this.xrTableCell30.Weight = 0.11000020455438439D;
//
// xrTableCell37
//
this.xrTableCell37.Name = "xrTableCell37";
this.xrTableCell37.Weight = 0.10769223032610181D;
this.xrTableCell37.Weight = 0.10769241812660255D;
//
// xrTableCell38
//
@@ -628,7 +586,7 @@ namespace PraxisPusteblume
this.xrTableCell38.StylePriority.UseTextAlignment = false;
this.xrTableCell38.Text = "Gesamt";
this.xrTableCell38.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell38.Weight = 0.10769251203962105D;
this.xrTableCell38.Weight = 0.1076920425383692D;
//
// xrTableCell39
//
@@ -639,7 +597,7 @@ namespace PraxisPusteblume
this.xrTableCell39.StylePriority.UsePadding = false;
this.xrTableCell39.StylePriority.UseTextAlignment = false;
this.xrTableCell39.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell39.Weight = 0.10769234767585956D;
this.xrTableCell39.Weight = 0.10769244157610995D;
//
// fieldEinzel
//
@@ -669,25 +627,6 @@ namespace PraxisPusteblume
this.xrRichText4.SerializableRtfString = resources.GetString("xrRichText4.SerializableRtfString");
this.xrRichText4.SizeF = new System.Drawing.SizeF(284.2049F, 92.06244F);
//
// xrTableCell4
//
this.xrTableCell4.Multiline = true;
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.Text = "Datum\r\n";
this.xrTableCell4.Weight = 0.10769231419732427D;
//
// xrTableCell9
//
this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.SupportConceptApprovalPeriod.EndDate", "{0:dd.MM.yyyy}")});
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.Weight = 0.10769231419732434D;
//
// xrTableCell10
//
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.Weight = 0.10769231838929871D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
@@ -756,10 +695,8 @@ namespace PraxisPusteblume
private DevExpress.XtraReports.UI.XRTableCell cellPreisAmbulant;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2;
private DevExpress.XtraReports.UI.XRRichText xrRichText1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
private DevExpress.XtraReports.UI.XRRichText xrRichText3;
private DevExpress.XtraReports.UI.XRRichText xrRichText2;
private DevExpress.XtraReports.UI.XRTableCell cellPreisTeam;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
private DevExpress.XtraReports.UI.XRTableCell cellPreisInvest;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
@@ -771,8 +708,6 @@ namespace PraxisPusteblume
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
@@ -785,8 +720,6 @@ namespace PraxisPusteblume
private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell36;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell37;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell38;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell39;

26
ReportImp/PraxisPusteblume/ObaSammelRechnung.cs
View File

@@ -246,18 +246,18 @@ namespace PraxisPusteblume
decimal preisAmbulant = 60.95m;
//decimal preisGruppe = 32.53m;
decimal preisTeam = 10.88m;
//decimal preisTeam = 10.88m;
decimal preisInvest = 4.84m;
if (pRO.AccountingPeriodStart >= new DateTime(2019, 4, 1))
{
preisTeam = 11.26m;
//preisGruppe = 33.68m;
}
if (pRO.AccountingPeriodStart >= new DateTime(2020, 3, 1))
{
preisTeam = 11.38m;
//preisGruppe = 34.05m;
}
//if (pRO.AccountingPeriodStart >= new DateTime(2019, 4, 1))
//{
// preisTeam = 11.26m;
// //preisGruppe = 33.68m;
//}
//if (pRO.AccountingPeriodStart >= new DateTime(2020, 3, 1))
//{
// preisTeam = 11.38m;
// //preisGruppe = 34.05m;
//}
if (pRO.AccountingPeriodStart >= new DateTime(2021, 5, 1))
{
preisInvest = 6.86m;
@@ -283,7 +283,7 @@ namespace PraxisPusteblume
cellPreisAmbulant.Text = String.Format("{0:c}", preisAmbulant);
//cellPreisGruppe.Text = String.Format("{0:c}", preisGruppe);
cellPreisTeam.Text = String.Format("{0:c}", preisTeam);
//cellPreisTeam.Text = String.Format("{0:c}", preisTeam);
cellPreisInvest.Text = String.Format("{0:c}", preisInvest);
}
@@ -314,8 +314,6 @@ namespace PraxisPusteblume
//}
}
}

5
ReportImp/RatPlusTat/Invoicing/CustomInvoiceFactory.cs
View File

@@ -32,11 +32,6 @@ namespace RatPlusTat.Invoicing
return new CustomAssistenzInvoiceCreation();
if (cat.Contains("betreuung") || cat.Contains("Umwandlungsanspruch") || cat.Contains("Verhinderungspflege"))
return new CustomAlltagsunterstuetzungsInvoiceCreation();
//if (cat.Contains("Umwandlungsanspruch") == true)
// return new CustomAlltagsunterstuetzungsInvoiceCreation();
//if (cat.Contains("Verhinderungspflege") == true)
// return new CustomAlltagsunterstuetzungsInvoiceCreation();
}
return null;
}

8
ReportImp/RatPlusTat/Quittierungsbeleg.cs
View File

@@ -19,16 +19,8 @@ namespace RatPlusTat
public void SetReportDataSource(ServicesOverviewRO pRO)
{
// Get calling method name
//StackTrace stackTrace = new StackTrace();
//Debug.WriteLine(stackTrace.GetFrame(1).GetMethod().Name);
bool hatGruppen = false;
//if (pRO == null)
// return;
if (pRO.Services != null)
{
List<ServicesOverviewRO.ServiceDetail> servicesBillable = new List<ServicesOverviewRO.ServiceDetail>();

2
ReportImp/RatPlusTat/QuittierungsbelegPflegekasse.cs
View File

@@ -74,8 +74,6 @@ namespace RatPlusTat
}
}
// TODO: Wie anzeigen? Alle?
// TODO: Visibile der Datumstextboxen auf true setzen!
private void CustomerSignature_BeforePrint(object sender, System.Drawing.Printing.PrintEventArgs e)
{
return;

2
ReportImp/RatPlusTat/RatPlusTatReportCreator.cs
View File

@@ -98,7 +98,7 @@ namespace RatPlusTat
verhinderungRo.TotalFLMBillable += s.Minutes;
verhinderungRo.TotalFLS += s.Minutes / 60;
}
else if (s.ServiceCategory.ToLower().Contains("assistenz"))
else if (ro.Costbearer.ToLower().Contains("lvr") && s.ServiceCategory.ToLower().Contains("assistenz"))
{
assistenzRo.Services.Add(s);
assistenzRo.TotalFLMBillable += s.Minutes;

1
ReportImp/SBBMainzReports/QuittierungsbelegJaMainzWiJu.cs
View File

@@ -70,7 +70,6 @@ namespace SBBMainzReports
long betreuer1EOid = 0;
String betreuer2 = "";
long betreuer2EOid = 0;
int i = 0;
if (pRO.CostBearer2SupportConceptList != null && pRO.CostBearer2SupportConceptList.Count > 0)
{

8
ReportImp/SBBMainzReports/QuittierungsbelegJugendamt.cs
View File

@@ -282,14 +282,6 @@ namespace SBBMainzReports
employee2 = c2o.Employee.Person.FirstName + " " + c2o.Employee.Person.LastName;
}
}
//if (String.IsNullOrEmpty(employee1))
//{
// employee1 = c2o.Employee.Person.FirstName + " " + c2o.Employee.Person.LastName;
//}
//else
//{
// employee2 = c2o.Employee.Person.FirstName + " " + c2o.Employee.Person.LastName;
//}
}
}
}

30
ReportImp/SBBMainzReports/SBBMainzReportCreator.cs
View File

@@ -40,7 +40,6 @@ namespace SBBMainzReports
var ro = ServicesOverviewRO.Create(customerOid, month, year, false, orgaOid, empOid, startDay, endDay, serviceCategoryOid);
return CreateServicesOverviewReportForRo(ro, serviceCategoryOid);
}
public override XtraReport CreateReportForServicesOverviewRo(ServicesOverviewRO ro, string reportId)
@@ -55,24 +54,17 @@ namespace SBBMainzReports
ServicesOverviewRO bewoRo = ServicesOverviewRO.CopyFromRO(ro);
ServicesOverviewRO jugendamtRo = ServicesOverviewRO.CopyFromRO(ro);
ServicesOverviewRO asdRo = ServicesOverviewRO.CopyFromRO(ro);
//ServicesOverviewRO wijuRo = ServicesOverviewRO.CopyFromRO(ro);
bewoRo.TotalFLMBillable = 0;
jugendamtRo.TotalFLMBillable = 0;
asdRo.TotalFLMBillable = 0;
//wijuRo.TotalFLMBillable = 0;
if (ro.Services != null)
{
foreach (ServicesOverviewRO.ServiceDetail s in ro.Services)
{
//Name des Kostenträgers und die Leistungskategorie kläreen
if (ro.Costbearer.ToLower().Contains("jugendamt der landeshauptstadt mainz") )
//&& (s.ServiceCategory.ToLower().Contains("spfh") || s.ServiceCategory.ToLower().Contains("erziehungsbeistand")))
{
//wijuRo.Services.Add(s);
//wijuRo.TotalFLMBillable += s.Minutes;
//wijuRo.TotalFLMBillable += s.Minutes / 60;
asdRo.Services.Add(s);
asdRo.TotalFLMBillable += s.Minutes;
asdRo.TotalFLMBillable += s.Minutes / 60;
@@ -115,9 +107,7 @@ namespace SBBMainzReports
else
{
if (report.Pages.Count == 0)
{
report.CreateDocument();
}
XtraReport newReport = new T();
((T)newReport).SetReportDataSource(ro);
@@ -128,25 +118,5 @@ namespace SBBMainzReports
}
return report;
}
//Original
// private XtraReport CreateServicesOverviewReportForRo(ServicesOverviewRO ro, long? serviceCategoryOid)
//{
// IBeWoReport<ServicesOverviewRO> report = null;
// if (!String.IsNullOrWhiteSpace(ro.Costbearer))
// {
// if (ro.Costbearer.ToLower().Contains("jugendamt") || ro.Costbearer.ToLower().StartsWith("landeshauptstadt wiesbaden") || ro.Costbearer.ToLower().StartsWith("kreisverwaltung rhein-hunsrück-kreis") || ro.Costbearer.ToLower().StartsWith("stadt mannheim"))
// {
// report = new SBBMainzReports.QuittierungsbelegJugendamt();
// }
// }
// if (report == null)
// report = new BeWo.Report.DefaultReports.Stundenzettel();
// report.SetReportDataSource(ro);
// return report as XtraReport;
//}
}
}