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-09-24 09:17:22 +02:00
parent 699c9fe66b ef90431fcb
commit 7491aa750d
12 changed files with 853 additions and 890 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
Queries/Liste aller Klienten mit Betreuung, Hilfeplaneckdaten und Bewilligungsangaben.txt Normal file
View File

@@ -0,0 +1,61 @@
// Ursprünglich Gerdas Pflegedienst 3265049248 (APP1)
// Liste aller Klienten mit Betreuung (Filter über Rollenname) u Hilfeplaneckdaten sowie Bewilligungsangaben
SELECT p.LastName as Nachname, p.FirstName as Vorname,
emp2Cust.Mitarbeiter1 AS `1. Betreuung`,
emp2Cust2.Mitarbeiter2 AS `2. Betreuung`,
emp2Cust3.Mitarbeiter3 AS `Vertretung`,
o.`Name` as 'Kostentraeger',
cb2sc.ApprovedStartDate as 'Bewilligt von',
cb2sc.ApprovedEndDate as 'Bewilligt bis',
sc.ApprovalDate AS 'Bewilligungseingang',
sc.RenewalSendDate AS 'Beantragung Verlängerung',
-- Es folgen nochmal die 3 Betreuer, falls sie im HP vergeben wurden
(SELECT CONCAT(p2.`FirstName`, ' ', p2.`LastName`, ' ', ROUND(scap2e1.Betreuungsschluessel, 2), CASE WHEN scap2e1.IsAbsolut = 0 THEN '%' ELSE '' END)
FROM supportconceptapprovalperiod2employee scap2e1
INNER JOIN `employee` e ON scap2e1.`EmployeeOid` = e.`Oid`
INNER JOIN `person` p2 ON e.`PersonOid` = p2.`Oid`
WHERE scap2e1.SupportConceptApprovalPeriodOid = scap.oid ORDER BY scap2e1.EmployeeOid LIMIT 0, 1) AS `Betreuer 1 aus HP`,
(SELECT CONCAT(p2.`FirstName`, ' ', p2.`LastName`, ' ', ROUND(scap2e1.Betreuungsschluessel, 2), CASE WHEN scap2e1.IsAbsolut = 0 THEN '%' ELSE '' END)
FROM supportconceptapprovalperiod2employee scap2e1
INNER JOIN `employee` e ON scap2e1.`EmployeeOid` = e.`Oid`
INNER JOIN `person` p2 ON e.`PersonOid` = p2.`Oid`
WHERE scap2e1.SupportConceptApprovalPeriodOid = scap.oid ORDER BY scap2e1.EmployeeOid LIMIT 1, 1) AS `Betreuer 2 aus HP`,
(SELECT CONCAT(p2.`FirstName`, ' ', p2.`LastName`, ' ', ROUND(scap2e1.Betreuungsschluessel, 2), CASE WHEN scap2e1.IsAbsolut = 0 THEN '%' ELSE '' END)
FROM supportconceptapprovalperiod2employee scap2e1
INNER JOIN `employee` e ON scap2e1.`EmployeeOid` = e.`Oid`
INNER JOIN `person` p2 ON e.`PersonOid` = p2.`Oid`
WHERE scap2e1.SupportConceptApprovalPeriodOid = scap.oid ORDER BY scap2e1.EmployeeOid LIMIT 2, 1) AS `Betreuer 3 aus HP`,
Round(scap.ApprovedBEPerInterval , 2) as 'Bewilligte Stunden',
CONCAT(Date_Format(scap.Start, '%d.%m.%Y'), ' - ', Date_Format(scap.EndDate, '%d.%m.%Y'), ' ', cat.Name) AS 'Bewilligungsangaben'
from `person` p
inner join `customer` c on p.Oid = c.PersonOid
inner join `supportconcept` sc on c.Oid = sc.CustomerOid
inner join `costbearer2supportconcept` cb2sc on sc.Oid = cb2sc.SupportConceptOid
join `supportconceptapprovalperiod` scap on cb2sc.`Oid` = scap.`CostBearer2SupportConceptOid`
inner join servicecategory cat on scap.ServiceCategoryOid = cat.Oid
inner join `costbearer` cb on cb2sc.`CostBearerOid` = cb.`Oid`
inner join `organisation` o on cb.`Oid` = o.`CostBearerOid`
left outer JOIN
(select e2c.`CustomerOid`, CONCAT(p2.`FirstName`, ' ', p2.`LastName`) as Mitarbeiter1, ve.`Value` as 'Rolle' from `employee2customer` e2c
inner join `employee` e on e2c.`EmployeeOid` = e.`Oid`
inner join `person` p2 on e.`PersonOid` = p2.`Oid`
inner join `valuelistentry2object` v2o on v2o.`ObjectOid` = e2c.`Oid` and v2o.`ObjectTid` = 9
inner join `valuelistentry` ve on v2o.`ValueListEntryOid` = ve.`Oid` and ve.`Value` like '%1. Betreuung%') as emp2Cust
on emp2Cust.`CustomerOid` = c.`Oid`
left outer JOIN
(select e2c.`CustomerOid`, CONCAT(p2.`FirstName`, ' ', p2.`LastName`) as Mitarbeiter2, ve.`Value` as 'Rolle2' from `employee2customer` e2c
inner join `employee` e on e2c.`EmployeeOid` = e.`Oid`
inner join `person` p2 on e.`PersonOid` = p2.`Oid`
inner join `valuelistentry2object` v2o on v2o.`ObjectOid` = e2c.`Oid` and v2o.`ObjectTid` = 9
inner join `valuelistentry` ve on v2o.`ValueListEntryOid` = ve.`Oid` and ve.`Value` like '%2. Betreuung%') as emp2Cust2
on emp2Cust2.`CustomerOid` = c.`Oid`
left outer JOIN
(select e2c.`CustomerOid`, CONCAT(p2.`FirstName`, ' ', p2.`LastName`) as Mitarbeiter3, ve.`Value` as 'Rolle3' from `employee2customer` e2c
inner join `employee` e on e2c.`EmployeeOid` = e.`Oid`
inner join `person` p2 on e.`PersonOid` = p2.`Oid`
inner join `valuelistentry2object` v2o on v2o.`ObjectOid` = e2c.`Oid` and v2o.`ObjectTid` = 9
inner join `valuelistentry` ve on v2o.`ValueListEntryOid` = ve.`Oid` and ve.`Value` like '%Vertretung%') as emp2Cust3
on emp2Cust3.`CustomerOid` = c.`Oid`
WHERE c.IsActive <> 0 and sc.IsActive = 1 and p.LastName <> 'Fahrzeug'
ORDER BY p.LastName;

1167
ReportImp/BeWoAlsdorf/InvoiceCustomerReport.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

267
ReportImp/BeWoAlsdorf/InvoiceCustomerReport.resx
View File

File diff suppressed because one or more lines are too long

114
ReportImp/BeWoAlsdorf/SettlementReport.Designer.cs generated
View File

@@ -32,7 +32,6 @@ namespace BeWoAlsdorf.Alt
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung));
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -121,12 +120,18 @@ namespace BeWoAlsdorf.Alt
this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -139,23 +144,12 @@ namespace BeWoAlsdorf.Alt
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel9});
this.xrPictureBox1});
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportHeader.HeightF = 120F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
// xrLabel9
//
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(187.5F, 50F);
this.xrLabel9.Multiline = true;
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel9.SizeF = new System.Drawing.SizeF(292F, 17F);
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.Text = "\r\n";
//
// xrLabel8
//
this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -508,7 +502,7 @@ namespace BeWoAlsdorf.Alt
// RecipientPostCodeAndTown
//
this.RecipientPostCodeAndTown.CanShrink = true;
this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0F, 68.00003F);
this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0F, 88.00003F);
this.RecipientPostCodeAndTown.Name = "RecipientPostCodeAndTown";
this.RecipientPostCodeAndTown.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.RecipientPostCodeAndTown.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -519,7 +513,7 @@ namespace BeWoAlsdorf.Alt
// xrLabel_RecipientStreet
//
this.xrLabel_RecipientStreet.CanShrink = true;
this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0F, 51.00002F);
this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0F, 71.00002F);
this.xrLabel_RecipientStreet.Name = "xrLabel_RecipientStreet";
this.xrLabel_RecipientStreet.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel_RecipientStreet.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -530,7 +524,7 @@ namespace BeWoAlsdorf.Alt
// xrLabel_RecipientDivision
//
this.xrLabel_RecipientDivision.CanShrink = true;
this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 34.00002F);
this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 54.00002F);
this.xrLabel_RecipientDivision.Name = "xrLabel_RecipientDivision";
this.xrLabel_RecipientDivision.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel_RecipientDivision.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -541,7 +535,7 @@ namespace BeWoAlsdorf.Alt
// xrLabel_RecipientContactPerson
//
this.xrLabel_RecipientContactPerson.CanShrink = true;
this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0F, 17.00001F);
this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0F, 37.00001F);
this.xrLabel_RecipientContactPerson.Name = "xrLabel_RecipientContactPerson";
this.xrLabel_RecipientContactPerson.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel_RecipientContactPerson.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -552,7 +546,7 @@ namespace BeWoAlsdorf.Alt
// xrLabel1
//
this.xrLabel1.CanShrink = true;
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel1.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -569,7 +563,7 @@ namespace BeWoAlsdorf.Alt
this.xrLabel11,
this.lblNotice});
this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportFooter.HeightF = 209F;
this.ReportFooter.HeightF = 213.2501F;
this.ReportFooter.KeepTogether = true;
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
@@ -740,12 +734,17 @@ namespace BeWoAlsdorf.Alt
//
// bottomMarginBand1
//
this.bottomMarginBand1.HeightF = 38.91665F;
this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel5,
this.xrLabel7,
this.xrLabel13});
this.bottomMarginBand1.HeightF = 89.83345F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrRichText1,
this.xrLabel1,
this.xrLabel_RecipientContactPerson,
this.xrLabel_RecipientDivision,
@@ -1049,6 +1048,72 @@ namespace BeWoAlsdorf.Alt
this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell58.Weight = 0.21685899000901443D;
//
// xrLabel5
//
this.xrLabel5.BorderColor = System.Drawing.Color.YellowGreen;
this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Calibri", 9F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
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(249.2914F, 84.5417F);
this.xrLabel5.StylePriority.UseBorderColor = false;
this.xrLabel5.StylePriority.UseBorders = false;
this.xrLabel5.StylePriority.UseFont = false;
this.xrLabel5.Text = "BeWo Alsdorf\r\nDorothee Spiegelmacher &\r\nChristina Lahaye GbR\r\nOtto-Wels-Str. 8\r\n5" +
"2477 Alsdorf";
//
// xrLabel7
//
this.xrLabel7.BorderColor = System.Drawing.Color.YellowGreen;
this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Calibri", 9F);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(249.2914F, 0F);
this.xrLabel7.Multiline = true;
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(199.0439F, 84.5417F);
this.xrLabel7.StylePriority.UseBorderColor = false;
this.xrLabel7.StylePriority.UseBorders = false;
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.Text = "Tel.: 02404/9030538\r\nTel.: 02404/9030537\r\nFax: 02404/9030536\r\nE-Mail: info@bewo-a" +
"lsdorf.de\r\nInternet: www.bewo-alsdorf.de";
//
// xrLabel13
//
this.xrLabel13.BorderColor = System.Drawing.Color.YellowGreen;
this.xrLabel13.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Calibri", 9F);
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(448.3353F, 0F);
this.xrLabel13.Multiline = true;
this.xrLabel13.Name = "xrLabel13";
this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel13.SizeF = new System.Drawing.SizeF(201.6649F, 84.5417F);
this.xrLabel13.StylePriority.UseBorderColor = false;
this.xrLabel13.StylePriority.UseBorders = false;
this.xrLabel13.StylePriority.UseFont = false;
this.xrLabel13.Text = "Bankverbindung: \r\nSparkasse Aachen\r\nIBAN: DE25 3905 0000 1072 6639 64\r\nBIC: AACSD" +
"E33XXX\r\nSteuernr. 202/5024/2814";
//
// xrPictureBox1
//
this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(357.2081F, 16.00001F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(294.7916F, 95.83334F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrRichText1
//
this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Calibri", 11F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
this.xrRichText1.SizeF = new System.Drawing.SizeF(292F, 20F);
this.xrRichText1.StylePriority.UsePadding = false;
//
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1064,7 +1129,7 @@ namespace BeWoAlsdorf.Alt
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
this.Margins = new DevExpress.Drawing.DXMargins(75F, 74F, 100F, 38.91665F);
this.Margins = new DevExpress.Drawing.DXMargins(75F, 74F, 100F, 89.83345F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
@@ -1075,6 +1140,7 @@ namespace BeWoAlsdorf.Alt
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -1128,7 +1194,6 @@ namespace BeWoAlsdorf.Alt
private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
private DevExpress.XtraReports.UI.DetailBand Detail1;
private DevExpress.XtraReports.UI.XRTable xrTable5;
@@ -1172,5 +1237,10 @@ namespace BeWoAlsdorf.Alt
private DevExpress.XtraReports.UI.XRTableCell xrTableCell31;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow13;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRLabel xrLabel13;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
private DevExpress.XtraReports.UI.XRRichText xrRichText1;
}
}

6
ReportImp/BeWoAlsdorf/SettlementReport.resx
View File

File diff suppressed because one or more lines are too long

98
ReportImp/BeWoAlsdorf/SettlementReport2.Designer.cs generated
View File

@@ -30,8 +30,8 @@ namespace BeWoAlsdorf
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung));
DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung));
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
@@ -130,6 +130,11 @@ namespace BeWoAlsdorf
this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
@@ -137,6 +142,7 @@ namespace BeWoAlsdorf
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -148,6 +154,8 @@ namespace BeWoAlsdorf
//
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrPictureBox1});
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportHeader.HeightF = 120F;
this.ReportHeader.Name = "ReportHeader";
@@ -522,7 +530,7 @@ namespace BeWoAlsdorf
// RecipientPostCodeAndTown
//
this.RecipientPostCodeAndTown.CanShrink = true;
this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0F, 68.00003F);
this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0F, 88.00003F);
this.RecipientPostCodeAndTown.Name = "RecipientPostCodeAndTown";
this.RecipientPostCodeAndTown.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.RecipientPostCodeAndTown.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -533,7 +541,7 @@ namespace BeWoAlsdorf
// xrLabel_RecipientStreet
//
this.xrLabel_RecipientStreet.CanShrink = true;
this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0F, 51.00002F);
this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0F, 71.00002F);
this.xrLabel_RecipientStreet.Name = "xrLabel_RecipientStreet";
this.xrLabel_RecipientStreet.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel_RecipientStreet.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -544,7 +552,7 @@ namespace BeWoAlsdorf
// xrLabel_RecipientDivision
//
this.xrLabel_RecipientDivision.CanShrink = true;
this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 34.00002F);
this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 54.00002F);
this.xrLabel_RecipientDivision.Name = "xrLabel_RecipientDivision";
this.xrLabel_RecipientDivision.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel_RecipientDivision.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -555,7 +563,7 @@ namespace BeWoAlsdorf
// xrLabel_RecipientContactPerson
//
this.xrLabel_RecipientContactPerson.CanShrink = true;
this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0F, 17.00001F);
this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0F, 37.00001F);
this.xrLabel_RecipientContactPerson.Name = "xrLabel_RecipientContactPerson";
this.xrLabel_RecipientContactPerson.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel_RecipientContactPerson.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -566,7 +574,7 @@ namespace BeWoAlsdorf
// xrLabel1
//
this.xrLabel1.CanShrink = true;
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel1.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -583,7 +591,7 @@ namespace BeWoAlsdorf
this.xrLabel11,
this.lblNotice});
this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportFooter.HeightF = 209F;
this.ReportFooter.HeightF = 211.8153F;
this.ReportFooter.KeepTogether = true;
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
@@ -754,12 +762,17 @@ namespace BeWoAlsdorf
//
// bottomMarginBand1
//
this.bottomMarginBand1.HeightF = 75.41666F;
this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel5,
this.xrLabel7,
this.xrLabel9});
this.bottomMarginBand1.HeightF = 91.62274F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrRichText1,
this.xrLabel1,
this.xrLabel_RecipientContactPerson,
this.xrLabel_RecipientDivision,
@@ -1151,6 +1164,66 @@ namespace BeWoAlsdorf
this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell60.Weight = 0.16397432767427886D;
//
// xrLabel5
//
this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Calibri", 9F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
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(249.2914F, 84.5417F);
this.xrLabel5.StylePriority.UseBorders = false;
this.xrLabel5.StylePriority.UseFont = false;
this.xrLabel5.Text = "BeWo Alsdorf\r\nDorothee Spiegelmacher &\r\nChristina Lahaye GbR\r\nOtto-Wels-Str. 8\r\n5" +
"2477 Alsdorf";
//
// xrLabel7
//
this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Calibri", 9F);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(249.2914F, 0F);
this.xrLabel7.Multiline = true;
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(199.0439F, 84.5417F);
this.xrLabel7.StylePriority.UseBorders = false;
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.Text = "Tel.: 02404/9030538\r\nTel.: 02404/9030537\r\nFax: 02404/9030536\r\nE-Mail: info@bewo-a" +
"lsdorf.de\r\nInternet: www.bewo-alsdorf.de";
//
// xrLabel9
//
this.xrLabel9.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Calibri", 9F);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(448.3353F, 0F);
this.xrLabel9.Multiline = true;
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(201.6649F, 84.5417F);
this.xrLabel9.StylePriority.UseBorders = false;
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.Text = "Bankverbindung: \r\nSparkasse Aachen\r\nIBAN: DE25 3905 0000 1072 6639 64\r\nBIC: AACSD" +
"E33XXX\r\nSteuernr. 202/5024/2814";
//
// xrPictureBox1
//
this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(357.2081F, 16.00001F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(294.7916F, 95.83334F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrRichText1
//
this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Calibri", 11F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
this.xrRichText1.SizeF = new System.Drawing.SizeF(292F, 20F);
this.xrRichText1.StylePriority.UsePadding = false;
//
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1162,13 +1235,14 @@ namespace BeWoAlsdorf
this.GroupHeader1,
this.DetailReport,
this.GroupFooter1});
this.BorderColor = System.Drawing.Color.YellowGreen;
this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
this.fieldApprovedFLSWithFactor});
this.DataSource = this.bindingSource1;
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
this.Margins = new DevExpress.Drawing.DXMargins(75F, 74F, 100F, 75.41666F);
this.Margins = new DevExpress.Drawing.DXMargins(75F, 74F, 100F, 91.62274F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
@@ -1180,6 +1254,7 @@ namespace BeWoAlsdorf
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -1284,5 +1359,10 @@ namespace BeWoAlsdorf
private DevExpress.XtraReports.UI.XRTableRow xrTableRow13;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
private DevExpress.XtraReports.UI.XRRichText xrRichText1;
}
}

6
ReportImp/BeWoAlsdorf/SettlementReport2.resx
View File

File diff suppressed because one or more lines are too long

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

@@ -98,6 +98,7 @@ namespace LebenshilfeRemscheid.Export
sb.Append(";");
sb.Append(String.Format("{0}", row[4])); //Belegfeld 2
sb.Append(";;");
//sb.Append(String.Format("{0:MM}/{0:yyyy} {1}, {2}", lastDate, row[3], row[4])); // Buchungstext
sb.Append(String.Format("{0:MM}/{0:yyyy} {1}", lastDate, row[3])); // Buchungstext
sb.Append(";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;");
}
@@ -113,7 +114,7 @@ namespace LebenshilfeRemscheid.Export
{
var pdf = new FileAttachmentDC();
var invoiceOid = row[4].ToString();
var invoiceOid = row[5].ToString();
if (!String.IsNullOrEmpty(invoiceOid))
{
var oid = long.Parse(invoiceOid);

6
ReportImp/LebenshilfeRemscheidFF/Export/DatevExporter.cs
View File

@@ -96,9 +96,9 @@ namespace LebenshilfeRemscheid.Export
sb.Append(";");
sb.Append(String.Format("{0}", row[2])); //Belegfeld 1
sb.Append(";");
sb.Append(String.Format("{0}", row[4])); //Belegfeld 2
//sb.Append(String.Format("{0}", row[4])); //Belegfeld 2
sb.Append(";;");
sb.Append(String.Format("{0:MM}/{0:yyyy} {1}", lastDate, row[3])); // Buchungstext
sb.Append(String.Format("{0:MM}/{0:yyyy} {1}, {2}", lastDate, row[3], row[4])); // Buchungstext
sb.Append(";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;");
}
return sb.ToString();
@@ -113,7 +113,7 @@ namespace LebenshilfeRemscheid.Export
{
var pdf = new FileAttachmentDC();
var invoiceOid = row[4].ToString();
var invoiceOid = row[5].ToString();
if (!String.IsNullOrEmpty(invoiceOid))
{
var oid = long.Parse(invoiceOid);

2
ReportImp/LebenshilfeRemscheidFF/RechnungFF.cs
View File

@@ -21,7 +21,7 @@ namespace LebenshilfeRemscheid
public void SetReportDataSource(ServiceInvoiceRO pRO)
{
lblRechnungsname.Text = pRO.CustomerLastName + "_" + pRO.CustomerFirstName + "" + pRO.InvoiceDate + "_" + pRO.InvoiceNumber;
lblRechnungsname.Text = pRO.InvoiceNumber;
if (pRO.CustomerSalutation == "Herr")
{
pRO.CustomerSalutation = "Herrn";

4
ReportImp/WegweiserBetreuungsdienstReports/SettlementReport.cs
View File

@@ -28,6 +28,10 @@ namespace BeWo.WegweiserBetreuungsdienstReports.Alt
//xrLabel3.Text = "Abrechnung Betreuungsleistungen / Bewilligungsbescheid vom [ApprovalNoticeDateString]";
pRO.InvoiceDate = string.Format("Datum: {0}", pRO.InvoiceDate);
if (pRO.ClaimWithEigenbeteiligung < 0)
{
pRO.FinalSentence = "";
}
if (pRO.DifferentHourlyRateCount == 3)
{

9
ReportImp/WegweiserBetreuungsdienstReports/SettlementReport2.cs
View File

@@ -53,11 +53,8 @@ namespace BeWo.WegweiserBetreuungsdienstReports
}
}
pRO.RateFactor = (double)rateFactor;
cellFactorText.Text = String.Format("- zzgl. Faktor {0:0.00}:", pRO.RateFactor);
cellApprovedFlsFactor.Text = pRO.ApprovedFLSWithFactor;
xrLabel3.Text = "Abrechnung Betreuungsleistungen";
if (pRO.InvoiceBaseOid.HasValue)
{
@@ -72,6 +69,10 @@ namespace BeWo.WegweiserBetreuungsdienstReports
}
}
}
if (pRO.Claim < 0)
{
pRO.FinalSentence = "";
}
if (pRO.AmountBillableTotal - (pRO.Claim + pRO.AmountAdvancedPayments) != 0)
{
@@ -80,8 +81,6 @@ namespace BeWo.WegweiserBetreuungsdienstReports
lblDifferenzrechnungText.Text = "Höhe der bereits gestellten Rechnung vor Stundensatzanpassung:";
lblDifferenzrechnung.Text = string.Format("{0:c}", pRO.AmountBillableTotal - (pRO.AmountAdvancedPayments + pRO.Claim));
}
this.bindingSource1.DataSource = pRO;
}
}