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

This commit is contained in:
2025-03-14 06:30:52 +01:00
16 changed files with 458 additions and 1865 deletions

View File

@@ -419,9 +419,9 @@ namespace BeWoPlanerMobil.Models
}
var start = serviceRecord.Start.Value;
var end = start.AddMinutes((int) serviceRecord.RoundedDuration);//serviceRecord.End.Value;
var end = serviceRecord.End.Value; //start.AddMinutes((int) serviceRecord.RoundedDuration), AB, 12.03.2025: Änderung vom 12.11.2024 rückgängig; Endzeit bleibt bei Gruppen- und Einzelbuchungen die tatäschliche Zeit - genau wie FAK
if(start.Second == 0)
if (start.Second == 0)
{
return start.Date != end.Date ?
$"{start.ToShortDateString()} {start.ToShortTimeString()} - {end.ToShortDateString()} {end.ToShortTimeString()}" :

View File

@@ -0,0 +1,19 @@
-- zunächst für Verein für Beratung und Therapie (LWV)
-- 7113513872 (APP3)
SELECT p.LastName as Nachname, p.FirstName as Vorname,
ROUND(DATEDIFF(CURDATE(), cb2sc.`RequestedStartDate`) / 30, 2) as 'Monate seit Beginn der Betreuung', cb2sc.ApprovedStartDate as 'Bewilligt von', cb2sc.ApprovedEndDate as 'Bewilligt bis',
o.`Name` as 'Kostentraeger',
(select CONCAT(emp1p.`FirstName`, ' ', emp1p.`LastName`) from employee emp1
join `person` emp1p on emp1p.`Oid` = emp1.`PersonOid`
where emp1.`Oid` in (select employeeoid from `employee2customer` e2c1
join `valuelistentry2object` vl2o on e2c1.`Oid` = vl2o.`ObjectOid`
join `valuelistentry` vle on vl2o.`ValueListEntryOid` = vle.`Oid`
where e2c1.`CustomerOid` = cust.`Oid` and vle.`SystemEntryID` = 3) LIMIT 1) as 'Bezugsbetreuung' from `person` p
join `customer` cust on p.Oid = cust.PersonOid join `supportconcept` sc on cust.Oid = sc.CustomerOid
join `costbearer2supportconcept` cb2sc on sc.Oid = cb2sc.SupportConceptOid
join `costbearer` cb on cb2sc.`CostBearerOid` = cb.`Oid`
join `organisation` o on cb.`Oid` = o.`CostBearerOid`
WHERE cb2sc.ApprovedEndDate is not null
AND cb2sc.ApprovedEndDate < CONCAT(YEAR(CURDATE()),-12-31) and cb2sc.ApprovedEndDate >= CURDATE() and cust.IsActive <> 0 and sc.IsActive = 1
ORDER BY cb2sc.ApprovedEndDate;

View File

@@ -0,0 +1,19 @@
-- Bei Arche Tecklenburg 7060431533 (APP3)
-- Summierte Abwesenheiten pro Kalenderjahr, wenn Abwesenheit > 3 Tage -> LWL Vorgaben für bes Wohnformen
SELECT qry.Nachname, qry.Vorname, sum(qry.Dauer)
FROM
(select p.`FirstName` as Vorname, p.`LastName` as Nachname,
ar.`Description` as Kategorie,
at.`Start` as von,
CASE WHEN at.`EndTime`<= ':Jahr_End' THEN at.`EndTime` ELSE ':Jahr_End' END as bis,
datediff(CASE WHEN ifnull(at.`EndTime`, CURDate()) <= ':Jahr_End' THEN at.`EndTime` ELSE ':Jahr_End' END , at.`Start`)-1 AS Dauer,
c.Oid AS cOid
from `person` p
inner join `customer` c on p.`Oid` = c.`PersonOid`
inner join `absencetime` at on c.`Oid` = at.`CustomerOid`
inner join `absencereason` ar on at.`AbsenceReasonOid` = ar.`Oid`
where c.`IsActive` = 1 and at.EndTime >= ':Jahr_Start' and at.Start <= ':Jahr_End')qry
where qry.Dauer > 3
Group by qry.cOid
order by qry.Nachname;

View File

@@ -111,26 +111,7 @@ namespace AWOMuensterlandRecklinghausen
&& iDC.ServiceInvoicePeriods.Count > 0 && ((iDC.ServiceInvoicePeriods[0].SupportConceptApprovalPeriod == null && iDC.ServiceInvoicePeriods[0].InvoiceItems[0].ItemDescription.Contains("Rechnungsdifferenz")) ||
iDC.ServiceInvoicePeriods[0].SupportConceptApprovalPeriod.ServiceCategory != null))
{
XtraReport masterReport = new XtraReport();
masterReport.CreateDocument();
if (iDC.InvoiceBase.InvoiceId != null && iDC.InvoiceBase.InvoiceId == "SBD") // bis März 2024
{
var seite1 = new ServiceInvoiceReportOld();
var ro = ServiceInvoiceRO.Create(iDC);
seite1.SetReportDataSource(ro);
seite1.CreateDocument();
masterReport.Pages.AddRange(seite1.Pages);
}
else
{
var seite1 = new ServiceInvoiceReport();
var ro = ServiceInvoiceRO.Create(iDC);
seite1.SetReportDataSource(ro);
seite1.CreateDocument();
masterReport.Pages.AddRange(seite1.Pages);
}
// Erzeuge Leistungsnachweise
int month = iDC.InvoiceBase.AccountingPeriodStart.Value.Month;
int year = iDC.InvoiceBase.AccountingPeriodStart.Value.Year;
long cOid = iDC.InvoiceBase.SupportConceptCostBearerRelDc.SupportConcept.Customer.CustomerOid;
@@ -139,8 +120,24 @@ namespace AWOMuensterlandRecklinghausen
var qb = CreateServiceOverviewSingleCustomerReport(cOid, month, year, oOid, 0, null, 1, DateTime.DaysInMonth(year, month));
qb.CreateDocument();
masterReport.Pages.AddRange(qb.Pages);
invoiceReport = masterReport;
if (iDC.InvoiceBase.InvoiceId != null && iDC.InvoiceBase.InvoiceId == "SBD") // bis März 2024
{
var seite1Old = new ServiceInvoiceReportOld();
var roOld = ServiceInvoiceRO.Create(iDC);
seite1Old.SetReportDataSource(roOld);
seite1Old.CreateDocument();
seite1Old.Pages.AddRange(qb.Pages);
invoiceReport = seite1Old;
}
else
{
var seite1 = new ServiceInvoiceReport();
var ro = ServiceInvoiceRO.Create(iDC);
seite1.SetReportDataSource(ro);
seite1.CreateDocument();
seite1.Pages.AddRange(qb.Pages);
invoiceReport = seite1;
}
}
else
{

View File

@@ -31,11 +31,10 @@ namespace AdikKleve
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InvoiceCustomerReport));
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -46,16 +45,12 @@ namespace AdikKleve
this.lblAddress = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.lblAbrechnungsText = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -106,18 +101,16 @@ namespace AdikKleve
//
// xrTable1
//
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(30.00005F, 0F);
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(30.00031F, 0F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow9});
this.xrTable1.SizeF = new System.Drawing.SizeF(656.9999F, 25F);
this.xrTable1.SizeF = new System.Drawing.SizeF(666.9996F, 25F);
this.xrTable1.StylePriority.UseFont = false;
//
// xrTableRow9
//
this.xrTableRow9.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell6,
this.xrTableCell7,
this.xrTableCell9,
this.xrTableCell14,
this.xrTableCell10,
@@ -125,36 +118,6 @@ namespace AdikKleve
this.xrTableRow9.Name = "xrTableRow9";
this.xrTableRow9.Weight = 1D;
//
// xrTableCell6
//
this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.AccountingPeriodStart")});
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableCell6.StylePriority.UseBorders = false;
this.xrTableCell6.StylePriority.UsePadding = false;
this.xrTableCell6.StylePriority.UseTextAlignment = false;
this.xrTableCell6.Text = "xrTableCell6";
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell6.Weight = 1D;
//
// xrTableCell7
//
this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.AccountingPeriodEnd")});
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableCell7.StylePriority.UseBorders = false;
this.xrTableCell7.StylePriority.UsePadding = false;
this.xrTableCell7.StylePriority.UseTextAlignment = false;
this.xrTableCell7.Text = "xrTableCell7";
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell7.Weight = 1D;
//
// xrTableCell9
//
this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
@@ -168,7 +131,7 @@ namespace AdikKleve
this.xrTableCell9.StylePriority.UseTextAlignment = false;
this.xrTableCell9.Text = "xrTableCell9";
this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell9.Weight = 2.4035392027126012D;
this.xrTableCell9.Weight = 2.9240886581817143D;
//
// xrTableCell14
//
@@ -177,13 +140,13 @@ namespace AdikKleve
this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.UnitPrice")});
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F);
this.xrTableCell14.StylePriority.UseBorders = false;
this.xrTableCell14.StylePriority.UsePadding = false;
this.xrTableCell14.StylePriority.UseTextAlignment = false;
this.xrTableCell14.Text = "xrTableCell14";
this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell14.Weight = 0.83099566367780386D;
this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell14.Weight = 0.64383490709582969D;
//
// xrTableCell10
//
@@ -192,13 +155,13 @@ namespace AdikKleve
this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.UnitCount", "{0:0.##}")});
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F);
this.xrTableCell10.StylePriority.UseBorders = false;
this.xrTableCell10.StylePriority.UsePadding = false;
this.xrTableCell10.StylePriority.UseTextAlignment = false;
this.xrTableCell10.Text = "xrTableCell10";
this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell10.Weight = 0.56661514355294984D;
this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell10.Weight = 0.43040753514577812D;
//
// xrTableCell12
//
@@ -207,13 +170,13 @@ namespace AdikKleve
this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.AmountSum")});
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F);
this.xrTableCell12.StylePriority.UseBorders = false;
this.xrTableCell12.StylePriority.UsePadding = false;
this.xrTableCell12.StylePriority.UseTextAlignment = false;
this.xrTableCell12.Text = "xrTableCell12";
this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell12.Weight = 0.868849379705082D;
this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell12.Weight = 0.77318974917151639D;
//
// ReportHeader
//
@@ -223,12 +186,10 @@ namespace AdikKleve
this.lblAddress,
this.xrTable3,
this.xrLabel6,
this.xrLabel5,
this.xrLabel4,
this.lblAbrechnungsText,
this.xrLabel2,
this.xrTable2});
this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F);
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportHeader.HeightF = 388.9999F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
@@ -251,7 +212,7 @@ namespace AdikKleve
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(478.9584F, 168.0417F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(201.0417F, 23.95834F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(218.0415F, 23.95834F);
this.xrLabel1.StylePriority.UseTextAlignment = false;
this.xrLabel1.Text = "xrLabel1";
this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
@@ -269,18 +230,16 @@ namespace AdikKleve
//
// xrTable3
//
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(30.00005F, 363.9999F);
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(30.00027F, 363.9999F);
this.xrTable3.Name = "xrTable3";
this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow10});
this.xrTable3.SizeF = new System.Drawing.SizeF(656.9999F, 25F);
this.xrTable3.SizeF = new System.Drawing.SizeF(666.9996F, 25F);
this.xrTable3.StylePriority.UseFont = false;
//
// xrTableRow10
//
this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell15,
this.xrTableCell16,
this.xrTableCell17,
this.xrTableCell18,
this.xrTableCell19,
@@ -288,34 +247,6 @@ namespace AdikKleve
this.xrTableRow10.Name = "xrTableRow10";
this.xrTableRow10.Weight = 1D;
//
// xrTableCell15
//
this.xrTableCell15.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableCell15.StylePriority.UseBorders = false;
this.xrTableCell15.StylePriority.UsePadding = false;
this.xrTableCell15.StylePriority.UseTextAlignment = false;
this.xrTableCell15.Text = "Von";
this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell15.Weight = 1D;
//
// xrTableCell16
//
this.xrTableCell16.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableCell16.StylePriority.UseBorders = false;
this.xrTableCell16.StylePriority.UsePadding = false;
this.xrTableCell16.StylePriority.UseTextAlignment = false;
this.xrTableCell16.Text = "Bis";
this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell16.Weight = 1D;
//
// xrTableCell17
//
this.xrTableCell17.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
@@ -328,7 +259,7 @@ namespace AdikKleve
this.xrTableCell17.StylePriority.UseTextAlignment = false;
this.xrTableCell17.Text = "Posten";
this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell17.Weight = 2.4035382732502888D;
this.xrTableCell17.Weight = 4.1497305194772167D;
//
// xrTableCell18
//
@@ -342,7 +273,7 @@ namespace AdikKleve
this.xrTableCell18.StylePriority.UseTextAlignment = false;
this.xrTableCell18.Text = "Satz";
this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell18.Weight = 0.83099597349857446D;
this.xrTableCell18.Weight = 0.913698764169778D;
//
// xrTableCell19
//
@@ -356,7 +287,7 @@ namespace AdikKleve
this.xrTableCell19.StylePriority.UseTextAlignment = false;
this.xrTableCell19.Text = "Anzahl";
this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell19.Weight = 0.56661576319449147D;
this.xrTableCell19.Weight = 0.61081572845050047D;
//
// xrTableCell20
//
@@ -370,7 +301,7 @@ namespace AdikKleve
this.xrTableCell20.StylePriority.UseTextAlignment = false;
this.xrTableCell20.Text = "Betrag";
this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell20.Weight = 0.868849379705082D;
this.xrTableCell20.Weight = 1.0972740603098934D;
//
// xrLabel6
//
@@ -378,59 +309,36 @@ namespace AdikKleve
this.xrLabel6.Multiline = true;
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(666.9999F, 23.25F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(667.0001F, 23.25F);
this.xrLabel6.StylePriority.UseFont = false;
this.xrLabel6.Text = "für den Betreuungszeitraum [AccountingPeriod] berechnen wir folgende Leistungen:";
//
// xrLabel5
//
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(30.00005F, 284F);
this.xrLabel5.Multiline = true;
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(581.4177F, 17.00003F);
this.xrLabel5.StylePriority.UseFont = false;
this.xrLabel5.Text = "[RecipientSalutation],";
this.xrLabel6.Text = "Hiermit berechnen wir für folgende Leistungen:";
//
// xrLabel4
//
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
this.xrLabel4.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(30.00005F, 234F);
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(30.00018F, 219.4167F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(650F, 17F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(666.9998F, 17F);
this.xrLabel4.StylePriority.UseBackColor = false;
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.Text = "[CustomerReferenceNumber]";
this.xrLabel4.WordWrap = false;
//
// lblAbrechnungsText
//
this.lblAbrechnungsText.BackColor = System.Drawing.Color.Transparent;
this.lblAbrechnungsText.CanShrink = true;
this.lblAbrechnungsText.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblAbrechnungsText.LocationFloat = new DevExpress.Utils.PointFloat(30.00005F, 217F);
this.lblAbrechnungsText.Name = "lblAbrechnungsText";
this.lblAbrechnungsText.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblAbrechnungsText.SizeF = new System.Drawing.SizeF(650F, 16F);
this.lblAbrechnungsText.StylePriority.UseBackColor = false;
this.lblAbrechnungsText.StylePriority.UseFont = false;
this.lblAbrechnungsText.Text = "Abrechnung über Betreuungsleistungen für [CustomerSalutation] [CustomerFirstName]" +
" [CustomerLastName]";
this.lblAbrechnungsText.WordWrap = false;
//
// xrLabel2
//
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
this.xrLabel2.CanShrink = true;
this.xrLabel2.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(30.00005F, 192F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(650F, 17F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(666.9998F, 17F);
this.xrLabel2.StylePriority.UseBackColor = false;
this.xrLabel2.StylePriority.UseFont = false;
this.xrLabel2.Text = "Rechnung Nr. [InvoiceNumber]";
@@ -447,7 +355,7 @@ namespace AdikKleve
this.xrTableRow1,
this.xrTableRow6,
this.xrTableRow8});
this.xrTable2.SizeF = new System.Drawing.SizeF(283F, 114F);
this.xrTable2.SizeF = new System.Drawing.SizeF(299.9998F, 114F);
//
// xrTableRow2
//
@@ -571,7 +479,7 @@ namespace AdikKleve
this.xrLabel12,
this.lblNotice,
this.xrTable4});
this.ReportFooter.Font = new System.Drawing.Font("Verdana", 10F);
this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportFooter.HeightF = 245.4584F;
this.ReportFooter.KeepTogether = true;
this.ReportFooter.Name = "ReportFooter";
@@ -609,7 +517,7 @@ namespace AdikKleve
// lblNotice
//
this.lblNotice.CanShrink = true;
this.lblNotice.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Italic);
this.lblNotice.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Italic);
this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(30.00005F, 44.45832F);
this.lblNotice.Name = "lblNotice";
this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -619,11 +527,11 @@ namespace AdikKleve
//
// xrTable4
//
this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(600.5F, 0F);
this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(588.9175F, 0F);
this.xrTable4.Name = "xrTable4";
this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow11});
this.xrTable4.SizeF = new System.Drawing.SizeF(86.5F, 25F);
this.xrTable4.SizeF = new System.Drawing.SizeF(108.0823F, 25F);
//
// xrTableRow11
//
@@ -638,16 +546,16 @@ namespace AdikKleve
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell23.BorderWidth = 2F;
this.xrTableCell23.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold);
this.xrTableCell23.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell23.Name = "xrTableCell23";
this.xrTableCell23.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableCell23.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F);
this.xrTableCell23.StylePriority.UseBorders = false;
this.xrTableCell23.StylePriority.UseBorderWidth = false;
this.xrTableCell23.StylePriority.UseFont = false;
this.xrTableCell23.StylePriority.UsePadding = false;
this.xrTableCell23.StylePriority.UseTextAlignment = false;
this.xrTableCell23.Text = "[TotalClaim]";
this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell23.Weight = 2.9827586206896552D;
//
// topMarginBand1
@@ -661,7 +569,7 @@ namespace AdikKleve
//
// xrLabel3
//
this.xrLabel3.Font = new System.Drawing.Font("Arial", 8F);
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(30.00005F, 201.4167F);
this.xrLabel3.Multiline = true;
this.xrLabel3.Name = "xrLabel3";
@@ -673,8 +581,8 @@ namespace AdikKleve
// xrPictureBox1
//
this.xrPictureBox1.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
this.xrPictureBox1.ImageAlignment = DevExpress.XtraPrinting.ImageAlignment.MiddleCenter;
this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 30F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(727F, 127.08F);
@@ -682,7 +590,7 @@ namespace AdikKleve
//
// xrLabel14
//
this.xrLabel14.Font = new System.Drawing.Font("Segoe Print", 8F);
this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Segoe Print", 8F);
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(30.00005F, 157.08F);
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -698,14 +606,13 @@ namespace AdikKleve
this.xrLabel13,
this.xrLabel9,
this.xrLine1});
this.bottomMarginBand1.Font = new System.Drawing.Font("Arial", 10F);
this.bottomMarginBand1.HeightF = 100F;
this.bottomMarginBand1.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.bottomMarginBand1.Name = "bottomMarginBand1";
this.bottomMarginBand1.StylePriority.UseFont = false;
//
// xrLabel13
//
this.xrLabel13.Font = new System.Drawing.Font("Arial", 8F);
this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 19.99995F);
this.xrLabel13.Multiline = true;
this.xrLabel13.Name = "xrLabel13";
@@ -716,7 +623,7 @@ namespace AdikKleve
//
// xrLabel9
//
this.xrLabel9.Font = new System.Drawing.Font("Arial", 8F);
this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(517.6666F, 19.99995F);
this.xrLabel9.Multiline = true;
this.xrLabel9.Name = "xrLabel9";
@@ -746,9 +653,11 @@ namespace AdikKleve
//
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable1});
this.Detail1.Font = new System.Drawing.Font("Verdana", 9.75F);
this.Detail1.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F);
this.Detail1.HeightF = 25F;
this.Detail1.Name = "Detail1";
this.Detail1.SortFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] {
new DevExpress.XtraReports.UI.GroupField("AccountingPeriodStart", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)});
this.Detail1.StylePriority.UseFont = false;
//
// bindingSource1
@@ -768,11 +677,13 @@ namespace AdikKleve
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
this.Margins = new System.Drawing.Printing.Margins(50, 50, 230, 100);
this.Margins = new DevExpress.Drawing.DXMargins(50F, 50F, 230F, 100F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "17.1";
this.Version = "23.2";
xrWatermark1.Id = "Watermark1";
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
@@ -788,9 +699,7 @@ namespace AdikKleve
private System.Windows.Forms.BindingSource bindingSource1;
private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
private DevExpress.XtraReports.UI.XRLabel xrLabel4;
private DevExpress.XtraReports.UI.XRLabel lblAbrechnungsText;
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.XRTable xrTable2;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
@@ -814,16 +723,12 @@ namespace AdikKleve
private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
private DevExpress.XtraReports.UI.XRTable xrTable1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow9;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
private DevExpress.XtraReports.UI.XRTable xrTable3;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow10;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;

File diff suppressed because one or more lines are too long

View File

@@ -116,6 +116,7 @@ namespace BeWo.BeWoMobilReports.Alt
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
@@ -1011,6 +1012,7 @@ namespace BeWo.BeWoMobilReports.Alt
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel12,
this.xrLabel13,
this.xrLabel1,
this.xrLabel_RecipientContactPerson,
@@ -1045,6 +1047,20 @@ namespace BeWo.BeWoMobilReports.Alt
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
//
// xrLabel12
//
this.xrLabel12.BackColor = System.Drawing.Color.Transparent;
this.xrLabel12.CanShrink = true;
this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 185.3332F);
this.xrLabel12.Name = "xrLabel12";
this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(403.4583F, 17F);
this.xrLabel12.StylePriority.UseBackColor = false;
this.xrLabel12.StylePriority.UseFont = false;
this.xrLabel12.Text = "GP: 2000088135 /13883";
this.xrLabel12.WordWrap = false;
//
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1159,5 +1175,6 @@ namespace BeWo.BeWoMobilReports.Alt
private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
private DevExpress.XtraReports.UI.XRLabel lblGruppe;
private DevExpress.XtraReports.UI.XRLabel xrLabel12;
}
}

File diff suppressed because one or more lines are too long

View File

@@ -30,6 +30,7 @@ namespace BeWo.BeWoMobilReports
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung));
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
@@ -94,7 +95,6 @@ namespace BeWo.BeWoMobilReports
this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -116,12 +116,14 @@ namespace BeWo.BeWoMobilReports
this.xrTableCell73 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell74 = new DevExpress.XtraReports.UI.XRTableCell();
this.fieldApprovedWithFactor = new DevExpress.XtraReports.UI.CalculatedField();
this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -171,6 +173,7 @@ namespace BeWo.BeWoMobilReports
this.xrLabel8.StylePriority.UseTextAlignment = false;
this.xrLabel8.Text = "xrLabel8";
this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrLabel8.TextFormatString = "{0:dd.MM.yyyy}";
//
// xrTable1
//
@@ -697,6 +700,7 @@ namespace BeWo.BeWoMobilReports
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel12,
this.xrLabel13,
this.xrLabel1,
this.xrLabel_RecipientContactPerson,
@@ -797,10 +801,6 @@ namespace BeWo.BeWoMobilReports
this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell26.Weight = 0.21685899000901443D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -1026,6 +1026,24 @@ namespace BeWo.BeWoMobilReports
this.fieldApprovedWithFactor.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldApprovedWithFactor.Name = "fieldApprovedWithFactor";
//
// xrLabel12
//
this.xrLabel12.BackColor = System.Drawing.Color.Transparent;
this.xrLabel12.CanShrink = true;
this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 185.3332F);
this.xrLabel12.Name = "xrLabel12";
this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(403.4583F, 17F);
this.xrLabel12.StylePriority.UseBackColor = false;
this.xrLabel12.StylePriority.UseFont = false;
this.xrLabel12.Text = "GP: 2000088135 /13883";
this.xrLabel12.WordWrap = false;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
//
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1048,12 +1066,14 @@ namespace BeWo.BeWoMobilReports
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "23.2";
xrWatermark1.Id = "Watermark1";
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -1146,5 +1166,6 @@ namespace BeWo.BeWoMobilReports
private DevExpress.XtraReports.UI.XRTableRow xrTableRow8;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.XRLabel lblGruppe;
private DevExpress.XtraReports.UI.XRLabel xrLabel12;
}
}

File diff suppressed because one or more lines are too long

View File

@@ -17,8 +17,9 @@ namespace BetreutesWohnenWoellReports.Invoicing
{
var inv = base.CreateSingleInvoice(invoiceCounter, costBearer, invoicePeriod, supportConcept, serviceRecords);
if (inv.InvoiceBase.CostBearer2SupportConcept.CostBearer.Organisation.Function != null && inv.InvoiceBase.CostBearer2SupportConcept.CostBearer.Organisation.Function.Value == "Jugendamt")
inv.InvoiceBase.InvoiceId = "Jugendamt";
// war bis 05.11.2024 nötig, jetzt sind alles Jugendamtsrechnungen
//if (inv.InvoiceBase.CostBearer2SupportConcept.CostBearer.Organisation.Function != null && inv.InvoiceBase.CostBearer2SupportConcept.CostBearer.Organisation.Function.Value == "Jugendamt")
inv.InvoiceBase.InvoiceId = "Jugendamt";
return inv;
}

View File

@@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using LebenshilfeRemscheid.Export;
using BeWo.Service.Plugins;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using Utils = BS.Shared.Core.Utils;
namespace LebenshilfeRemscheid.Export
{
public class CustomDataExporter : DataExporter
{
public override QueryDC CreateQuery(QueryDC query)
{
QueryDC q = FibuExport.CreateQuery(query);
CreateBuchungsExportProtokollEintrag(q);
return q;
}
}
}

View File

@@ -0,0 +1,181 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Text;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Report.ReportObjects;
using BeWo.Service.DCEntityMapper;
using BS.Shared.DataContracts;
using DevExpress.XtraPrinting;
using DevExpress.XtraReports.UI;
namespace LebenshilfeRemscheid.Export
{
public class FibuExport
{
List<FileAttachmentDC> liste = new List<FileAttachmentDC>();
public static QueryDC CreateQuery(QueryDC query)
{
DateTime dt = DateTime.Now;
DateTime.TryParse(query.Parameter[0].Value.ToString(), out dt);
var table = ExecuteQuery(GetMonatlicheRechnungenSql(dt), dt);
query.FileName = String.Format("Datev Export {0:yyyyMM}.csv", dt);
query.QueryResult = GetAbrechnungenString(dt, table);
query.Attachments = CreateInvoiceFiles(table);
return query;
}
public static String GetAbrechnungenString(DateTime dt, DataTable table)
{
DateTime lastDate = new DateTime(dt.Year, dt.Month, 1);
lastDate = lastDate.AddMonths(1).AddDays(-1);
StringBuilder sb = new StringBuilder();
sb.Append("EXTF;210;21;Buchungsstapel;7;");
sb.Append(String.Format("{0:yyyyMM}00000000000", new DateTime(dt.Year, dt.Month, 1)));
sb.Append(";;MASHERP;;Thomas;40593;960;");
sb.Append(String.Format("{0:yyyyMMdd}", new DateTime(dt.Year, 1, 1)));
sb.Append(";6;");
sb.Append(String.Format("{0:yyyyMMdd}", new DateTime(dt.Year, dt.Month, 1)));
sb.Append(";");
sb.Append(String.Format("{0:yyyyMMdd}", lastDate));
sb.AppendLine(";;;1;0;0;EUR;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;");
sb.AppendLine("Umsatz (ohne Soll/Haben-Kz);Soll/Haben-Kennzeichen;WKZ Umsatz;Kurs;Basis-Umsatz;WKZ Basis-Umsatz;Konto;Gegenkonto (ohne BU-Schlüssel);" +
"BU-Schlüssel;Belegdatum;Belegfeld 1;Belegfeld 2;Skonto;Buchungstext;Postensperre;Diverse Adressnummer;Geschäftspartnerbank;Sachverhalt;Zinssperre;" +
"Beleglink;Beleginfo - Art 1;Beleginfo - Inhalt 1;Beleginfo - Art 2;Beleginfo - Inhalt 2;Beleginfo - Art 3;Beleginfo - Inhalt 3;Beleginfo - Art 4;" +
"Beleginfo - Inhalt 4;Beleginfo - Art 5;Beleginfo - Inhalt 5;Beleginfo - Art 6;Beleginfo - Inhalt 6;Beleginfo - Art 7;Beleginfo - Inhalt 7;" +
"Beleginfo - Art 8;Beleginfo - Inhalt 8;KOST1 - Kostenstelle;KOST2 - Kostenstelle;Kost-Menge;EU-Land u. UStID;EU-Steuersatz;Abw. Versteuerungsart;" +
"Sachverhalt L+L;Funktionsergänzung L+L;BU 49 Hauptfunktionstyp;BU 49 Hauptfunktionsnummer;BU 49 Funktionsergänzung;Zusatzinformation - Art 1;" +
"Zusatzinformation- Inhalt 1;Zusatzinformation - Art 2;Zusatzinformation- Inhalt 2;Zusatzinformation - Art 3;Zusatzinformation- Inhalt 3;" +
"Zusatzinformation - Art 4;Zusatzinformation- Inhalt 4;Zusatzinformation - Art 5;Zusatzinformation- Inhalt 5;Zusatzinformation - Art 6;" +
"Zusatzinformation- Inhalt 6;Zusatzinformation - Art 7;Zusatzinformation- Inhalt 7;Zusatzinformation - Art 8;Zusatzinformation- Inhalt 8;" +
"Zusatzinformation - Art 9;Zusatzinformation- Inhalt 9;Zusatzinformation - Art 10;Zusatzinformation- Inhalt 10;Zusatzinformation - Art 11;" +
"Zusatzinformation- Inhalt 11;Zusatzinformation - Art 12;Zusatzinformation- Inhalt 12;Zusatzinformation - Art 13;Zusatzinformation- Inhalt 13;" +
"Zusatzinformation - Art 14;Zusatzinformation- Inhalt 14;Zusatzinformation - Art 15;Zusatzinformation- Inhalt 15;Zusatzinformation - Art 16;" +
"Zusatzinformation- Inhalt 16;Zusatzinformation - Art 17;Zusatzinformation- Inhalt 17;Zusatzinformation - Art 18;Zusatzinformation- Inhalt 18;" +
"Zusatzinformation - Art 19;Zusatzinformation- Inhalt 19;Zusatzinformation - Art 20;Zusatzinformation- Inhalt 20;Stück;Gewicht");
var s = GetMonatlicheRechnungenString(dt, table);
if (!String.IsNullOrWhiteSpace(s))
{
sb.Append(s);
}
return sb.ToString();
}
public static String GetMonatlicheRechnungenString(DateTime date, DataTable dt)
{
// select sip.Claim, ib.InvoiceDate, ib.Invoicenumber, Concat(ib.invoicnumber, ', ', org.Name, ', ', p.FirstName, ', ', p.LastName) AS Verwendung, ib.Oid
StringBuilder sb = new StringBuilder();
foreach (DataRow row in dt.Rows)
{
if (sb.Length > 0)
{
sb.AppendLine();
}
DateTime lastDate = new DateTime(date.Year, date.Month, 1);
lastDate = lastDate.AddMonths(1).AddDays(-1);
sb.Append(String.Format("{0:0.00}", row[0])); //Betrag
sb.Append(";S;EUR;1;");
sb.Append(String.Format("{0:0.00}", row[0])); //Betrag Basiswährung
sb.Append(";EUR;");
sb.Append("30150;"); //Konto
sb.Append("4001;"); // Erlöskonto
sb.Append(";"); //AB: Achtung falls Einführung Storno hier 20; und Soll wird zu Haben
sb.Append(String.Format("{0:ddMM}", row[1]));
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(";;");
sb.Append(String.Format("{0}", row[3])); // Buchungstext
sb.Append(";;;;;;;;;;;;;;;;;;;;;;;5000;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;");
}
return sb.ToString();
}
private static List<FileAttachmentDC> CreateInvoiceFiles(DataTable dt)
{
try
{
List<FileAttachmentDC> liste = new List<FileAttachmentDC>();
foreach (DataRow row in dt.Rows)
{
var pdf = new FileAttachmentDC();
var invoiceOid = row[4].ToString();
if (!String.IsNullOrEmpty(invoiceOid))
{
var oid = long.Parse(invoiceOid);
var invoice = DAOFactory.SearchDAO.GetServiceInvoiceByInvoiceBaseOid(oid);
//var invoice = DAOFactory.GenericDAO.LoadByID<ServiceInvoice>(oid);
var idc = MapperFactory.ServiceInvoiceDC_ServiceInvoice.MapToNewDC(invoice);
var anhang = new RechnungFF();
var ro = ServiceInvoiceRO.Create(idc);
anhang.SetReportDataSource(ro);
anhang.CreateDocument();
pdf.FileName = anhang.PrintingSystem.Document.Name + ".pdf";
using (var ms = new MemoryStream())
{
anhang.ExportToPdf(ms);
pdf.BinaryData = ms.ToArray();
}
liste.Add(pdf);
//string name = anhang.PrintingSystem.Document.Name;
//string path = @"C:\Temp\FiBuExport\";
//anhang.ExportToPdf(path + name + ".pdf");
}
}
return liste;
}
catch (Exception)
{
// continue - auch wenn gar nichts stimmt
}
return null;
}
private static String GetMonatlicheRechnungenSql(DateTime date)
{
String sql = @"
select
sip.Claim,
ib.InvoiceDate,
ib.Invoicenumber,
Concat(ib.invoicenumber,', ', org.Name, ', ', p.FirstName, ', ', p.LastName) AS Verwendung,
ib.Oid
from
person p
inner join customer c on c.personoid = p.oid
inner join supportconcept sc on sc.customeroid = c.oid
inner join costbearer2supportconcept c2s on c2s.supportconceptoid = sc.oid
inner join costbearer cb on c2s.costbeareroid = cb.oid
inner join organisation org on org.costbeareroid = cb.oid
inner join invoicebase ib on ib.costbearer2supportconceptoid = c2s.oid
inner join serviceinvoice si on si.invoicebaseoid = ib.oid
inner join serviceinvoiceperiod sip on sip.serviceinvoiceoid = si.oid
WHERE ib.`AccountingPeriodEnd` >= ':Monat_Start' AND ib.`AccountingPeriodEnd` < ':Monat_End' and ib.IsActive = 1
order by ib.Invoicenumber
";
return sql;
}
public static DataTable ExecuteQuery(String sql, DateTime dt)
{
var newsql = sql;
newsql = newsql.Replace(":Abrechnungsmonat", String.Format("{0:dd.MM.yyyy}", dt));
newsql = newsql.Replace(":Belegnr", String.Format("{0:yyMM}", dt));
newsql = newsql.Replace(":Monat_Start", String.Format("{0:yyyy-MM}-01", dt));
dt = dt.AddMonths(1);
newsql = newsql.Replace(":Monat_End", String.Format("{0:yyyy-MM}-01", dt));
return DAOFactory.AdoDAO.ExecuteQuery(newsql).Tables[0];
}
}
}

View File

@@ -67,6 +67,8 @@
</ItemGroup>
<ItemGroup>
<Compile Include="CustomHomeContentGenerator.cs" />
<Compile Include="Export\CustomDataExporter.cs" />
<Compile Include="Export\DatevExporter.cs" />
<Compile Include="Invoicing\CustomInvoiceFactory.cs" />
<Compile Include="Invoicing\CustomInvoiceCreation.cs" />
<Compile Include="LHRemscheidReportCreator.cs" />

View File

@@ -77,12 +77,15 @@ namespace MezMenzel
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldBillableX20Percent = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldArt = new DevExpress.XtraReports.UI.CalculatedField();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -102,7 +105,7 @@ namespace MezMenzel
this.xrTableServiceRecords1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableServiceRecords1.Font = new System.Drawing.Font("Arial", 10F);
this.xrTableServiceRecords1.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTableServiceRecords1.Name = "xrTableServiceRecords1";
this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
@@ -192,7 +195,7 @@ namespace MezMenzel
this.xrTable3.BorderColor = System.Drawing.Color.Black;
this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable3.Font = new System.Drawing.Font("Arial", 10F);
this.xrTable3.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable3.Name = "xrTable3";
this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
@@ -310,7 +313,7 @@ namespace MezMenzel
this.xrLabel29.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainAttendant")});
this.xrLabel29.Font = new System.Drawing.Font("Arial", 12F);
this.xrLabel29.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(314.9999F, 230F);
this.xrLabel29.Name = "xrLabel29";
this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -325,7 +328,7 @@ namespace MezMenzel
this.xrLabel26.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSPerWeek", "{0:0.00}")});
this.xrLabel26.Font = new System.Drawing.Font("Arial", 12F);
this.xrLabel26.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(468F, 190F);
this.xrLabel26.Name = "xrLabel26";
this.xrLabel26.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -341,7 +344,7 @@ namespace MezMenzel
this.xrLabel25.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReferenceNumber")});
this.xrLabel25.Font = new System.Drawing.Font("Arial", 12F);
this.xrLabel25.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(162F, 150F);
this.xrLabel25.Name = "xrLabel25";
this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -354,7 +357,7 @@ namespace MezMenzel
// xrLabel23
//
this.xrLabel23.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel23.Font = new System.Drawing.Font("Arial", 12F);
this.xrLabel23.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(162F, 110F);
this.xrLabel23.Name = "xrLabel23";
this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -370,7 +373,7 @@ namespace MezMenzel
this.xrLabel21.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Year")});
this.xrLabel21.Font = new System.Drawing.Font("Arial", 12F);
this.xrLabel21.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(468F, 270F);
this.xrLabel21.Name = "xrLabel21";
this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -385,7 +388,7 @@ namespace MezMenzel
this.xrLabel9.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Month")});
this.xrLabel9.Font = new System.Drawing.Font("Arial", 12F);
this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(171F, 270F);
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -397,7 +400,7 @@ namespace MezMenzel
//
// xrLabel20
//
this.xrLabel20.Font = new System.Drawing.Font("Arial", 12F);
this.xrLabel20.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(396F, 270F);
this.xrLabel20.Name = "xrLabel20";
this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -409,7 +412,7 @@ namespace MezMenzel
//
// xrLabel19
//
this.xrLabel19.Font = new System.Drawing.Font("Arial", 12F);
this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(0F, 270F);
this.xrLabel19.Name = "xrLabel19";
this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -419,7 +422,7 @@ namespace MezMenzel
//
// xrLabel18
//
this.xrLabel18.Font = new System.Drawing.Font("Arial", 12F);
this.xrLabel18.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(0F, 230F);
this.xrLabel18.Name = "xrLabel18";
this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -429,7 +432,7 @@ namespace MezMenzel
//
// xrLabel15
//
this.xrLabel15.Font = new System.Drawing.Font("Arial", 12F);
this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 190F);
this.xrLabel15.Name = "xrLabel15";
this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -439,7 +442,7 @@ namespace MezMenzel
//
// xrLabel14
//
this.xrLabel14.Font = new System.Drawing.Font("Arial", 12F);
this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 150F);
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -451,7 +454,7 @@ namespace MezMenzel
//
// xrLabel12
//
this.xrLabel12.Font = new System.Drawing.Font("Arial", 12F);
this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 110F);
this.xrLabel12.Name = "xrLabel12";
this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -463,7 +466,8 @@ namespace MezMenzel
//
// xrLabel1
//
this.xrLabel1.Font = new System.Drawing.Font("Arial", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 18F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel1.Multiline = true;
this.xrLabel1.Name = "xrLabel1";
@@ -476,7 +480,7 @@ namespace MezMenzel
//
// xrPictureBox1
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(324F, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(243F, 99.00001F);
@@ -505,7 +509,7 @@ namespace MezMenzel
//
// topMarginBand1
//
this.topMarginBand1.Font = new System.Drawing.Font("Times New Roman", 9.75F);
this.topMarginBand1.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F);
this.topMarginBand1.HeightF = 64F;
this.topMarginBand1.Name = "topMarginBand1";
this.topMarginBand1.StylePriority.UseFont = false;
@@ -518,13 +522,16 @@ namespace MezMenzel
// ReportFooter
//
this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel5,
this.xrPictureBox2,
this.xrPictureBox3,
this.xrLabel17,
this.xrLine2,
this.xrLine1,
this.xrLabel8,
this.xrLabel2,
this.xrLabel7,
this.xrLabel6,
this.xrLabel5,
this.xrLabel4,
this.xrLabel3});
this.ReportFooter.HeightF = 263F;
@@ -548,7 +555,7 @@ namespace MezMenzel
//
this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "fieldBillableX20Percent", "{0:0.##}")});
this.xrLabel8.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(459.0002F, 36F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 5, 0, 0, 100F);
@@ -561,7 +568,7 @@ namespace MezMenzel
//
// xrLabel2
//
this.xrLabel2.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(153F, 36F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -574,44 +581,32 @@ namespace MezMenzel
// xrLabel7
//
this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel7.Font = new System.Drawing.Font("Arial", 12F);
this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(306F, 243F);
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(306F, 20F);
this.xrLabel7.StylePriority.UseBorders = false;
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.Text = "Unterschrift Klient(in)";
this.xrLabel7.Text = "Datum, Unterschrift Klient(in)";
//
// xrLabel6
//
this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel6.Font = new System.Drawing.Font("Arial", 12F);
this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(306F, 153F);
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(306F, 20F);
this.xrLabel6.StylePriority.UseBorders = false;
this.xrLabel6.StylePriority.UseFont = false;
this.xrLabel6.Text = "Unterschrift Mitarbeiter(in)";
//
// xrLabel5
//
this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel5.Font = new System.Drawing.Font("Arial", 12F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 153F);
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(153F, 20F);
this.xrLabel5.StylePriority.UseBorders = false;
this.xrLabel5.StylePriority.UseFont = false;
this.xrLabel5.Text = "Datum";
this.xrLabel6.Text = "Datum, Unterschrift Mitarbeiter(in)";
//
// xrLabel4
//
this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMBillable", "{0:0.##}")});
this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(459.0002F, 0F);
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 5, 0, 0, 100F);
@@ -624,7 +619,7 @@ namespace MezMenzel
//
// xrLabel3
//
this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(152.9999F, 0F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -654,6 +649,53 @@ namespace MezMenzel
this.fieldArt.FieldType = DevExpress.XtraReports.UI.FieldType.String;
this.fieldArt.Name = "fieldArt";
//
// xrLabel5
//
this.xrLabel5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerSignatureDate", "{0:dd.MM.yyyy}")});
this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(306F, 216F);
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(106F, 24.5F);
this.xrLabel5.StylePriority.UseFont = false;
this.xrLabel5.StylePriority.UseTextAlignment = false;
this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
//
// xrPictureBox2
//
this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "EmployeeSignature")});
this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(413F, 117F);
this.xrPictureBox2.Name = "xrPictureBox2";
this.xrPictureBox2.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint";
this.xrPictureBox2.SizeF = new System.Drawing.SizeF(199.3611F, 35.50002F);
this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrPictureBox3
//
this.xrPictureBox3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "CustomerSignature")});
this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(413F, 207F);
this.xrPictureBox3.Name = "xrPictureBox3";
this.xrPictureBox3.SizeF = new System.Drawing.SizeF(199.3611F, 35.50002F);
this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrLabel17
//
this.xrLabel17.BackColor = System.Drawing.Color.Transparent;
this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeSignatureDate", "{0:dd.MM.yyyy}")});
this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(305.9999F, 126F);
this.xrLabel17.Name = "xrLabel17";
this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel17.SizeF = new System.Drawing.SizeF(106F, 24.5F);
this.xrLabel17.StylePriority.UseBackColor = false;
this.xrLabel17.StylePriority.UseFont = false;
this.xrLabel17.StylePriority.UseTextAlignment = false;
this.xrLabel17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
//
// Stundenzettel
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -668,19 +710,19 @@ namespace MezMenzel
this.fieldBillableX20Percent,
this.fieldArt});
this.DataSource = this.bindingSource1;
this.Font = new System.Drawing.Font("Times New Roman", 9.75F);
this.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F);
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.formattingRuleStartDate,
this.formattingRuleServiceDesc,
this.formattingRuleCostBearer,
this.formattingRuleEmployeeName});
this.Margins = new System.Drawing.Printing.Margins(82, 75, 64, 30);
this.Margins = new DevExpress.Drawing.DXMargins(82F, 75F, 64F, 30F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.SnapGridSize = 9F;
this.SnappingMode = DevExpress.XtraReports.UI.SnappingMode.SnapToGrid;
this.Version = "17.1";
this.Version = "23.2";
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
@@ -729,7 +771,6 @@ namespace MezMenzel
private DevExpress.XtraReports.UI.XRLabel xrLabel4;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
@@ -742,5 +783,9 @@ namespace MezMenzel
private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
private DevExpress.XtraReports.UI.CalculatedField fieldArt;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox3;
private DevExpress.XtraReports.UI.XRLabel xrLabel17;
}
}

File diff suppressed because one or more lines are too long