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
2025-03-25 12:09:16 +01:00
parent 5ec6c27ffa 142ebc190e
commit f271eb5366
6 changed files with 123 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ReportImp/AsSozialeDienstleistungenEV/CustomReportCreator.cs
View File

@@ -47,14 +47,14 @@ namespace AsSozialeDienstleistungenEV
foreach (var iDC in invoices)
{
XtraReport invoiceReport = null;
IBeWoReport<ServiceInvoiceRO> singleReport = FindReportImp<ServiceInvoiceRO>(iDC.InvoiceBase.InvoiceId);
IBeWoReport<ServiceInvoiceRO> seite1 = FindReportImp<ServiceInvoiceRO>(iDC.InvoiceBase.InvoiceId);
if (iDC.ServiceInvoicePeriods.Count > 0 && iDC.ServiceInvoicePeriods[0].SupportConceptApprovalPeriod.ServiceCategory != null)
{
var seite1 = new ServiceInvoiceReport();
var ro = ServiceInvoiceRO.Create(iDC);
seite1.SetReportDataSource(ro);
seite1.CreateDocument();
((XtraReport)seite1).CreateDocument();
invoiceReport = seite1 as XtraReport;
int month = iDC.InvoiceBase.AccountingPeriodStart.Value.Month;
int year = iDC.InvoiceBase.AccountingPeriodStart.Value.Year;
@@ -66,19 +66,10 @@ namespace AsSozialeDienstleistungenEV
var qb = CreateServiceOverviewSingleCustomerReport(cOid, month, year, oOid, 0, null, 1, DateTime.DaysInMonth(year, month));
qb.CreateDocument();
seite1.Pages.AddRange(qb.Pages);
invoiceReport = seite1;
invoiceReport.Pages.AddRange(qb.Pages);
month++;
}
}
else
{
var ro = ServiceInvoiceRO.Create(iDC);
singleReport.SetReportDataSource(ro);
((XtraReport)singleReport).CreateDocument();
invoiceReport = singleReport as XtraReport;
}
if (allReports == null)
{
allReports = invoiceReport;

122
ReportImp/ChristopherusHaus/Export/QueryListReport.Designer.cs generated
View File

@@ -73,6 +73,12 @@ namespace BeWo.ChristopherusHaus.Export
this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.xrTableCell18 = 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();
this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -105,7 +111,7 @@ namespace BeWo.ChristopherusHaus.Export
this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowDetail});
this.xrTableDetail.SizeF = new System.Drawing.SizeF(1019F, 25F);
this.xrTableDetail.SizeF = new System.Drawing.SizeF(1029.544F, 25F);
this.xrTableDetail.StylePriority.UseBorders = false;
this.xrTableDetail.StylePriority.UsePadding = false;
//
@@ -115,6 +121,8 @@ namespace BeWo.ChristopherusHaus.Export
this.xrTableCell3,
this.xrTableCell13,
this.xrTableCell12,
this.xrTableCell20,
this.xrTableCell21,
this.xrTableCell10,
this.xrTableCell9,
this.xrTableCell8});
@@ -129,7 +137,7 @@ namespace BeWo.ChristopherusHaus.Export
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.StylePriority.UseFont = false;
this.xrTableCell3.Text = "xrTableCell3";
this.xrTableCell3.Weight = 1.438583838226049D;
this.xrTableCell3.Weight = 1.2075854249106772D;
//
// xrTableCell13
//
@@ -139,7 +147,7 @@ namespace BeWo.ChristopherusHaus.Export
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.StylePriority.UseFont = false;
this.xrTableCell13.Text = "xrTableCell13";
this.xrTableCell13.Weight = 0.6869481080179709D;
this.xrTableCell13.Weight = 0.80751219062540924D;
//
// xrTableCell12
//
@@ -149,34 +157,34 @@ namespace BeWo.ChristopherusHaus.Export
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.StylePriority.UseFont = false;
this.xrTableCell12.Text = "xrTableCell12";
this.xrTableCell12.Weight = 0.68694801817230455D;
this.xrTableCell12.Weight = 0.80751154630548094D;
//
// xrTableCell10
//
this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field4")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field6")});
this.xrTableCell10.Multiline = true;
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.StylePriority.UseFont = false;
this.xrTableCell10.Text = "xrTableCell10";
this.xrTableCell10.Weight = 0.93825738399606662D;
this.xrTableCell10.Weight = 0.80751161373325564D;
//
// xrTableCell9
//
this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field5")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field7")});
this.xrTableCell9.Multiline = true;
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.StylePriority.UseFont = false;
this.xrTableCell9.StylePriority.UseTextAlignment = false;
this.xrTableCell9.Text = "xrTableCell9";
this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell9.Weight = 2.4260699989985204D;
this.xrTableCell9.Weight = 0.80751162733901283D;
//
// xrTableCell8
//
this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field6")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field8")});
this.xrTableCell8.Multiline = true;
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.StylePriority.UseFont = false;
@@ -184,7 +192,7 @@ namespace BeWo.ChristopherusHaus.Export
this.xrTableCell8.Text = "xrTableCell8";
this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell8.TextFormatString = "{0} €";
this.xrTableCell8.Weight = 0.82319265258908858D;
this.xrTableCell8.Weight = 0.80751157423674025D;
//
// DetailReport
//
@@ -216,7 +224,7 @@ namespace BeWo.ChristopherusHaus.Export
this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowHeader});
this.xrTableHeader.SizeF = new System.Drawing.SizeF(1019F, 25F);
this.xrTableHeader.SizeF = new System.Drawing.SizeF(1029.544F, 25F);
this.xrTableHeader.StylePriority.UseBorders = false;
this.xrTableHeader.StylePriority.UseFont = false;
this.xrTableHeader.StylePriority.UsePadding = false;
@@ -229,6 +237,8 @@ namespace BeWo.ChristopherusHaus.Export
this.xrTableCell4,
this.xrTableCell6,
this.xrTableCell2,
this.xrTableCell18,
this.xrTableCell19,
this.xrTableCell7});
this.xrTableRowHeader.Name = "xrTableRowHeader";
this.xrTableRowHeader.Weight = 1D;
@@ -237,42 +247,42 @@ namespace BeWo.ChristopherusHaus.Export
//
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Text = "Empfänger";
this.xrTableCell5.Weight = 1.2330718335272402D;
this.xrTableCell5.Weight = 1.3301621251852334D;
//
// xrTableCell1
//
this.xrTableCell1.Multiline = true;
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Text = "Belegnr.";
this.xrTableCell1.Weight = 0.58881254636036406D;
this.xrTableCell1.Weight = 0.88947852023760687D;
//
// xrTableCell4
//
this.xrTableCell4.Multiline = true;
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.Text = "Debitornr. ";
this.xrTableCell4.Weight = 0.58881254636036384D;
this.xrTableCell4.Weight = 0.88947852023760665D;
//
// xrTableCell6
//
this.xrTableCell6.Multiline = true;
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Text = "Kostenstelle Klient";
this.xrTableCell6.Weight = 0.80422058704439869D;
this.xrTableCell6.Weight = 0.88947852913269942D;
//
// xrTableCell2
//
this.xrTableCell2.Multiline = true;
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Text = "Verwendung";
this.xrTableCell2.Weight = 2.0794884079922866D;
this.xrTableCell2.Weight = 2.490539700182083D;
//
// xrTableCell7
//
this.xrTableCell7.Multiline = true;
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Text = "Betrag";
this.xrTableCell7.Weight = 0.705594078715346D;
this.xrTableCell7.Weight = 0.88947847484457021D;
//
// ReportFooter
//
@@ -291,7 +301,7 @@ namespace BeWo.ChristopherusHaus.Export
this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
this.xrTable1.SizeF = new System.Drawing.SizeF(1019F, 25F);
this.xrTable1.SizeF = new System.Drawing.SizeF(1029.544F, 25F);
this.xrTable1.StylePriority.UseBorders = false;
this.xrTable1.StylePriority.UseFont = false;
this.xrTable1.StylePriority.UsePadding = false;
@@ -301,6 +311,8 @@ namespace BeWo.ChristopherusHaus.Export
this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell11,
this.xrTableCell14,
this.xrTableCell22,
this.xrTableCell23,
this.xrTableCell15,
this.xrTableCell16,
this.xrTableCell17,
@@ -313,35 +325,35 @@ namespace BeWo.ChristopherusHaus.Export
this.xrTableCell11.Multiline = true;
this.xrTableCell11.Name = "xrTableCell11";
this.xrTableCell11.StylePriority.UseFont = false;
this.xrTableCell11.Weight = 1.4385837858160766D;
this.xrTableCell11.Weight = 1.2075854936518411D;
//
// xrTableCell14
//
this.xrTableCell14.Multiline = true;
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.StylePriority.UseFont = false;
this.xrTableCell14.Weight = 0.68694805560799888D;
this.xrTableCell14.Weight = 0.807512200901658D;
//
// xrTableCell15
//
this.xrTableCell15.Multiline = true;
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.StylePriority.UseFont = false;
this.xrTableCell15.Weight = 0.68694791335235972D;
this.xrTableCell15.Weight = 2.2610333272765959D;
//
// xrTableCell16
//
this.xrTableCell16.Multiline = true;
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.StylePriority.UseFont = false;
this.xrTableCell16.Weight = 0.93825738399606684D;
this.xrTableCell16.Weight = 0.80751161256425186D;
//
// xrTableCell17
//
this.xrTableCell17.Multiline = true;
this.xrTableCell17.Name = "xrTableCell17";
this.xrTableCell17.StylePriority.UseFont = false;
this.xrTableCell17.Weight = 2.4260702086384089D;
this.xrTableCell17.Weight = 0.80751164813012766D;
//
// lblSumme
//
@@ -351,7 +363,7 @@ namespace BeWo.ChristopherusHaus.Export
this.lblSumme.StylePriority.UseTextAlignment = false;
this.lblSumme.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.lblSumme.TextFormatString = "{0} €";
this.lblSumme.Weight = 0.82319265258908858D;
this.lblSumme.Weight = 0.80751150204069666D;
//
// bindingSource1
//
@@ -372,7 +384,7 @@ namespace BeWo.ChristopherusHaus.Export
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel1.Multiline = true;
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.SizeF = new System.Drawing.SizeF(1018F, 25F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(1037F, 25F);
this.xrLabel1.StyleName = "Title";
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.Text = "Buchhaltungsexport";
@@ -388,9 +400,9 @@ namespace BeWo.ChristopherusHaus.Export
// xrPageInfo2
//
this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(924.0834F, 25F);
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(929.5441F, 25F);
this.xrPageInfo2.Name = "xrPageInfo2";
this.xrPageInfo2.SizeF = new System.Drawing.SizeF(93.91663F, 23F);
this.xrPageInfo2.SizeF = new System.Drawing.SizeF(100F, 23F);
this.xrPageInfo2.StyleName = "PageInfo";
this.xrPageInfo2.StylePriority.UseFont = false;
this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
@@ -402,7 +414,7 @@ namespace BeWo.ChristopherusHaus.Export
this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
this.xrPageInfo1.Name = "xrPageInfo1";
this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
this.xrPageInfo1.SizeF = new System.Drawing.SizeF(924.0834F, 23F);
this.xrPageInfo1.SizeF = new System.Drawing.SizeF(929.5441F, 23F);
this.xrPageInfo1.StyleName = "PageInfo";
this.xrPageInfo1.StylePriority.UseFont = false;
//
@@ -463,6 +475,52 @@ namespace BeWo.ChristopherusHaus.Export
this.bottomMarginBand1.HeightF = 50F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// xrTableCell18
//
this.xrTableCell18.Multiline = true;
this.xrTableCell18.Name = "xrTableCell18";
this.xrTableCell18.Text = "FLS";
this.xrTableCell18.Weight = 0.88947847327822482D;
//
// xrTableCell19
//
this.xrTableCell19.Multiline = true;
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.Text = "Std-Satz";
this.xrTableCell19.Weight = 0.88947849682118352D;
//
// xrTableCell20
//
this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field4")});
this.xrTableCell20.Multiline = true;
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.StylePriority.UseFont = false;
this.xrTableCell20.Weight = 0.80751117665597294D;
//
// xrTableCell21
//
this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field5")});
this.xrTableCell21.Multiline = true;
this.xrTableCell21.Name = "xrTableCell21";
this.xrTableCell21.StylePriority.UseFont = false;
this.xrTableCell21.Weight = 2.2610333564143197D;
//
// xrTableCell22
//
this.xrTableCell22.Multiline = true;
this.xrTableCell22.Name = "xrTableCell22";
this.xrTableCell22.StylePriority.UseFont = false;
this.xrTableCell22.Weight = 0.80751109195312432D;
//
// xrTableCell23
//
this.xrTableCell23.Multiline = true;
this.xrTableCell23.Name = "xrTableCell23";
this.xrTableCell23.StylePriority.UseFont = false;
this.xrTableCell23.Weight = 0.807511708035643D;
//
// Bericht
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -476,7 +534,7 @@ namespace BeWo.ChristopherusHaus.Export
this.fieldFLS});
this.DataSource = this.bindingSource1;
this.Landscape = true;
this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 50F, 50F);
this.Margins = new DevExpress.Drawing.DXMargins(75F, 57F, 50F, 50F);
this.PageHeight = 827;
this.PageWidth = 1169;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
@@ -540,5 +598,11 @@ namespace BeWo.ChristopherusHaus.Export
private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
private DevExpress.XtraReports.UI.XRTableCell lblSumme;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
}
}

2
ReportImp/ChristopherusHaus/Export/QueryListReport.cs
View File

@@ -18,7 +18,7 @@ namespace BeWo.ChristopherusHaus.Export
decimal sum = 0;
foreach (var row in pRO.Rows)
{
sum += Convert.ToDecimal(row.Field6.ToString());
sum += Convert.ToDecimal(row.Field8.ToString());
}
lblSumme.Text = sum.ToString("c2");
this.bindingSource1.DataSource = pRO;

22
ReportImp/ChristopherusHaus/Export/SimbaExporter.cs
View File

@@ -122,7 +122,9 @@ namespace BeWo.ChristopherusHaus.Export
qry.CostCenter,
qry.Name,
qry.Verwendung,
qry.Oid
qry.Oid,
sum(qry.FLS) AS FLS,
qry.Preis
FROM
(
(SELECT
@@ -132,7 +134,9 @@ namespace BeWo.ChristopherusHaus.Export
c.CostCenter,
org.Name,
CONCAT(org.Name,', ', p.`LastName`, ', ', p.`FirstName`) as 'Verwendung',
cb2sc.Oid
cb2sc.Oid,
ROUND(sr.`GeleisteteFLM` / 60, 2) as 'FLS',
ROUND((SELECT crp.`CostRateValue` FROM `costrateperiod` crp WHERE crp.`ObjectTid` = 22 AND crp.`CostRateType` = 0 AND crp.`ObjectOid` = cb2sc.`CostBearerOid` AND (crp.`EndDate` is null or crp.`EndDate` > ':Monat_Start') order by IF(crp.`EndDate` is null, MAKEDATE(9999,365),crp.`EndDate`) LIMIT 1 ), 2) as 'Preis'
FROM `supportconcept` sc
INNER JOIN `costbearer2supportconcept` cb2sc ON sc.`Oid` = cb2sc.`SupportConceptOid`
INNER JOIN `costbearer` cb ON cb2sc.`CostBearerOid` = cb.`Oid`
@@ -157,7 +161,9 @@ namespace BeWo.ChristopherusHaus.Export
c.CostCenter,
org.Name,
CONCAT(org.Name,', ', p.`LastName`, ', ', p.`FirstName`) as 'Verwendung',
cb2sc.Oid
cb2sc.Oid,
ROUND(0.8 * sr.`GeleisteteFLM` / 60, 2) as 'FLS',
ROUND((SELECT crp.`CostRateValue` FROM `costrateperiod` crp WHERE crp.`ObjectTid` = 22 AND crp.`CostRateType` = 0 AND crp.`ObjectOid` = cb2sc.`CostBearerOid` AND (crp.`EndDate` is null or crp.`EndDate` > ':Monat_Start') order by IF(crp.`EndDate` is null, MAKEDATE(9999,365),crp.`EndDate`) LIMIT 1 ), 2) as 'Preis'
FROM `supportconcept` sc
INNER JOIN `costbearer2supportconcept` cb2sc ON sc.`Oid` = cb2sc.`SupportConceptOid`
INNER JOIN `costbearer` cb ON cb2sc.`CostBearerOid` = cb.`Oid`
@@ -258,7 +264,7 @@ namespace BeWo.ChristopherusHaus.Export
DataTable table = new DataTable();
DateTime lastDate = new DateTime(date.Year, date.Month, 1);
lastDate = lastDate.AddMonths(1).AddDays(-1);
string[] spalten = new string[] { "Empfänger", "Belegnr.", "Debitornr.", "Kostenstelle Klient", "Verwendung", "Betrag" };
string[] spalten = new string[] { "Empfänger", "Belegnr.", "Debitornr.", "Kostenstelle Klient", "Verwendung", "FLS", "Stundensatz", "Betrag" };
for (int i = 0; i < spalten.Length; i++)
table.Columns.Add(spalten[i], typeof(string));
@@ -272,7 +278,9 @@ namespace BeWo.ChristopherusHaus.Export
row[2] = booking[3];
row[3] = booking[4];
row[4] = booking[6];
row[5] = string.Format("{0:0.00}", booking[1]);
row[5] = booking[8];
row[6] = booking[9];
row[7] = string.Format("{0:0.00}", booking[1]);
table.Rows.Add(row);
}
for (int i = 0; i < dt.Rows.Count; i++)
@@ -284,7 +292,9 @@ namespace BeWo.ChristopherusHaus.Export
row[2] = invoice[5];
row[3] = invoice[6];
row[4] = string.Format("{0}, {1} {2}", invoice[7], invoice[8], invoice[9]);
row[5] = string.Format("{0:0.00}", invoice[1]);
row[5] = "";
row[6] = "";
row[7] = string.Format("{0:0.00}", invoice[1]);
table.Rows.Add(row);
}

8
ReportImp/InputFamilienhilfe/Invoicing/DefaultInvoiceCreation.cs
View File

@@ -298,7 +298,7 @@ namespace InputFamilienhilfe.Invoicing
var iiList = new List<InvoiceItem>();
foreach (ServiceRecordDC iServiceRecord in serviceRecordsInPeriod)
{
if (iServiceRecord.Betrag.HasValue)
if (iServiceRecord.Betrag.HasValue && iServiceRecord.Betrag.Value > 0)
{
var invoiceItem = new InvoiceItem();
invoiceItem.UnitCount = 1;
@@ -308,13 +308,15 @@ namespace InputFamilienhilfe.Invoicing
invoiceItem.ItemPeriodEnd = invoicePeriod.EndDate;
invoiceItem.GrossAmountTotal = invoiceItem.AmountPerUnit;
invoiceItem.ItemDescription = iServiceRecord.Notice;
if (iServiceRecord.Notice.Length > 100)
{
invoiceItem.ItemDescription = iServiceRecord.Notice.Substring(0, 100);
}
if (iServiceRecord.ServiceDescription.CategoryName.Contains("Fahrt"))
{
invoiceItem.ItemDescription = "Fahrtkostenpauschale";
}
invoiceItem.ServiceRecord = DAOFactory.GenericDAO.LoadByID<ServiceRecord>(iServiceRecord.ServiceRecordOid.Value);
if (scap != null)
invoiceItem.SupportConceptApprovalPeriodOid = scap.Oid;

7
ReportImp/LebenshilfeRemscheid/Export/DatevExporter.cs
View File

@@ -89,9 +89,9 @@ namespace LebenshilfeRemscheid.Export
sb.Append(";");
sb.Append(String.Format("{0}", row[2])); //Belegfeld 1
sb.Append(";");
sb.Append(String.Format("{0:ddMMyy}", row[1])); //Belegfeld 2
sb.Append(String.Format("{0}", row[4])); //Belegfeld 2
sb.Append(";;");
sb.Append(String.Format("{0}", row[3])); // Buchungstext
sb.Append(String.Format("{0:MM}/{0:yyyy} {1}", lastDate, row[3])); // Buchungstext
sb.Append(";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;");
}
return sb.ToString();
@@ -147,7 +147,8 @@ namespace LebenshilfeRemscheid.Export
sip.Claim,
ib.InvoiceDate,
ib.Invoicenumber,
Concat(ib.invoicenumber,', ', org.Name, ', ', p.FirstName, ', ', p.LastName) AS Verwendung,
Concat(p.LastName, ', ', p.FirstName) AS Verwendung,
c2s.CustomerRefenrenceNumber,
ib.Oid
from
person p