From 7d690589d0983e88edabe9811d2f0b4dba3ab982 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Mon, 4 Sep 2023 15:11:05 +0200 Subject: [PATCH] Alloheim insbesondere SAPExporter, aber auch nochmal Invoicing --- ReportImp/Alloheim/Alloheim.csproj | 3 +- ReportImp/Alloheim/Export/SAPExporter.cs | 97 ++++--- .../InvoiceCustomerReport.Designer.cs | 272 +++++++++--------- .../Invoicing/AssistenzInvoiceCreation.cs | 102 +++++++ .../Invoicing/CustomInvoiceCreation.cs | 96 ------- .../Invoicing/CustomInvoiceFactory.cs | 38 ++- .../Invoicing/SettlementInvoiceCreation.cs | 37 +++ .../Service/CustomAccountingService.cs | 48 ++++ .../Alloheim/ServiceInvoiceReport.Designer.cs | 103 +++---- .../Alloheim/SettlementReport2.Designer.cs | 84 +++--- ReportImp/Alloheim/SettlementReport2.resx | 10 +- 11 files changed, 531 insertions(+), 359 deletions(-) create mode 100644 ReportImp/Alloheim/Invoicing/AssistenzInvoiceCreation.cs delete mode 100644 ReportImp/Alloheim/Invoicing/CustomInvoiceCreation.cs create mode 100644 ReportImp/Alloheim/Service/CustomAccountingService.cs diff --git a/ReportImp/Alloheim/Alloheim.csproj b/ReportImp/Alloheim/Alloheim.csproj index f3dd80214..2dc334f6f 100644 --- a/ReportImp/Alloheim/Alloheim.csproj +++ b/ReportImp/Alloheim/Alloheim.csproj @@ -57,7 +57,7 @@ InvoiceCustomerReport.cs - + @@ -73,6 +73,7 @@ ServiceInvoiceReport.cs + Component diff --git a/ReportImp/Alloheim/Export/SAPExporter.cs b/ReportImp/Alloheim/Export/SAPExporter.cs index 0a63401cd..ed3fced67 100644 --- a/ReportImp/Alloheim/Export/SAPExporter.cs +++ b/ReportImp/Alloheim/Export/SAPExporter.cs @@ -19,7 +19,7 @@ namespace Alloheim.Export DateTime dt = DateTime.Now; DateTime.TryParse(query.Parameter[0].Value.ToString(), out dt); - query.FileName = String.Format("Datev Export {0:yyyyMM}.csv", dt); + query.FileName = String.Format("1192_{0:yyyyMMdd}_092558_FIBU.TXT", dt); query.QueryResult = GetAbrechnungenString(dt); return query; @@ -75,39 +75,39 @@ namespace Alloheim.Export DateTime lastDate = new DateTime(date.Year, date.Month, 1); lastDate = lastDate.AddMonths(1).AddDays(-1); - sb.Append("7177\t"); // Buchungskreis 7177 + sb.Append("1192\t"); // Buchungskreis 1192 sb.Append("DR\t"); // Beleg DR für Rechnung / DG für Gutschrift sb.Append(String.Format("{0:ddMMyyyy} \t", lastDate)); sb.Append(String.Format("{0:ddMMyyyy} \t", lastDate)); sb.Append("EUR\t"); - sb.Append(String.Format("7177{0:ddMMyyyy} \t", lastDate));// Profitcenter + Rechnungs - Nr.VN - sb.Append("7177\t"); // Belegkopftext 7177 + sb.Append(String.Format("1192{0:ddMMyyyy} \t", lastDate));// Profitcenter + Rechnungs - Nr.VN + sb.Append("1192\t"); // Belegkopftext 1192 sb.Append("D\t"); // D = Debitorenposition / zweite Zeile: S = Sachkontenposition sb.Append("01\t"); // Kontoart D: S=01 H=11 / zweite Zeile: Kontoart S: S=40 H=50 sb.Append(String.Format("{0}\t", row[1])); //DebitorNumber / zweite Zeile: Sachkonto SAP sb.Append(String.Format("{0:0.00}\t", row[0])); //Betrag sb.Append("00\t"); // Umsatzsteuerschlüssel - sb.Append("H\t"); // zweite Zeile: S - sb.Append(String.Format("7177{0}\t", row[1])); // Debitorennummer Bewohner - sb.Append(String.Format("7177{0} {1:MM}/{1:yyyy}:{2}\t", row[1], lastDate, row[3])); // Buchungstext: Bew.Nr., Abr.-Zeitraum, Nachname, Vorname + sb.Append("S\t"); // zweite Zeile: S + sb.Append(String.Format("1192{0}\t", row[1])); // Debitorennummer Bewohner + sb.Append(String.Format("1192{0} {1:MM}/{1:yyyy}:{2}\t", row[1], lastDate, row[3])); // Buchungstext: Bew.Nr., Abr.-Zeitraum, Nachname, Vorname sb.AppendLine(); // zweite Linie - Rechnungspostionen - sb.Append("7177\t"); // Buchungskreis 7177 + sb.Append("1192\t"); // Buchungskreis 1192 sb.Append("DR\t"); // Beleg DR für Rechnung / DG für Gutschrift sb.Append(String.Format("{0:ddMMyyyy} \t", lastDate)); sb.Append(String.Format("{0:ddMMyyyy} \t", lastDate)); sb.Append("EUR\t"); - sb.Append(String.Format("7177{0:ddMMyyyy} \t", lastDate));// Profitcenter + Rechnungs - Nr.VN - sb.Append("7177\t"); // Belegkopftext 7177 + sb.Append(String.Format("1192{0:ddMMyyyy} \t", lastDate));// Profitcenter + Rechnungs - Nr.VN + sb.Append("1192\t"); // Belegkopftext 1192 sb.Append("S\t"); // S = Sachkontenposition sb.Append("50\t"); // Kontoart Kontoart S: S=40 H=50 sb.Append("409600\t"); // zweite Zeile: Sachkonto SAP sb.Append(String.Format("{0:0.00}\t", row[0])); //Betrag sb.Append("00\t"); // Umsatzsteuerschlüssel - sb.Append("S\t"); - sb.Append(String.Format("7177{0}\t", row[1])); // Debitorennummer Bewohner - sb.Append(String.Format("7177{0} {1:MM}/{1:yyyy}:{2}\t", row[1], lastDate, row[3])); // Buchungstext: Bew.Nr., Abr.-Zeitraum, Nachname, Vorname + sb.Append("H\t"); + sb.Append(String.Format("1192{0}\t", row[1])); // Debitorennummer Bewohner + sb.Append(String.Format("1192{0} {1:MM}/{1:yyyy}:{2}\t", row[1], lastDate, row[3])); // Buchungstext: Bew.Nr., Abr.-Zeitraum, Nachname, Vorname } return sb.ToString(); @@ -145,11 +145,10 @@ namespace Alloheim.Export (SELECT sr2.`CostBearer2SupportConceptOid`, SUM(sr2.`roundedduration` / IF(sr2.`GroupEmployeeCount` is null, 1, sr2.`GroupEmployeeCount`)) AS GeleisteteFLM FROM `servicerecord` sr2 INNER JOIN `servicedescription` sd ON sr2.`ServiceDescriptionOid` = sd.`Oid` INNER JOIN `servicecategory` sc ON sd.`ServiceCategoryOid` = sc.`Oid` - WHERE sr2.`StartDate` >= ':Monat_Start' AND sr2.`StartDate` < ':Monat_End' AND sc.`Billable` = 1 and sd.Name <> 'Fehlkontakt' GROUP BY sr2.`CostBearer2SupportConceptOid`) + WHERE sr2.`StartDate` >= ':Monat_Start' AND sr2.`StartDate` < ':Monat_End' AND sc.`Billable` = 1 AND sc.Name <> 'Assistenzleistungen' and sd.Name <> 'Fehlkontakt' GROUP BY sr2.`CostBearer2SupportConceptOid`) AS sr ON sr.`CostBearer2SupportConceptOid` = cb2sc.`Oid` WHERE c.`IsActive` = 1 AND sc.`IsActive` = 1 - and (sr.`GeleisteteFLM` is not null) - and org.Name = 'LVR') + and (sr.`GeleisteteFLM` is not null)) UNION (SELECT ROUND(0.8 * (sr.`GeleisteteFLM` / 60) * (SELECT crp.`CostRateValue` FROM `costrateperiod` crp WHERE crp.`ObjectTid` = 22 AND crp.`CostRateType` = 0 AND crp.`ObjectOid` = cb2sc.`CostBearerOid` AND (crp.`EndDate` is null or crp.`EndDate` > ':Monat_Start') order by IF(crp.`EndDate` is null, MAKEDATE(9999,365),crp.`EndDate`) LIMIT 1 )) AS 'Betrag', @@ -170,8 +169,7 @@ namespace Alloheim.Export WHERE sr2.`StartDate` >= ':Monat_Start' AND sr2.`StartDate` < ':Monat_End' AND sc.`Billable` = 1 and sd.Name = 'Fehlkontakt' GROUP BY sr2.`CostBearer2SupportConceptOid`) AS sr ON sr.`CostBearer2SupportConceptOid` = cb2sc.`Oid` WHERE c.`IsActive` = 1 AND sc.`IsActive` = 1 - and (sr.`GeleisteteFLM` is not null) - and org.Name = 'LVR') + and (sr.`GeleisteteFLM` is not null)) )qry GROUP BY qry.OID ORDER BY qry.Verwendung @@ -210,6 +208,7 @@ ib.AccountingPeriodEnd StringBuilder sb = new StringBuilder(); foreach (DataRow row in dt.Rows) { + bool storno = false; if (sb.Length > 0) { sb.AppendLine(); @@ -221,39 +220,73 @@ ib.AccountingPeriodEnd //key2Value.Add(key, key); // Erste Linie - Rechnung - sb.Append("7177\t"); // Buchungskreis 7177 + sb.Append("1192\t"); // Buchungskreis 1192 sb.Append("DR\t"); // Beleg DR für Rechnung / DG für Gutschrift sb.Append(String.Format("{0:ddMMyyyy}\t", row[3])); sb.Append(String.Format("{0:ddMMyyyy}\t", row[3])); sb.Append("EUR\t"); - sb.Append(String.Format("7177{0}\t", row[1])); // Profitcenter + Rechnungs - Nr.VN - sb.Append("7177\t"); // Belegkopftext 7177 + sb.Append(String.Format("1192{0}\t", row[1])); // Profitcenter + Rechnungs - Nr.VN + sb.Append("1192\t"); // Belegkopftext 1192 sb.Append("D\t"); // D = Debitorenposition / zweite Zeile: S = Sachkontenposition sb.Append("01\t"); // Kontoart D: S=01 H=11 / zweite Zeile: Kontoart S: S=40 H=50 sb.Append(String.Format("{0}\t", row[2])); //DebitorNumber / zweite Zeile: Sachkonto SAP + String betrag = String.Format("{0:0.00}", row[0]); // Betrag + if (betrag.Contains("-")) // Storno + { + storno = true; + } sb.Append(String.Format("{0:0.00}\t", row[0])); //Betrag sb.Append("00\t"); // Umsatzsteuerschlüssel - sb.Append("H\t"); - sb.Append(String.Format("7177{0}\t", row[2])); // Debitorennummer Bewohner - sb.Append(String.Format("7177{0}:{1:MM}/{1:yyyy}:{2}\t", row[2], row[3], row[5])); // Buchungstext: Bew.Nr., Abr.-Zeitraum, Nachname, Vorname + if (storno) + { + sb.Append("H\t"); + } + else + { + sb.Append("S\t"); + } + sb.Append(String.Format("1192{0}\t", row[2])); // Debitorennummer Bewohner + sb.Append(String.Format("1192{0}:{1:MM}/{1:yyyy}:{2}\t", row[2], row[3], row[5])); // Buchungstext: Bew.Nr., Abr.-Zeitraum, Nachname, Vorname sb.AppendLine(); //} // zweite Linie - Rechnungspostionen - sb.Append("7177\t"); // Buchungskreis 7177 - sb.Append("DR\t"); // Beleg DR für Rechnung / DG für Gutschrift + sb.Append("1192\t"); // Buchungskreis 1192 + if (storno) + { + sb.Append("DG\t"); // DG für Gutschrift + } + else + { + sb.Append("DR\t"); // Beleg DR für Rechnung / DG für Gutschrift + } + sb.Append(String.Format("{0:ddMMyyyy} \t", row[3])); sb.Append(String.Format("{0:ddMMyyyy} \t", row[3])); sb.Append("EUR\t"); - sb.Append(String.Format("7177{0}\t", row[1])); // Profitcenter + Rechnungs - Nr.VN - sb.Append("7177\t"); // Belegkopftext 7177 + sb.Append(String.Format("1192{0}\t", row[1])); // Profitcenter + Rechnungs - Nr.VN + sb.Append("1192\t"); // Belegkopftext 1192 sb.Append("S\t"); // S = Sachkontenposition - sb.Append("50\t"); // Kontoart Kontoart S: S=40 H=50 + if (storno) + { + sb.Append("40\t"); + } + else + { + sb.Append("50\t"); // Kontoart Kontoart S: S=40 H=50 + } sb.Append("409600\t"); // zweite Zeile: Sachkonto SAP sb.Append(String.Format("{0:0.00}\t", row[0])); //Betrag sb.Append("00\t"); // Umsatzsteuerschlüssel - sb.Append("S\t"); - sb.Append(String.Format("7177{0}\t", row[2])); // Debitorennummer Bewohner - sb.Append(String.Format("7177{0}:{1:MM}/{1:yyyy}:{2}\t", row[2], row[3], row[5])); // Buchungstext: Bew.Nr., Abr.-Zeitraum, Nachname, Vorname + if (storno) + { + sb.Append("S\t"); + } + else + { + sb.Append("H\t"); + } + sb.Append(String.Format("1192{0}\t", row[2])); // Debitorennummer Bewohner + sb.Append(String.Format("1192{0}:{1:MM}/{1:yyyy}:{2}\t", row[2], row[3], row[5])); // Buchungstext: Bew.Nr., Abr.-Zeitraum, Nachname, Vorname } return sb.ToString(); diff --git a/ReportImp/Alloheim/InvoiceCustomerReport.Designer.cs b/ReportImp/Alloheim/InvoiceCustomerReport.Designer.cs index 1fdc21372..1e78d03aa 100644 --- a/ReportImp/Alloheim/InvoiceCustomerReport.Designer.cs +++ b/ReportImp/Alloheim/InvoiceCustomerReport.Designer.cs @@ -40,7 +40,15 @@ namespace BeWo.Report.DefaultReports this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); - this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); this.lblAddress = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -64,19 +72,12 @@ namespace BeWo.Report.DefaultReports this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); + this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); @@ -189,6 +190,7 @@ namespace BeWo.Report.DefaultReports // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel14, this.xrLabel9, this.xrLabel13, this.xrLabel1, @@ -197,7 +199,6 @@ namespace BeWo.Report.DefaultReports this.xrLabel16, this.xrLabel19, this.xrLabel18, - this.xrPictureBox1, this.lblAddress, this.xrTable3, this.xrLabel6, @@ -210,24 +211,121 @@ namespace BeWo.Report.DefaultReports this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; // - // xrPictureBox1 + // xrLabel14 // - this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image"))); - this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(495.2245F, 0F); - this.xrPictureBox1.Name = "xrPictureBox1"; - this.xrPictureBox1.SizeF = new System.Drawing.SizeF(176.2755F, 142.0257F); - this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + this.xrLabel14.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 97.60911F); + this.xrLabel14.Multiline = true; + this.xrLabel14.Name = "xrLabel14"; + this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel14.SizeF = new System.Drawing.SizeF(317.0001F, 18.79164F); + this.xrLabel14.StylePriority.UseFont = false; + this.xrLabel14.Text = "[RecipientPostCode] [RecipientTown]"; + // + // xrLabel9 + // + this.xrLabel9.CanShrink = true; + this.xrLabel9.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 3.750006F); + 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(316.9999F, 17F); + this.xrLabel9.StylePriority.UseFont = false; + this.xrLabel9.Text = "Alloheim mobil - Gumbertstr. 90/92 - 40229 Düsseldorf"; + // + // xrLabel13 + // + this.xrLabel13.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(463.6248F, 37.9007F); + 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(213.3751F, 59.70834F); + this.xrLabel13.StylePriority.UseFont = false; + this.xrLabel13.Text = "Alloheim mobil Ambulante Dienste\r\nGumbertstr. 90/92\r\n40229 Düsseldorf\r\nduesseldor" + + "f@alloheim-mobil.de"; + // + // xrLabel1 + // + this.xrLabel1.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(463.6248F, 20.90069F); + this.xrLabel1.Multiline = true; + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(213.3751F, 17F); + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.Text = "Rechnungsanschrift: "; + // + // xrLabel7 + // + this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(463.6248F, 413.5834F); + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(213.3754F, 19.99994F); + this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.StylePriority.UseTextAlignment = false; + this.xrLabel7.Text = "Datum: [InvoiceDate]"; + this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrLabel17 + // + this.xrLabel17.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(463.6248F, 114.6091F); + this.xrLabel17.Multiline = true; + this.xrLabel17.Name = "xrLabel17"; + this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel17.SizeF = new System.Drawing.SizeF(213.3751F, 59.70834F); + this.xrLabel17.StylePriority.UseFont = false; + this.xrLabel17.Text = "Alloheim Ambulante Dienste\r\nErste SE & Co. KG \r\nAm Seestern 1 \r\n40547 Düsseldorf" + + " "; + // + // xrLabel16 + // + this.xrLabel16.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(463.6248F, 97.60911F); + this.xrLabel16.Multiline = true; + this.xrLabel16.Name = "xrLabel16"; + this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel16.SizeF = new System.Drawing.SizeF(213.3751F, 17F); + this.xrLabel16.StylePriority.UseFont = false; + this.xrLabel16.Text = "Firmensitz:"; + // + // xrLabel19 + // + this.xrLabel19.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(463.6246F, 192.0882F); + this.xrLabel19.Multiline = true; + this.xrLabel19.Name = "xrLabel19"; + this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel19.SizeF = new System.Drawing.SizeF(213.3751F, 90.47916F); + this.xrLabel19.StylePriority.UseFont = false; + this.xrLabel19.Text = "Postfach 11 01 39, \r\n40501 Düsseldorf \r\nwww.alloheim-mobil.de duesseldorf@allohei" + + "m-mobil.de Telefon: 0211/2381963 \r\nTelefax: 0211/2381964"; + // + // xrLabel18 + // + this.xrLabel18.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(463.6246F, 175.0881F); + this.xrLabel18.Multiline = true; + this.xrLabel18.Name = "xrLabel18"; + this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel18.SizeF = new System.Drawing.SizeF(213.3751F, 17F); + this.xrLabel18.StylePriority.UseFont = false; + this.xrLabel18.Text = "Briefanschrift:"; // // lblAddress // - this.lblAddress.LocationFloat = new DevExpress.Utils.PointFloat(0F, 142.0257F); + this.lblAddress.Font = new System.Drawing.Font("Arial", 10F); + this.lblAddress.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20.90069F); this.lblAddress.Multiline = true; this.lblAddress.Name = "lblAddress"; this.lblAddress.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblAddress.SizeF = new System.Drawing.SizeF(351.375F, 131F); + this.lblAddress.SizeF = new System.Drawing.SizeF(351.375F, 76.70834F); this.lblAddress.StylePriority.UseFont = false; this.lblAddress.Text = "[RecipientOrganisation]\r\n[RecipientDivision]\r\n[RecipientFirstName] [RecipientLast" + - "Name]\r\n[RecipientStreet]\r\n[RecipientPostCode] [RecipientTown]"; + "Name]\r\n[RecipientStreet]\r\n"; // // xrTable3 // @@ -419,7 +517,7 @@ namespace BeWo.Report.DefaultReports this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 146.5417F); this.xrLabel10.Name = "xrLabel10"; this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel10.SizeF = new System.Drawing.SizeF(175F, 17F); + this.xrLabel10.SizeF = new System.Drawing.SizeF(197.0015F, 17F); this.xrLabel10.StylePriority.UseFont = false; this.xrLabel10.Text = "Mit freundlichen Grüßen"; // @@ -478,9 +576,19 @@ namespace BeWo.Report.DefaultReports // // topMarginBand1 // - this.topMarginBand1.HeightF = 100F; + this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrPictureBox1}); + this.topMarginBand1.HeightF = 172F; this.topMarginBand1.Name = "topMarginBand1"; // + // xrPictureBox1 + // + this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image"))); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(513.2247F, 25.68266F); + this.xrPictureBox1.Name = "xrPictureBox1"; + this.xrPictureBox1.SizeF = new System.Drawing.SizeF(163.7755F, 126.4007F); + this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // // bottomMarginBand1 // this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -488,6 +596,17 @@ namespace BeWo.Report.DefaultReports this.bottomMarginBand1.HeightF = 100F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // + // xrLabel11 + // + this.xrLabel11.Font = new System.Drawing.Font("Arial", 7.5F); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 0F); + this.xrLabel11.Multiline = true; + this.xrLabel11.Name = "xrLabel11"; + this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(676.9999F, 72.29163F); + this.xrLabel11.StylePriority.UseFont = false; + this.xrLabel11.Text = resources.GetString("xrLabel11.Text"); + // // DetailReport // this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -510,110 +629,6 @@ namespace BeWo.Report.DefaultReports // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.InvoiceCustomerRO); // - // xrLabel13 - // - this.xrLabel13.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(463.6248F, 159.0257F); - 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(213.3751F, 59.70834F); - this.xrLabel13.StylePriority.UseFont = false; - this.xrLabel13.Text = "Alloheim mobil Ambulante Dienste\r\nGumbertstr. 90/92\r\n40229 Düsseldorf\r\nduesseldor" + - "f@alloheim-mobil.de"; - // - // xrLabel1 - // - this.xrLabel1.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(463.6248F, 142.0257F); - this.xrLabel1.Multiline = true; - this.xrLabel1.Name = "xrLabel1"; - this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel1.SizeF = new System.Drawing.SizeF(213.3751F, 17F); - this.xrLabel1.StylePriority.UseFont = false; - this.xrLabel1.Text = "Rechnungsanschrift: "; - // - // xrLabel7 - // - this.xrLabel7.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(463.6248F, 413.5834F); - this.xrLabel7.Name = "xrLabel7"; - this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(213.3754F, 19.99994F); - this.xrLabel7.StylePriority.UseFont = false; - this.xrLabel7.StylePriority.UseTextAlignment = false; - this.xrLabel7.Text = "Datum: [InvoiceDate]"; - this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - // - // xrLabel17 - // - this.xrLabel17.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(463.6248F, 235.7341F); - this.xrLabel17.Multiline = true; - this.xrLabel17.Name = "xrLabel17"; - this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel17.SizeF = new System.Drawing.SizeF(213.3751F, 59.70834F); - this.xrLabel17.StylePriority.UseFont = false; - this.xrLabel17.Text = "Alloheim Ambulante Dienste\r\nErste SE & Co. KG \r\nAm Seestern 1 \r\n40547 Düsseldorf" + - " "; - // - // xrLabel16 - // - this.xrLabel16.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(463.6248F, 218.7341F); - this.xrLabel16.Multiline = true; - this.xrLabel16.Name = "xrLabel16"; - this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel16.SizeF = new System.Drawing.SizeF(213.3751F, 17F); - this.xrLabel16.StylePriority.UseFont = false; - this.xrLabel16.Text = "Firmensitz:"; - // - // xrLabel19 - // - this.xrLabel19.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(463.6246F, 313.2132F); - this.xrLabel19.Multiline = true; - this.xrLabel19.Name = "xrLabel19"; - this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel19.SizeF = new System.Drawing.SizeF(213.3751F, 90.47916F); - this.xrLabel19.StylePriority.UseFont = false; - this.xrLabel19.Text = "Postfach 11 01 39, \r\n40501 Düsseldorf \r\nwww.alloheim-mobil.de duesseldorf@allohei" + - "m-mobil.de Telefon: 0211/2381963 \r\nTelefax: 0211/2381964"; - // - // xrLabel18 - // - this.xrLabel18.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(463.6246F, 296.2131F); - this.xrLabel18.Multiline = true; - this.xrLabel18.Name = "xrLabel18"; - this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel18.SizeF = new System.Drawing.SizeF(213.3751F, 17F); - this.xrLabel18.StylePriority.UseFont = false; - this.xrLabel18.Text = "Briefanschrift:"; - // - // xrLabel11 - // - this.xrLabel11.Font = new System.Drawing.Font("Arial", 7.5F); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 0F); - this.xrLabel11.Multiline = true; - this.xrLabel11.Name = "xrLabel11"; - this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel11.SizeF = new System.Drawing.SizeF(676.9999F, 72.29163F); - this.xrLabel11.StylePriority.UseFont = false; - this.xrLabel11.Text = resources.GetString("xrLabel11.Text"); - // - // xrLabel9 - // - this.xrLabel9.CanShrink = true; - this.xrLabel9.Font = new System.Drawing.Font("Arial Narrow", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 124.875F); - 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(316.9999F, 17F); - this.xrLabel9.StylePriority.UseFont = false; - this.xrLabel9.Text = "Alloheim mobil - Gumbertstr. 90/92 - 40229 Düsseldorf"; - // // InvoiceCustomerReport // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -627,7 +642,7 @@ namespace BeWo.Report.DefaultReports this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new System.Drawing.Printing.Margins(75, 75, 100, 100); + this.Margins = new System.Drawing.Printing.Margins(75, 75, 172, 100); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = System.Drawing.Printing.PaperKind.A4; @@ -678,7 +693,6 @@ namespace BeWo.Report.DefaultReports private DevExpress.XtraReports.UI.DetailReportBand DetailReport; private DevExpress.XtraReports.UI.DetailBand Detail1; private DevExpress.XtraReports.UI.XRLabel lblAddress; - private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; private DevExpress.XtraReports.UI.XRLabel xrLabel13; private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.XRLabel xrLabel7; @@ -688,5 +702,7 @@ namespace BeWo.Report.DefaultReports private DevExpress.XtraReports.UI.XRLabel xrLabel18; private DevExpress.XtraReports.UI.XRLabel xrLabel11; private DevExpress.XtraReports.UI.XRLabel xrLabel9; + private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; + private DevExpress.XtraReports.UI.XRLabel xrLabel14; } } diff --git a/ReportImp/Alloheim/Invoicing/AssistenzInvoiceCreation.cs b/ReportImp/Alloheim/Invoicing/AssistenzInvoiceCreation.cs new file mode 100644 index 000000000..aeacdc9d3 --- /dev/null +++ b/ReportImp/Alloheim/Invoicing/AssistenzInvoiceCreation.cs @@ -0,0 +1,102 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BeWo.Service.DCEntityMapper; +using BeWo.Service.Invoicing; +using BeWo.Service.Plugins; +using BS.Shared; +using BS.Shared.Core; +using BS.Shared.DataContracts; +using BS.Shared.DataContracts.Compact; +using BS.Shared.Extensions; +using BS.Shared.Services; + +namespace Alloheim.Invoicing +{ + + public class CustomAssistenzInvoiceCreation : InvoiceCreation + { + public override void SetInvoiceBaseData(int invoiceCounter, ServiceInvoice invoice, CostBearer costBearer, DateTimeSpan invoicePeriod, IList supportConceptList) + { + base.SetInvoiceBaseData(invoiceCounter, invoice, costBearer, invoicePeriod, supportConceptList); + invoice.InvoiceBase.InvoiceDate = invoice.InvoiceBase.AccountingPeriodEnd; + } + + + public override void SetAmountAdvancePayments(ServiceInvoice invoice) + { + //do nothing + } + + public override void SetAmountEquityContribution(ServiceInvoice invoice) + { + //do nothing + } + + public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, Calculations calc) + { + if (!iServiceRecord.ServiceDescription.CategoryName.Contains("Assistenz")) + { + return null; + } + + var ii = base.CreateInvoiceItem(iServiceRecord, scap, calc); + ii.ItemDescription = "Assistenzleistung"; + return ii; + } + + public override void SetInvoiceItems(ServiceInvoice invoice, + ServiceInvoicePeriod serviceInvoicePeriod, + SupportConceptApprovalPeriodDC supportConceptApprovalPeriod, + CostBearer2SupportConcept cb2sc, + DateTimeSpan invoicePeriod, + List serviceRecords) + { + Calculations calc = PluginLoader.FindClass(_SpecificID) ?? Calculations.GetInstance(_SpecificID); + + if (ShouldCreateFixedAmounts(serviceInvoicePeriod, supportConceptApprovalPeriod, cb2sc)) + { + CreateFixedAmounts(serviceInvoicePeriod, supportConceptApprovalPeriod, cb2sc); + } + else + { + List serviceRecordsInPeriod = serviceRecords.Where( + i => + { + bool valid = i.Start.Value.InBetween(serviceInvoicePeriod.Start.Value, + serviceInvoicePeriod.End.Value, true); + + if (valid && serviceInvoicePeriod.SupportConceptApprovalPeriod != null && serviceInvoicePeriod.SupportConceptApprovalPeriod.ServiceCategory != null) + valid = serviceInvoicePeriod.SupportConceptApprovalPeriod.ServiceCategory.Oid == + i.ServiceDescription.Category.ServiceCategoryOid; + return valid; + }).ToList(); + + if (serviceRecordsInPeriod.Count > 0) + { + var absenceTimes = MapperFactory.AbsenceTimeDC_AbsenceTime.MapToNewDCs(cb2sc.SupportConcept.Customer.AbsenceTimes); + Dictionary span2Hours = calc.GetAbsencesTimesNotBillable(absenceTimes); + + // serviceInvoicePeriod.HoursNotBillableAbsence - eingeschränkte Anzahl bei Abwesenheit GILT laut LVR ausdrücklich nicht bei Assistenzleistungen + serviceInvoicePeriod.HoursNotBillableNotApproved += + calc.GetHoursNotBillableDueToMoreThanApproved(supportConceptApprovalPeriod, + cb2sc.CostBearer.CostRatePeriods.MapToNewDCs(), + serviceRecordsInPeriod, + true, true); + + var itemList = CreateInvoiceItems(serviceRecordsInPeriod, invoicePeriod, serviceInvoicePeriod.SupportConceptApprovalPeriod, calc); + serviceInvoicePeriod.InvoiceItemList.AddRange(itemList); + } + } + } + + public override IList CreateSummaryInvoiceItems(IList itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, + Calculations calc, bool summaryPerMonth, bool addRateFactorToUnitCount) + { + return base.CreateSummaryInvoiceItems(itemList, invoicePeriod, scap, calc, false, true); + } + } +} diff --git a/ReportImp/Alloheim/Invoicing/CustomInvoiceCreation.cs b/ReportImp/Alloheim/Invoicing/CustomInvoiceCreation.cs deleted file mode 100644 index 704a018e9..000000000 --- a/ReportImp/Alloheim/Invoicing/CustomInvoiceCreation.cs +++ /dev/null @@ -1,96 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using BeWo.Data.Access; -using BeWo.Data.Entities; -using BeWo.Service.DCEntityMapper; -using BeWo.Service.Invoicing; -using BeWo.Service.Plugins; -using BS.Shared; -using BS.Shared.Core; -using BS.Shared.DataContracts; -using BS.Shared.DataContracts.Compact; -using BS.Shared.Extensions; -using BS.Shared.Services; - -namespace Alloheim.Invoicing -{ - - public class CustomInvoiceCreation : InvoiceCreation - { - private DateTime? accountingPeriodStart = null; - private DateTime? accountingPeriodEnd = null; - - public override List GenerateServiceInvoices(long costBearerOid, DateTimeSpan invoicePeriod, Dictionary> supportConcepts2ServiceRecords) - { - // eine Rechnung pro Leistungskategorie gewünscht - var invoiceList = new List(); - var invoiceCounter = 0; - var sortedScs = supportConcepts2ServiceRecords.Keys.OrderBy(s => s.Customer.LastNameFirstName).ToList(); - - foreach (var sc in sortedScs) - { - var serviceRecords = supportConcepts2ServiceRecords[sc]; - if (sc.CostBearerList.Count > 0) - { - var costBearer = DAOFactory.GenericDAO.LoadByID(sc.CostBearerList[0].CostBearerOid); - Dictionary> srDict = new Dictionary>(); - - foreach (var sr in serviceRecords) - { - String key = sr.ServiceDescription.CategoryName; - - if (!srDict.ContainsKey(key)) - srDict.Add(key, new List()); - - srDict[key].Add(sr); - } - - foreach (var catName in srDict.Keys) - { - var list = srDict[catName]; - var invoice = CreateSingleInvoice(invoiceCounter, costBearer, invoicePeriod, sc, list); - - if (invoice != null) - { - invoiceList.Add(invoice); - invoiceCounter++; - } - } - } - } - - var result = invoiceList.Select(item => MapperFactory.ServiceInvoiceDC_ServiceInvoice.MapToNewDC(item)).ToList(); - return result; - } - - - public override ServiceInvoice CreateSingleInvoice(int invoiceCounter, CostBearer costBearer, DateTimeSpan invoicePeriod, CompactSupportConceptDC supportConcept, List serviceRecords) - { - var i = base.CreateSingleInvoice(invoiceCounter, costBearer, invoicePeriod, supportConcept, serviceRecords); - - if (i != null) - { - var claim = i.GetTotalClaim(); - - if (!claim.HasValue || claim.Value == 0) - return null; - } - - return i; - } - - public override void SetInvoiceBaseData(int invoiceCounter, ServiceInvoice invoice, CostBearer costBearer, DateTimeSpan invoicePeriod, - IList supportConceptList) - { - if (invoicePeriod != null) - { - accountingPeriodStart = invoicePeriod.StartDate; - accountingPeriodEnd = invoicePeriod.EndDate; - } - base.SetInvoiceBaseData(invoiceCounter, invoice, costBearer, invoicePeriod, supportConceptList); - } - - } -} diff --git a/ReportImp/Alloheim/Invoicing/CustomInvoiceFactory.cs b/ReportImp/Alloheim/Invoicing/CustomInvoiceFactory.cs index 5f218be19..b3b934f3c 100644 --- a/ReportImp/Alloheim/Invoicing/CustomInvoiceFactory.cs +++ b/ReportImp/Alloheim/Invoicing/CustomInvoiceFactory.cs @@ -8,9 +8,39 @@ namespace Alloheim.Invoicing { public class CustomInvoiceFactory : InvoiceFactory { - public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary> supportConcepts2ServiceRecords) - { - return new CustomInvoiceCreation(); - } + public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary> supportConcepts2ServiceRecords) + { + foreach (var list in supportConcepts2ServiceRecords.Values) + { + foreach (var sr in list) + { + var sd = sr.ServiceDescription.Category; + var ic = GetInvoiceCreatorForCategory(sd); + if (ic != null) + return ic; + } + } + return base.CreateInvoiceCreator(specificId, tenant, supportConcepts2ServiceRecords); + } + + private InvoiceCreation GetInvoiceCreatorForCategory(ServiceCategoryDC sd) + { + if (sd != null && !String.IsNullOrEmpty(sd.Name)) + { + String cat = sd.Name.ToLower().Trim(); + if (cat.IndexOf("assistenz") >= 0) + { + return new CustomAssistenzInvoiceCreation(); + } + } + return null; + } + + // das war inhaltlich daneben, die wollten zwar je eine Rechnung pro Leistungskategorie, aber es ging um Assistenz und FLS -> alles ganz klassisch + + // public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary> supportConcepts2ServiceRecords) + //{ + // return new CustomInvoiceCreation(); + //} } } diff --git a/ReportImp/Alloheim/Invoicing/SettlementInvoiceCreation.cs b/ReportImp/Alloheim/Invoicing/SettlementInvoiceCreation.cs index 57ca24e0f..9f0d1a431 100644 --- a/ReportImp/Alloheim/Invoicing/SettlementInvoiceCreation.cs +++ b/ReportImp/Alloheim/Invoicing/SettlementInvoiceCreation.cs @@ -1,6 +1,10 @@ using BeWo.Data.Entities; using BeWo.Service.Invoicing; using BS.Shared.DataContracts; +using BS.Shared.Services; +using System; +using System.Collections.Generic; +using System.Linq; namespace Alloheim { @@ -10,5 +14,38 @@ namespace Alloheim { return false; } + + public override bool IsServiceRecordBillable(ServiceRecord iRecord) + { + if (iRecord.ServiceDescription.ServiceCategory.Name.Contains("Assistenz")) + { + return false; + } + return true; + } + + public override void CalculateSettlementInvoiceApprovedAmounts(Settlement2DC si, SupportConceptCostBearerRelDC relDC, Calculations calc) + { + si.ApprovedFLSWeekly = 0; + si.ApprovedFLS = 0; + foreach (var sp in relDC.ApprovalPeriodList) + { + if (sp.ServiceCategory == null || !sp.ServiceCategory.Name.Contains("Assistenz")) + { + si.ApprovedFLSWeekly += calc.GetApprovedHoursPerWeek(sp, relDC.CostBearer.CostRatePeriods) ?? 0m; + + decimal flsTotal = calc.GetApprovedHoursTotal(sp, relDC.CostBearer.CostRatePeriods) ?? 0m; + flsTotal = Math.Round(flsTotal, 2, MidpointRounding.AwayFromZero); + + si.ApprovedFLS += flsTotal; + } + } + } + + + public override IList GetBillableServiceRecords(CostBearer2SupportConcept c2s) + { + return c2s.ServiceRecords.OrderBy(s => s.Start).Where(s => !s.ServiceDescription.ServiceCategory.Name.ToLower().Contains("assistenz")).ToList(); + } } } diff --git a/ReportImp/Alloheim/Service/CustomAccountingService.cs b/ReportImp/Alloheim/Service/CustomAccountingService.cs new file mode 100644 index 000000000..9b06c9dbc --- /dev/null +++ b/ReportImp/Alloheim/Service/CustomAccountingService.cs @@ -0,0 +1,48 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Windows; +using Alloheim.Invoicing; +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BeWo.Service.DCEntityMapper; +using BeWo.Service.Plugins; +using BS.Shared; +using BS.Shared.DataContracts; + + + +namespace Alloheim.Service +{ + public class CustomAccountingService : AccountingService + { + public override ServiceInvoice ErstelleStornoRechnung(InvoiceBaseDC ibdc) + { + var i = base.ErstelleStornoRechnung(ibdc); + //if (!String.IsNullOrEmpty(i.InvoiceBase.InvoiceNumber)) + //{ + // //i.InvoiceBase.InvoiceNumber = ibdc.InvoiceNumber + " Storno"; + // i.InvoiceBase.InvoiceNumber = i.InvoiceBase.InvoiceNumber + " Storno"; + //} + int invoiceCounter = 0; + var inc = PluginLoader.FindClass(); + i.InvoiceBase.InvoiceNumber = inc.GetNextInvoiceNumber(invoiceCounter, i.InvoiceBase) + " Storno"; + + if (String.IsNullOrEmpty(i.InvoiceBase.InvoiceTypeText)) + { + i.InvoiceBase.InvoiceTypeText = "Storno"; + } + else + { + i.InvoiceBase.InvoiceTypeText += " Storno"; + } + + DAOFactory.GenericDAO.Insert(i); + + inc.IncreaseInvoiceNumber(1, null); + + + return i; + } + } +} \ No newline at end of file diff --git a/ReportImp/Alloheim/ServiceInvoiceReport.Designer.cs b/ReportImp/Alloheim/ServiceInvoiceReport.Designer.cs index ab3d0b448..5a309ce64 100644 --- a/ReportImp/Alloheim/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/Alloheim/ServiceInvoiceReport.Designer.cs @@ -135,22 +135,22 @@ namespace Alloheim // this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrPictureBox1}); - this.topMarginBand1.HeightF = 142.0257F; + this.topMarginBand1.HeightF = 176F; this.topMarginBand1.Name = "topMarginBand1"; // // xrPictureBox1 // this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image"))); - this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(500.5577F, 0F); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(510.0834F, 38.14096F); this.xrPictureBox1.Name = "xrPictureBox1"; - this.xrPictureBox1.SizeF = new System.Drawing.SizeF(176.2755F, 142.0257F); + this.xrPictureBox1.SizeF = new System.Drawing.SizeF(166.9165F, 137.8591F); this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; // // bottomMarginBand1 // this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabel11}); - this.bottomMarginBand1.HeightF = 82.29166F; + this.bottomMarginBand1.HeightF = 103.1907F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // // xrLabel11 @@ -210,7 +210,7 @@ namespace Alloheim this.xrLabel5, this.xrLabel8}); this.Page1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Page1.HeightF = 431.7201F; + this.Page1.HeightF = 483.1784F; this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // @@ -221,7 +221,7 @@ namespace Alloheim this.lblBelegNr.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceNumber")}); this.lblBelegNr.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblBelegNr.LocationFloat = new DevExpress.Utils.PointFloat(64.90177F, 404.7201F); + this.lblBelegNr.LocationFloat = new DevExpress.Utils.PointFloat(64.90176F, 466.1784F); this.lblBelegNr.Name = "lblBelegNr"; this.lblBelegNr.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.lblBelegNr.SizeF = new System.Drawing.SizeF(59.58686F, 17.00003F); @@ -234,7 +234,7 @@ namespace Alloheim | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel40.CanGrow = false; this.xrLabel40.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel40.LocationFloat = new DevExpress.Utils.PointFloat(0F, 404.6751F); + this.xrLabel40.LocationFloat = new DevExpress.Utils.PointFloat(0F, 466.1334F); this.xrLabel40.Name = "xrLabel40"; this.xrLabel40.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel40.SizeF = new System.Drawing.SizeF(64.90177F, 17F); @@ -247,7 +247,7 @@ namespace Alloheim this.lblHpStart.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); this.lblHpStart.CanGrow = false; this.lblHpStart.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblHpStart.LocationFloat = new DevExpress.Utils.PointFloat(157.4447F, 404.6751F); + this.lblHpStart.LocationFloat = new DevExpress.Utils.PointFloat(157.4447F, 466.1334F); this.lblHpStart.Name = "lblHpStart"; this.lblHpStart.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.lblHpStart.SizeF = new System.Drawing.SizeF(95.55278F, 17F); @@ -259,7 +259,7 @@ namespace Alloheim this.xrLabel42.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel42.CanGrow = false; this.xrLabel42.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel42.LocationFloat = new DevExpress.Utils.PointFloat(252.9975F, 404.6751F); + this.xrLabel42.LocationFloat = new DevExpress.Utils.PointFloat(252.9975F, 466.1334F); this.xrLabel42.Name = "xrLabel42"; this.xrLabel42.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel42.SizeF = new System.Drawing.SizeF(35.15613F, 17F); @@ -272,7 +272,7 @@ namespace Alloheim this.lblHpEnd.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); this.lblHpEnd.CanGrow = false; this.lblHpEnd.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblHpEnd.LocationFloat = new DevExpress.Utils.PointFloat(288.1536F, 404.6751F); + this.lblHpEnd.LocationFloat = new DevExpress.Utils.PointFloat(288.1536F, 466.1334F); this.lblHpEnd.Name = "lblHpEnd"; this.lblHpEnd.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.lblHpEnd.SizeF = new System.Drawing.SizeF(97.26303F, 17F); @@ -284,7 +284,7 @@ namespace Alloheim this.xrLabel44.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel44.CanGrow = false; this.xrLabel44.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel44.LocationFloat = new DevExpress.Utils.PointFloat(124.4886F, 404.6751F); + this.xrLabel44.LocationFloat = new DevExpress.Utils.PointFloat(124.4886F, 466.1334F); this.xrLabel44.Name = "xrLabel44"; this.xrLabel44.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel44.SizeF = new System.Drawing.SizeF(32.95607F, 17F); @@ -297,7 +297,7 @@ namespace Alloheim this.xrLabel45.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel45.CanGrow = false; this.xrLabel45.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel45.LocationFloat = new DevExpress.Utils.PointFloat(385.4166F, 404.6751F); + this.xrLabel45.LocationFloat = new DevExpress.Utils.PointFloat(385.4166F, 466.1334F); this.xrLabel45.Name = "xrLabel45"; this.xrLabel45.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel45.SizeF = new System.Drawing.SizeF(124.6667F, 17F); @@ -310,7 +310,7 @@ namespace Alloheim | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel46.CanGrow = false; this.xrLabel46.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel46.LocationFloat = new DevExpress.Utils.PointFloat(510.0834F, 404.6751F); + this.xrLabel46.LocationFloat = new DevExpress.Utils.PointFloat(510.0834F, 466.1334F); this.xrLabel46.Name = "xrLabel46"; this.xrLabel46.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel46.SizeF = new System.Drawing.SizeF(166.7498F, 17F); @@ -322,7 +322,7 @@ namespace Alloheim this.xrLabel36.Borders = DevExpress.XtraPrinting.BorderSide.Left; this.xrLabel36.CanGrow = false; this.xrLabel36.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel36.LocationFloat = new DevExpress.Utils.PointFloat(0F, 387.6751F); + this.xrLabel36.LocationFloat = new DevExpress.Utils.PointFloat(0F, 449.1334F); this.xrLabel36.Name = "xrLabel36"; this.xrLabel36.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel36.SizeF = new System.Drawing.SizeF(100.6539F, 17.00003F); @@ -333,7 +333,7 @@ namespace Alloheim // this.xrLabel37.CanGrow = false; this.xrLabel37.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel37.LocationFloat = new DevExpress.Utils.PointFloat(385.4166F, 387.6751F); + this.xrLabel37.LocationFloat = new DevExpress.Utils.PointFloat(385.4166F, 449.1334F); this.xrLabel37.Name = "xrLabel37"; this.xrLabel37.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel37.SizeF = new System.Drawing.SizeF(124.6668F, 17F); @@ -346,7 +346,7 @@ namespace Alloheim this.xrLabel38.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerTown")}); this.xrLabel38.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel38.LocationFloat = new DevExpress.Utils.PointFloat(100.6539F, 387.6751F); + this.xrLabel38.LocationFloat = new DevExpress.Utils.PointFloat(100.6539F, 449.1334F); this.xrLabel38.Name = "xrLabel38"; this.xrLabel38.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel38.SizeF = new System.Drawing.SizeF(284.7627F, 17F); @@ -357,7 +357,7 @@ namespace Alloheim this.xrLabel39.Borders = DevExpress.XtraPrinting.BorderSide.Right; this.xrLabel39.CanGrow = false; this.xrLabel39.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel39.LocationFloat = new DevExpress.Utils.PointFloat(510.0834F, 387.6751F); + this.xrLabel39.LocationFloat = new DevExpress.Utils.PointFloat(510.0834F, 449.1334F); this.xrLabel39.Name = "xrLabel39"; this.xrLabel39.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel39.SizeF = new System.Drawing.SizeF(166.7498F, 17F); @@ -369,7 +369,7 @@ namespace Alloheim this.xrLabel32.Borders = DevExpress.XtraPrinting.BorderSide.Left; this.xrLabel32.CanGrow = false; this.xrLabel32.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel32.LocationFloat = new DevExpress.Utils.PointFloat(0F, 370.675F); + this.xrLabel32.LocationFloat = new DevExpress.Utils.PointFloat(0F, 432.1334F); this.xrLabel32.Name = "xrLabel32"; this.xrLabel32.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel32.SizeF = new System.Drawing.SizeF(100.6539F, 17.00003F); @@ -382,7 +382,7 @@ namespace Alloheim this.xrLabel33.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerStreet")}); this.xrLabel33.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel33.LocationFloat = new DevExpress.Utils.PointFloat(100.6539F, 370.675F); + this.xrLabel33.LocationFloat = new DevExpress.Utils.PointFloat(100.6539F, 432.1334F); this.xrLabel33.Name = "xrLabel33"; this.xrLabel33.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel33.SizeF = new System.Drawing.SizeF(284.7627F, 17F); @@ -392,7 +392,7 @@ namespace Alloheim // this.xrLabel34.CanGrow = false; this.xrLabel34.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel34.LocationFloat = new DevExpress.Utils.PointFloat(385.4166F, 370.6751F); + this.xrLabel34.LocationFloat = new DevExpress.Utils.PointFloat(385.4166F, 432.1335F); this.xrLabel34.Name = "xrLabel34"; this.xrLabel34.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel34.SizeF = new System.Drawing.SizeF(124.6668F, 16.99997F); @@ -404,7 +404,7 @@ namespace Alloheim this.lblVersichertenNr.Borders = DevExpress.XtraPrinting.BorderSide.Right; this.lblVersichertenNr.CanGrow = false; this.lblVersichertenNr.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblVersichertenNr.LocationFloat = new DevExpress.Utils.PointFloat(510.0834F, 370.6751F); + this.lblVersichertenNr.LocationFloat = new DevExpress.Utils.PointFloat(510.0834F, 432.1335F); this.lblVersichertenNr.Name = "lblVersichertenNr"; this.lblVersichertenNr.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.lblVersichertenNr.SizeF = new System.Drawing.SizeF(166.7498F, 17F); @@ -416,7 +416,7 @@ namespace Alloheim this.lblPflegegrad.Borders = DevExpress.XtraPrinting.BorderSide.Right; this.lblPflegegrad.CanGrow = false; this.lblPflegegrad.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblPflegegrad.LocationFloat = new DevExpress.Utils.PointFloat(510.0834F, 353.6751F); + this.lblPflegegrad.LocationFloat = new DevExpress.Utils.PointFloat(510.0834F, 415.1334F); this.lblPflegegrad.Name = "lblPflegegrad"; this.lblPflegegrad.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.lblPflegegrad.SizeF = new System.Drawing.SizeF(166.7498F, 17F); @@ -427,7 +427,7 @@ namespace Alloheim // this.xrLabel27.CanGrow = false; this.xrLabel27.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(385.4166F, 353.6751F); + this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(385.4166F, 415.1334F); this.xrLabel27.Name = "xrLabel27"; this.xrLabel27.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel27.SizeF = new System.Drawing.SizeF(124.6668F, 17.00003F); @@ -440,7 +440,7 @@ namespace Alloheim this.xrLabel28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerName")}); this.xrLabel28.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(100.6539F, 353.675F); + this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(100.6539F, 415.1333F); this.xrLabel28.Name = "xrLabel28"; this.xrLabel28.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel28.SizeF = new System.Drawing.SizeF(284.7627F, 17F); @@ -451,7 +451,7 @@ namespace Alloheim this.xrLabel31.Borders = DevExpress.XtraPrinting.BorderSide.Left; this.xrLabel31.CanGrow = false; this.xrLabel31.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel31.LocationFloat = new DevExpress.Utils.PointFloat(0F, 353.675F); + this.xrLabel31.LocationFloat = new DevExpress.Utils.PointFloat(0F, 415.1333F); this.xrLabel31.Name = "xrLabel31"; this.xrLabel31.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel31.SizeF = new System.Drawing.SizeF(100.6539F, 17.00003F); @@ -463,7 +463,7 @@ namespace Alloheim this.xrLabel24.Borders = DevExpress.XtraPrinting.BorderSide.Left; this.xrLabel24.CanGrow = false; this.xrLabel24.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(0F, 336.6751F); + this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(0F, 398.1335F); this.xrLabel24.Name = "xrLabel24"; this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel24.SizeF = new System.Drawing.SizeF(157.4447F, 17F); @@ -475,7 +475,7 @@ namespace Alloheim // this.xrLabel25.CanGrow = false; this.xrLabel25.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(157.4447F, 336.6751F); + this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(157.4447F, 398.1335F); this.xrLabel25.Name = "xrLabel25"; this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel25.SizeF = new System.Drawing.SizeF(227.9719F, 17F); @@ -485,7 +485,7 @@ namespace Alloheim // this.xrLabel29.CanGrow = false; this.xrLabel29.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(385.4166F, 336.6751F); + this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(385.4166F, 398.1335F); this.xrLabel29.Name = "xrLabel29"; this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel29.SizeF = new System.Drawing.SizeF(124.6668F, 17F); @@ -497,7 +497,7 @@ namespace Alloheim this.xrLabel30.Borders = DevExpress.XtraPrinting.BorderSide.Right; this.xrLabel30.CanGrow = false; this.xrLabel30.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(510.0834F, 336.6751F); + this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(510.0834F, 398.1335F); this.xrLabel30.Name = "xrLabel30"; this.xrLabel30.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel30.SizeF = new System.Drawing.SizeF(166.7498F, 17F); @@ -511,7 +511,7 @@ namespace Alloheim | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel23.CanGrow = false; this.xrLabel23.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(510.0834F, 319.6751F); + this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(510.0834F, 381.1334F); this.xrLabel23.Name = "xrLabel23"; this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel23.SizeF = new System.Drawing.SizeF(166.7498F, 17F); @@ -523,7 +523,7 @@ namespace Alloheim this.xrLabel21.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel21.CanGrow = false; this.xrLabel21.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(385.4166F, 319.6751F); + this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(385.4166F, 381.1334F); this.xrLabel21.Name = "xrLabel21"; this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel21.SizeF = new System.Drawing.SizeF(124.6668F, 17F); @@ -536,7 +536,7 @@ namespace Alloheim this.xrLabel20.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel20.CanGrow = false; this.xrLabel20.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(288.1536F, 319.6751F); + this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(288.1536F, 381.1334F); this.xrLabel20.Name = "xrLabel20"; this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel20.SizeF = new System.Drawing.SizeF(97.26303F, 17F); @@ -549,7 +549,7 @@ namespace Alloheim this.xrLabel14.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel14.CanGrow = false; this.xrLabel14.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(252.9975F, 319.6751F); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(252.9975F, 381.1334F); this.xrLabel14.Name = "xrLabel14"; this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel14.SizeF = new System.Drawing.SizeF(35.15613F, 17F); @@ -562,7 +562,7 @@ namespace Alloheim this.xrLabel9.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel9.CanGrow = false; this.xrLabel9.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(157.4447F, 319.6751F); + this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(157.4447F, 381.1334F); this.xrLabel9.Name = "xrLabel9"; this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel9.SizeF = new System.Drawing.SizeF(95.55278F, 17F); @@ -573,7 +573,7 @@ namespace Alloheim // xrLabel18 // this.xrLabel18.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(448.6248F, 154.1875F); + this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(463.458F, 171.1458F); this.xrLabel18.Multiline = true; this.xrLabel18.Name = "xrLabel18"; this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -584,7 +584,7 @@ namespace Alloheim // xrLabel19 // this.xrLabel19.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(448.6248F, 171.1875F); + this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(463.458F, 188.1458F); this.xrLabel19.Multiline = true; this.xrLabel19.Name = "xrLabel19"; this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -596,7 +596,7 @@ namespace Alloheim // xrLabel16 // this.xrLabel16.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(448.6249F, 76.70835F); + this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(463.4581F, 93.66668F); this.xrLabel16.Multiline = true; this.xrLabel16.Name = "xrLabel16"; this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -607,7 +607,7 @@ namespace Alloheim // xrLabel17 // this.xrLabel17.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(448.6249F, 93.70836F); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(463.4581F, 110.6667F); this.xrLabel17.Multiline = true; this.xrLabel17.Name = "xrLabel17"; this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -619,7 +619,7 @@ namespace Alloheim // xrLabel13 // this.xrLabel13.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(448.6249F, 17.00001F); + this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(463.4581F, 33.95834F); this.xrLabel13.Multiline = true; this.xrLabel13.Name = "xrLabel13"; this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -631,7 +631,7 @@ namespace Alloheim // xrLabel12 // this.xrLabel12.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(448.6249F, 0F); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(463.4581F, 16.95833F); this.xrLabel12.Multiline = true; this.xrLabel12.Name = "xrLabel12"; this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -641,8 +641,8 @@ namespace Alloheim // // xrLabel10 // - this.xrLabel10.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 112.5F); + this.xrLabel10.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 108.5833F); this.xrLabel10.Multiline = true; this.xrLabel10.Name = "xrLabel10"; this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -653,7 +653,7 @@ namespace Alloheim // xrLabel6 // this.xrLabel6.CanShrink = true; - this.xrLabel6.Font = new System.Drawing.Font("Arial Narrow", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel6.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -664,11 +664,12 @@ namespace Alloheim // // xrLabel7 // + this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F); this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 22.50001F); 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(317F, 90F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(317F, 86.08331F); this.xrLabel7.StylePriority.UseFont = false; this.xrLabel7.Text = "[RecipientOrganisation]\r\n[RecipientContactPerson]\r\n[RecipientDivision]\r\n[Recipien" + "tStreet]"; @@ -678,7 +679,7 @@ namespace Alloheim this.xrLabel4.BackColor = System.Drawing.Color.Transparent; this.xrLabel4.CanShrink = true; this.xrLabel4.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 286.875F); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 348.3334F); this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -693,7 +694,7 @@ namespace Alloheim this.xrLabel2.BackColor = System.Drawing.Color.Transparent; this.xrLabel2.CanShrink = true; this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 266.6667F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 328.125F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel2.SizeF = new System.Drawing.SizeF(317.0001F, 20.20831F); @@ -708,7 +709,7 @@ namespace Alloheim | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel5.CanGrow = false; this.xrLabel5.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 319.6751F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 381.1334F); this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel5.SizeF = new System.Drawing.SizeF(157.4447F, 17F); @@ -718,10 +719,12 @@ namespace Alloheim // // xrLabel8 // - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(448.6248F, 286.8751F); + this.xrLabel8.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(448.6248F, 348.3334F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel8.SizeF = new System.Drawing.SizeF(228.3752F, 19.99994F); + this.xrLabel8.StylePriority.UseFont = false; this.xrLabel8.StylePriority.UseTextAlignment = false; this.xrLabel8.Text = "Datum: [InvoiceDate]"; this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; @@ -1041,7 +1044,7 @@ namespace Alloheim this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabel1, this.xrLabel15}); - this.GroupFooter1.HeightF = 101.9046F; + this.GroupFooter1.HeightF = 112.3213F; this.GroupFooter1.Name = "GroupFooter1"; // // xrLabel1 @@ -1076,7 +1079,7 @@ namespace Alloheim this.Font = new System.Drawing.Font("Verdana", 10F); this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new System.Drawing.Printing.Margins(75, 75, 142, 82); + this.Margins = new System.Drawing.Printing.Margins(75, 75, 176, 103); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = System.Drawing.Printing.PaperKind.A4; diff --git a/ReportImp/Alloheim/SettlementReport2.Designer.cs b/ReportImp/Alloheim/SettlementReport2.Designer.cs index 7cf9c4a10..58a4f64d2 100644 --- a/ReportImp/Alloheim/SettlementReport2.Designer.cs +++ b/ReportImp/Alloheim/SettlementReport2.Designer.cs @@ -33,8 +33,6 @@ namespace Alloheim System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung)); DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); - this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); - this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); this.rowErbrachteLeistung = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -96,7 +94,6 @@ namespace Alloheim this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow31 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -115,12 +112,14 @@ namespace Alloheim this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -130,32 +129,17 @@ namespace Alloheim this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // - // ReportHeader - // - this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrPictureBox1}); - this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F); - this.ReportHeader.HeightF = 142.0257F; - this.ReportHeader.Name = "ReportHeader"; - this.ReportHeader.StylePriority.UseFont = false; - // - // xrPictureBox1 - // - this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image"))); - this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(501.7245F, 0F); - this.xrPictureBox1.Name = "xrPictureBox1"; - this.xrPictureBox1.SizeF = new System.Drawing.SizeF(176.2755F, 142.0257F); - this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - // // xrTable1 // this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTable1.Font = new System.Drawing.Font("Arial", 11F); this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 463.4999F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.rowErbrachteLeistung}); this.xrTable1.SizeF = new System.Drawing.SizeF(650F, 17F); this.xrTable1.StylePriority.UseBorderColor = false; + this.xrTable1.StylePriority.UseFont = false; // // rowErbrachteLeistung // @@ -188,7 +172,7 @@ namespace Alloheim // xrLabel6 // this.xrLabel6.BackColor = System.Drawing.Color.Transparent; - this.xrLabel6.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel6.Font = new System.Drawing.Font("Arial", 11F); this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 389.4999F); this.xrLabel6.Multiline = true; this.xrLabel6.Name = "xrLabel6"; @@ -200,7 +184,7 @@ namespace Alloheim // // xrLabel5 // - this.xrLabel5.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel5.Font = new System.Drawing.Font("Arial", 11F); this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 362.4999F); this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -255,7 +239,7 @@ namespace Alloheim // RecipientPostCodeAndTown // this.RecipientPostCodeAndTown.CanShrink = true; - this.RecipientPostCodeAndTown.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.RecipientPostCodeAndTown.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0F, 97.00002F); this.RecipientPostCodeAndTown.Name = "RecipientPostCodeAndTown"; this.RecipientPostCodeAndTown.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -267,6 +251,7 @@ namespace Alloheim // xrLabel_RecipientStreet // this.xrLabel_RecipientStreet.CanShrink = true; + this.xrLabel_RecipientStreet.Font = new System.Drawing.Font("Arial", 10F); this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0F, 74.00001F); this.xrLabel_RecipientStreet.Name = "xrLabel_RecipientStreet"; this.xrLabel_RecipientStreet.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -278,6 +263,7 @@ namespace Alloheim // xrLabel_RecipientDivision // this.xrLabel_RecipientDivision.CanShrink = true; + this.xrLabel_RecipientDivision.Font = new System.Drawing.Font("Arial", 10F); this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 57F); this.xrLabel_RecipientDivision.Name = "xrLabel_RecipientDivision"; this.xrLabel_RecipientDivision.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -289,6 +275,7 @@ namespace Alloheim // xrLabel_RecipientContactPerson // this.xrLabel_RecipientContactPerson.CanShrink = true; + this.xrLabel_RecipientContactPerson.Font = new System.Drawing.Font("Arial", 10F); this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0F, 39.99999F); this.xrLabel_RecipientContactPerson.Name = "xrLabel_RecipientContactPerson"; this.xrLabel_RecipientContactPerson.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -300,6 +287,7 @@ namespace Alloheim // xrLabel1 // this.xrLabel1.CanShrink = true; + this.xrLabel1.Font = new System.Drawing.Font("Arial", 10F); this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 22.99999F); this.xrLabel1.Name = "xrLabel1"; this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -488,14 +476,16 @@ namespace Alloheim // // topMarginBand1 // - this.topMarginBand1.HeightF = 100F; + this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrPictureBox2}); + this.topMarginBand1.HeightF = 176F; this.topMarginBand1.Name = "topMarginBand1"; // // bottomMarginBand1 // this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabel14}); - this.bottomMarginBand1.HeightF = 72.29163F; + this.bottomMarginBand1.HeightF = 96.62495F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // // xrLabel14 @@ -539,7 +529,7 @@ namespace Alloheim // xrLabel19 // this.xrLabel19.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(464.6247F, 172.4792F); + this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(464.6244F, 186.4792F); this.xrLabel19.Multiline = true; this.xrLabel19.Name = "xrLabel19"; this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -551,7 +541,7 @@ namespace Alloheim // xrLabel13 // this.xrLabel13.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(464.6249F, 17.29167F); + this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(464.6247F, 31.29168F); this.xrLabel13.Multiline = true; this.xrLabel13.Name = "xrLabel13"; this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -563,7 +553,7 @@ namespace Alloheim // xrLabel17 // this.xrLabel17.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(464.6249F, 95.00002F); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(464.6247F, 109F); this.xrLabel17.Multiline = true; this.xrLabel17.Name = "xrLabel17"; this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -575,7 +565,7 @@ namespace Alloheim // xrLabel16 // this.xrLabel16.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(464.6249F, 77.00001F); + this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(464.6247F, 91.00002F); this.xrLabel16.Multiline = true; this.xrLabel16.Name = "xrLabel16"; this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -586,7 +576,7 @@ namespace Alloheim // xrLabel8 // this.xrLabel8.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(464.6249F, 0F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(464.6247F, 14F); this.xrLabel8.Multiline = true; this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -597,7 +587,7 @@ namespace Alloheim // xrLabel18 // this.xrLabel18.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(464.6247F, 155.4792F); + this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(464.6244F, 169.4792F); this.xrLabel18.Multiline = true; this.xrLabel18.Name = "xrLabel18"; this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -607,10 +597,12 @@ namespace Alloheim // // xrLabel9 // + this.xrLabel9.Font = new System.Drawing.Font("Arial", 9F); this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(464.6247F, 284.1667F); this.xrLabel9.Name = "xrLabel9"; this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel9.SizeF = new System.Drawing.SizeF(213.3751F, 19.99994F); + this.xrLabel9.StylePriority.UseFont = false; this.xrLabel9.StylePriority.UseTextAlignment = false; this.xrLabel9.Text = "Datum: [InvoiceDate!dd.MM.yyyy]"; this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; @@ -618,12 +610,12 @@ namespace Alloheim // xrLabel7 // this.xrLabel7.CanShrink = true; - this.xrLabel7.Font = new System.Drawing.Font("Arial Narrow", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel7.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrLabel7.Name = "xrLabel7"; this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel7.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrLabel7.SizeF = new System.Drawing.SizeF(292F, 17F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(292.0001F, 17F); this.xrLabel7.StylePriority.UseFont = false; this.xrLabel7.Text = "Alloheim mobil - Gumbertstr. 90/92 - 40229 Düsseldorf"; // @@ -799,10 +791,6 @@ namespace Alloheim this.xrTableCell7.StylePriority.UsePadding = false; this.xrTableCell7.Weight = 3D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); - // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -1004,11 +992,22 @@ namespace Alloheim this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell60.Weight = 0.16397432767427886D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); + // + // xrPictureBox2 + // + this.xrPictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox2.Image"))); + this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(511.0835F, 38.14093F); + this.xrPictureBox2.Name = "xrPictureBox2"; + this.xrPictureBox2.SizeF = new System.Drawing.SizeF(166.9165F, 137.8591F); + this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { this.Detail, - this.ReportHeader, this.ReportFooter, this.topMarginBand1, this.bottomMarginBand1, @@ -1021,7 +1020,7 @@ namespace Alloheim this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new System.Drawing.Printing.Margins(75, 74, 100, 72); + this.Margins = new System.Drawing.Printing.Margins(75, 74, 176, 97); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = System.Drawing.Printing.PaperKind.A4; @@ -1030,8 +1029,8 @@ namespace Alloheim ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1040,7 +1039,6 @@ namespace Alloheim private DevExpress.XtraReports.UI.DetailBand Detail; 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; @@ -1112,7 +1110,6 @@ namespace Alloheim private DevExpress.XtraReports.UI.XRTableRow xrTableRow10; private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; private DevExpress.XtraReports.UI.XRLabel xrLabel7; - private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; private DevExpress.XtraReports.UI.XRLabel xrLabel19; private DevExpress.XtraReports.UI.XRLabel xrLabel13; private DevExpress.XtraReports.UI.XRLabel xrLabel17; @@ -1121,5 +1118,6 @@ namespace Alloheim private DevExpress.XtraReports.UI.XRLabel xrLabel18; private DevExpress.XtraReports.UI.XRLabel xrLabel9; private DevExpress.XtraReports.UI.XRLabel xrLabel14; + private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2; } } \ No newline at end of file diff --git a/ReportImp/Alloheim/SettlementReport2.resx b/ReportImp/Alloheim/SettlementReport2.resx index 5e2ca8c82..41439baeb 100644 --- a/ReportImp/Alloheim/SettlementReport2.resx +++ b/ReportImp/Alloheim/SettlementReport2.resx @@ -117,8 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + anbei sende ich Ihnen die unterschriebenen Nachweise über die im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerFirstName] [CustomerLastName] erbrachten Leistungen zu. Nach unserer Berechnung ergeben sich für den Betreuungszeitraum [AccountingPeriod] hieraus: + + - + /9j/4AAQSkZJRgABAQEAWgBaAAD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsN DhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQU @@ -702,10 +706,6 @@ FFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAF FFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAF FFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAf/9k= - - - - anbei sende ich Ihnen die unterschriebenen Nachweise über die im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerFirstName] [CustomerLastName] erbrachten Leistungen zu. Nach unserer Berechnung ergeben sich für den Betreuungszeitraum [AccountingPeriod] hieraus: