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

MH: Anpassung für Die Brücke Hilfe und Halt + fälschlicherweise gemachte Änderungen in ServiceRecordView2 rückgängig gemacht

Browse Source
This commit is contained in:
Marcel Hirschle
2021-02-23 16:09:52 +01:00
parent e94819f38a
commit 27e369cad3
11 changed files with 200 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
BeWo/View/Detail/ServiceRecordView2.xaml.cs
View File

@@ -2003,14 +2003,6 @@ namespace BeWo.View.Detail
{
RoundedDHeader.Header = "Stunden";
}
//Fahrtstrecken für Gruppenbuchungen korrigieren
foreach (var sr in list)
{
if (sr.GroupPersonCount != null && sr.DistanceInMeter != null)
{
sr.DistanceInMeter = Math.Round((double)(sr.DistanceInMeter / sr.GroupPersonCount), 2); ;
}
}
srListBox.ItemsSource = list;
//###Bars

9
Report/ReportObjects/EmployeeKilometerauswertungsListRO.cs
View File

@@ -61,7 +61,7 @@ namespace BeWo.Report.ReportObjects
public List<EmployeeKilometerauswertungsEntry> Entries { get; set; }
public int TotalDistanceInMeters { get; set; }
public double TotalDistanceInMeters { get; set; }
public Employee2EmployeeKilometerauswertungsEntry(CompactEmployeeDC employee, IEnumerable<ServiceRecord> serviceRecords)
{
@@ -72,9 +72,12 @@ namespace BeWo.Report.ReportObjects
foreach(var serviceRecord in serviceRecords.Where(serviceRecord => serviceRecord.DistanceInMeter.HasValue && serviceRecord.Start.HasValue))
{
TotalDistanceInMeters += serviceRecord.DistanceInMeter.Value;
var distance = (serviceRecord.GroupPersonCount == null) ? (double)serviceRecord.DistanceInMeter.Value : (double)serviceRecord.DistanceInMeter.Value / (double)serviceRecord.GroupPersonCount;
var distanceRounded = Math.Round(distance, 2);
Entries.Add(new EmployeeKilometerauswertungsEntry(serviceRecord.Start, serviceRecord.End, serviceRecord.DistanceInMeter.Value, serviceRecord.Customer?.Person?.LastNameFirstName ?? string.Empty, serviceRecord.Notice));
TotalDistanceInMeters += distanceRounded;
Entries.Add(new EmployeeKilometerauswertungsEntry(serviceRecord.Start, serviceRecord.End, distanceRounded, serviceRecord.Customer?.Person?.LastNameFirstName ?? string.Empty, serviceRecord.Notice));
}
}
}

13
Report/ReportObjects/EmployeeKilometerauswertungsRO.cs
View File

@@ -15,7 +15,7 @@ namespace BeWo.Report.ReportObjects
public DateTime MonthInformation { get; set; }
public int TotalDistanceInMeters { get; set; }
public double TotalDistanceInMeters { get; set; }
public List<EmployeeKilometerauswertungsEntry> Entries { get; set; }
@@ -46,9 +46,12 @@ namespace BeWo.Report.ReportObjects
foreach(var serviceRecord in serviceRecords.Where(serviceRecord => serviceRecord.DistanceInMeter.HasValue && serviceRecord.DistanceInMeter > 0 && serviceRecord.Start.HasValue))
{
TotalDistanceInMeters += serviceRecord.DistanceInMeter.Value;
var distance = (serviceRecord.GroupPersonCount == null) ? (double)serviceRecord.DistanceInMeter.Value : (double)serviceRecord.DistanceInMeter.Value / (double)serviceRecord.GroupPersonCount;
var distanceRounded = Math.Round(distance, 2);
Entries.Add(new EmployeeKilometerauswertungsEntry(serviceRecord.Start, serviceRecord.End, serviceRecord.DistanceInMeter.Value, serviceRecord.Customer?.Person?.LastNameFirstName ?? string.Empty, serviceRecord.Notice));
TotalDistanceInMeters += distanceRounded;
Entries.Add(new EmployeeKilometerauswertungsEntry(serviceRecord.Start, serviceRecord.End, distanceRounded, serviceRecord.Customer?.Person?.LastNameFirstName ?? string.Empty, serviceRecord.Notice));
}
}
}
@@ -80,13 +83,13 @@ namespace BeWo.Report.ReportObjects
}
}
public int DistanceInMeters { get; }
public double DistanceInMeters { get; }
public string CustomerName { get; }
public string Dokumentation { get; }
public EmployeeKilometerauswertungsEntry(DateTime? start, DateTime? end, int distanceInMeters, string customerName, string doku)
public EmployeeKilometerauswertungsEntry(DateTime? start, DateTime? end, double distanceInMeters, string customerName, string doku)
{
if (start.HasValue)
{

89
ReportImp/DieBrueckeHilfeUndHalt/Quittierungsbeleg.Designer.cs generated
View File

@@ -78,7 +78,10 @@ namespace DieBrueckeHilfeUndHalt
this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule();
this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.xrRichText4 = new DevExpress.XtraReports.UI.XRRichText();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.lblUnterschriftKlient = new DevExpress.XtraReports.UI.XRLabel();
this.lblUnterschriftMitarbeiter = new DevExpress.XtraReports.UI.XRLabel();
@@ -110,22 +113,18 @@ namespace DieBrueckeHilfeUndHalt
this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText();
this.xrRichText4 = new DevExpress.XtraReports.UI.XRRichText();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -508,7 +507,7 @@ namespace DieBrueckeHilfeUndHalt
this.xrTableCell7.StylePriority.UseBorders = false;
this.xrTableCell7.StylePriority.UseFont = false;
this.xrTableCell7.StylePriority.UseTextAlignment = false;
this.xrTableCell7.Text = "Minuten\r\n(ohne 1,2)";
this.xrTableCell7.Text = "Minuten\r\n";
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell7.Weight = 0.23743016759776536D;
//
@@ -745,13 +744,39 @@ namespace DieBrueckeHilfeUndHalt
this.topMarginBand1.HeightF = 161.8056F;
this.topMarginBand1.Name = "topMarginBand1";
//
// xrPictureBox1
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(487.1111F, 51.80554F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(204.8889F, 110F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrRichText3
//
this.xrRichText3.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 51.80554F);
this.xrRichText3.Name = "xrRichText3";
this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString");
this.xrRichText3.SizeF = new System.Drawing.SizeF(417.0553F, 110F);
this.xrRichText3.StylePriority.UseFont = false;
//
// bottomMarginBand1
//
this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrRichText4});
this.bottomMarginBand1.HeightF = 130F;
this.bottomMarginBand1.HeightF = 101.25F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// xrRichText4
//
this.xrRichText4.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 9.999974F);
this.xrRichText4.Name = "xrRichText4";
this.xrRichText4.SerializableRtfString = resources.GetString("xrRichText4.SerializableRtfString");
this.xrRichText4.SizeF = new System.Drawing.SizeF(701.9999F, 91.25004F);
this.xrRichText4.StylePriority.UseFont = false;
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -765,7 +790,6 @@ namespace DieBrueckeHilfeUndHalt
this.xrLabel15,
this.xrLabel13,
this.xrLabel12,
this.xrLabel11,
this.xrLabel10,
this.xrLabel9,
this.xrLabel1});
@@ -1115,20 +1139,6 @@ namespace DieBrueckeHilfeUndHalt
this.xrLabel12.Text = "E = ear to ear, face to face";
this.xrLabel12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// xrLabel11
//
this.xrLabel11.Font = new System.Drawing.Font("Arial", 8F);
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(415F, 19.99999F);
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.SizeF = new System.Drawing.SizeF(320F, 20F);
this.xrLabel11.StylePriority.UseBackColor = false;
this.xrLabel11.StylePriority.UseBorders = false;
this.xrLabel11.StylePriority.UseFont = false;
this.xrLabel11.StylePriority.UsePadding = false;
this.xrLabel11.StylePriority.UseTextAlignment = false;
this.xrLabel11.Text = "Ohne Faktor 1,2 (wird erst bei Abrechnung eingerechnet)";
this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrLabel10
//
this.xrLabel10.BackColor = System.Drawing.Color.Gainsboro;
@@ -1186,32 +1196,6 @@ namespace DieBrueckeHilfeUndHalt
this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String;
this.fieldKontaktArt.Name = "fieldKontaktArt";
//
// xrPictureBox1
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(487.1111F, 51.80554F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(204.8889F, 110F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrRichText3
//
this.xrRichText3.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 51.80554F);
this.xrRichText3.Name = "xrRichText3";
this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString");
this.xrRichText3.SizeF = new System.Drawing.SizeF(417.0553F, 110F);
this.xrRichText3.StylePriority.UseFont = false;
//
// xrRichText4
//
this.xrRichText4.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrRichText4.Name = "xrRichText4";
this.xrRichText4.SerializableRtfString = resources.GetString("xrRichText4.SerializableRtfString");
this.xrRichText4.SizeF = new System.Drawing.SizeF(701.9999F, 110F);
this.xrRichText4.StylePriority.UseFont = false;
//
// Quittierungsbeleg
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1230,7 +1214,7 @@ namespace DieBrueckeHilfeUndHalt
this.formattingRuleServiceDesc,
this.formattingRuleCostBearer,
this.formattingRuleEmployeeName});
this.Margins = new System.Drawing.Printing.Margins(50, 30, 162, 130);
this.Margins = new System.Drawing.Printing.Margins(50, 30, 162, 101);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
@@ -1238,11 +1222,11 @@ namespace DieBrueckeHilfeUndHalt
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -1296,7 +1280,6 @@ namespace DieBrueckeHilfeUndHalt
private DevExpress.XtraReports.UI.XRTableCell xrTableCell50;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
private DevExpress.XtraReports.UI.CalculatedField fieldKontaktArt;
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;

2
ReportImp/DieBrueckeHilfeUndHalt/Quittierungsbeleg.resx
View File

File diff suppressed because one or more lines are too long

114
ReportImp/DieBrueckeHilfeUndHalt/ServiceInvoiceReport.Designer.cs generated
View File

@@ -32,10 +32,15 @@ namespace DieBrueckeHilfeUndHalt
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServiceInvoiceReport));
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.xrRichText4 = new DevExpress.XtraReports.UI.XRRichText();
this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText();
this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
@@ -76,19 +81,14 @@ namespace DieBrueckeHilfeUndHalt
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText();
this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
this.xrRichText4 = new DevExpress.XtraReports.UI.XRRichText();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -108,6 +108,23 @@ namespace DieBrueckeHilfeUndHalt
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
// xrRichText1
//
this.xrRichText1.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
this.xrRichText1.SizeF = new System.Drawing.SizeF(417.0553F, 110F);
this.xrRichText1.StylePriority.UseFont = false;
//
// xrPictureBox1
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(487.1111F, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(204.8889F, 110F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// ruleRateFactorNull
//
this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
@@ -126,6 +143,15 @@ namespace DieBrueckeHilfeUndHalt
this.bottomMarginBand1.HeightF = 130F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// xrRichText4
//
this.xrRichText4.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText4.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 9.999974F);
this.xrRichText4.Name = "xrRichText4";
this.xrRichText4.SerializableRtfString = resources.GetString("xrRichText4.SerializableRtfString");
this.xrRichText4.SizeF = new System.Drawing.SizeF(701.9999F, 103.75F);
this.xrRichText4.StylePriority.UseFont = false;
//
// Page1
//
this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -143,6 +169,24 @@ namespace DieBrueckeHilfeUndHalt
this.Page1.Name = "Page1";
this.Page1.StylePriority.UseFont = false;
//
// xrRichText3
//
this.xrRichText3.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 21.47221F);
this.xrRichText3.Name = "xrRichText3";
this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString");
this.xrRichText3.SizeF = new System.Drawing.SizeF(363.5831F, 29.52779F);
this.xrRichText3.StylePriority.UseFont = false;
//
// xrRichText2
//
this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(514.11F, 0F);
this.xrRichText2.Name = "xrRichText2";
this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
this.xrRichText2.SizeF = new System.Drawing.SizeF(187.8887F, 154.1111F);
this.xrRichText2.StylePriority.UseFont = false;
//
// xrLabel7
//
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 51F);
@@ -650,50 +694,6 @@ namespace DieBrueckeHilfeUndHalt
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// xrRichText1
//
this.xrRichText1.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
this.xrRichText1.SizeF = new System.Drawing.SizeF(417.0553F, 110F);
this.xrRichText1.StylePriority.UseFont = false;
//
// xrPictureBox1
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(487.1111F, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(204.8889F, 110F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrRichText3
//
this.xrRichText3.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 21.47221F);
this.xrRichText3.Name = "xrRichText3";
this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString");
this.xrRichText3.SizeF = new System.Drawing.SizeF(363.5831F, 29.52779F);
this.xrRichText3.StylePriority.UseFont = false;
//
// xrRichText2
//
this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(514.11F, 0F);
this.xrRichText2.Name = "xrRichText2";
this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
this.xrRichText2.SizeF = new System.Drawing.SizeF(187.8887F, 154.1111F);
this.xrRichText2.StylePriority.UseFont = false;
//
// xrRichText4
//
this.xrRichText4.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrRichText4.Name = "xrRichText4";
this.xrRichText4.SerializableRtfString = resources.GetString("xrRichText4.SerializableRtfString");
this.xrRichText4.SizeF = new System.Drawing.SizeF(701.9999F, 110F);
this.xrRichText4.StylePriority.UseFont = false;
//
// ServiceInvoiceReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -713,14 +713,14 @@ namespace DieBrueckeHilfeUndHalt
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}

2
ReportImp/DieBrueckeHilfeUndHalt/ServiceInvoiceReport.resx
View File

File diff suppressed because one or more lines are too long

281
ReportImp/DieBrueckeHilfeUndHalt/SettlementReport.Designer.cs generated
View File

@@ -32,6 +32,8 @@ namespace DieBrueckeHilfeUndHalt.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.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -57,23 +59,14 @@ namespace DieBrueckeHilfeUndHalt.Alt
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow20 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow21 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow22 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow24 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.lblNotice = new DevExpress.XtraReports.UI.XRLabel();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.xrRichText4 = new DevExpress.XtraReports.UI.XRRichText();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText();
this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
@@ -101,20 +94,15 @@ namespace DieBrueckeHilfeUndHalt.Alt
this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText();
this.xrRichText4 = new DevExpress.XtraReports.UI.XRRichText();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -134,11 +122,28 @@ namespace DieBrueckeHilfeUndHalt.Alt
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
// xrRichText1
//
this.xrRichText1.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
this.xrRichText1.SizeF = new System.Drawing.SizeF(417.0553F, 110F);
this.xrRichText1.StylePriority.UseFont = false;
//
// xrPictureBox1
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(487.1111F, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(204.8889F, 110F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrLabel8
//
this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(514.1113F, 154.1111F);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(487.1111F, 277.0278F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(187.8887F, 23F);
@@ -149,7 +154,7 @@ namespace DieBrueckeHilfeUndHalt.Alt
// xrTable1
//
this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 375.3333F);
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 484.7083F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow9,
@@ -280,17 +285,17 @@ namespace DieBrueckeHilfeUndHalt.Alt
//
// xrLabel6
//
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 300.3333F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 409.7083F);
this.xrLabel6.Multiline = true;
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(642F, 67F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(649.9999F, 75F);
this.xrLabel6.StylePriority.UseFont = false;
this.xrLabel6.Text = resources.GetString("xrLabel6.Text");
//
// xrLabel5
//
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 267.3333F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 376.7083F);
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F);
@@ -302,7 +307,7 @@ namespace DieBrueckeHilfeUndHalt.Alt
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
this.xrLabel4.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 225F);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 334.375F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -317,7 +322,7 @@ namespace DieBrueckeHilfeUndHalt.Alt
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
this.xrLabel3.CanShrink = true;
this.xrLabel3.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 209F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 318.375F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 16F);
@@ -331,7 +336,7 @@ namespace DieBrueckeHilfeUndHalt.Alt
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
this.xrLabel2.CanShrink = true;
this.xrLabel2.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 301.375F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(650F, 17F);
@@ -398,11 +403,10 @@ namespace DieBrueckeHilfeUndHalt.Alt
// ReportFooter
//
this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel7,
this.xrLabel10,
this.xrTable3,
this.xrLabel12,
this.xrLabel11,
this.lblNotice});
this.xrLabel11});
this.ReportFooter.Font = new System.Drawing.Font("Verdana", 10F);
this.ReportFooter.HeightF = 209F;
this.ReportFooter.KeepTogether = true;
@@ -418,97 +422,6 @@ namespace DieBrueckeHilfeUndHalt.Alt
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.Text = "Mit freundlichen Grüßen";
//
// xrTable3
//
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 33F);
this.xrTable3.Name = "xrTable3";
this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow20,
this.xrTableRow21,
this.xrTableRow22,
this.xrTableRow23,
this.xrTableRow24});
this.xrTable3.SizeF = new System.Drawing.SizeF(650F, 68F);
this.xrTable3.StylePriority.UseFont = false;
//
// xrTableRow20
//
this.xrTableRow20.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell16});
this.xrTableRow20.Name = "xrTableRow20";
this.xrTableRow20.Weight = 0.38095238095238093D;
//
// xrTableCell16
//
this.xrTableCell16.CanShrink = true;
this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")});
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell16.StylePriority.UsePadding = false;
this.xrTableCell16.Text = "xrTableCell1";
this.xrTableCell16.Weight = 3D;
//
// xrTableRow21
//
this.xrTableRow21.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell18});
this.xrTableRow21.Name = "xrTableRow21";
this.xrTableRow21.Weight = 0.23809523809523808D;
//
// xrTableCell18
//
this.xrTableCell18.Name = "xrTableCell18";
this.xrTableCell18.Weight = 3D;
//
// xrTableRow22
//
this.xrTableRow22.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell29});
this.xrTableRow22.Name = "xrTableRow22";
this.xrTableRow22.Weight = 0.38095238095238088D;
//
// xrTableCell29
//
this.xrTableCell29.CanShrink = true;
this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "AbsenceTimes")});
this.xrTableCell29.Name = "xrTableCell29";
this.xrTableCell29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell29.StylePriority.UsePadding = false;
this.xrTableCell29.Text = "xrTableCell4";
this.xrTableCell29.Weight = 3D;
//
// xrTableRow23
//
this.xrTableRow23.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell30});
this.xrTableRow23.Name = "xrTableRow23";
this.xrTableRow23.Weight = 0.23809523809523803D;
//
// xrTableCell30
//
this.xrTableCell30.Name = "xrTableCell30";
this.xrTableCell30.Weight = 3D;
//
// xrTableRow24
//
this.xrTableRow24.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell31});
this.xrTableRow24.Name = "xrTableRow24";
this.xrTableRow24.Weight = 0.38095238095238093D;
//
// xrTableCell31
//
this.xrTableCell31.CanShrink = true;
this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FinalSentence")});
this.xrTableCell31.Name = "xrTableCell31";
this.xrTableCell31.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell31.StylePriority.UsePadding = false;
this.xrTableCell31.Text = "xrTableCell8";
this.xrTableCell31.Weight = 3D;
//
// xrLabel12
//
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192F);
@@ -529,17 +442,6 @@ namespace DieBrueckeHilfeUndHalt.Alt
this.xrLabel11.Text = "Anlage";
this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// lblNotice
//
this.lblNotice.CanShrink = true;
this.lblNotice.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Italic);
this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 7.999992F);
this.lblNotice.Name = "lblNotice";
this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblNotice.SizeF = new System.Drawing.SizeF(250F, 25F);
this.lblNotice.StylePriority.UseFont = false;
this.lblNotice.Text = "Abschließende Bemerkungen:";
//
// topMarginBand1
//
this.topMarginBand1.HeightF = 50F;
@@ -549,9 +451,18 @@ namespace DieBrueckeHilfeUndHalt.Alt
//
this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrRichText4});
this.bottomMarginBand1.HeightF = 130F;
this.bottomMarginBand1.HeightF = 110F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// xrRichText4
//
this.xrRichText4.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrRichText4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrRichText4.Name = "xrRichText4";
this.xrRichText4.SerializableRtfString = resources.GetString("xrRichText4.SerializableRtfString");
this.xrRichText4.SizeF = new System.Drawing.SizeF(701.9999F, 110F);
this.xrRichText4.StylePriority.UseFont = false;
//
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -570,10 +481,30 @@ namespace DieBrueckeHilfeUndHalt.Alt
this.xrTable1,
this.xrLabel8});
this.GroupHeader1.Font = new System.Drawing.Font("Verdana", 10F);
this.GroupHeader1.HeightF = 443.3333F;
this.GroupHeader1.HeightF = 552.7083F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
// xrRichText3
//
this.xrRichText3.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 21.52778F);
this.xrRichText3.Name = "xrRichText3";
this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString");
this.xrRichText3.SizeF = new System.Drawing.SizeF(363.5831F, 29.52779F);
this.xrRichText3.StylePriority.UseFont = false;
//
// xrRichText2
//
this.xrRichText2.BorderColor = System.Drawing.Color.Transparent;
this.xrRichText2.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(469.4028F, 0F);
this.xrRichText2.Name = "xrRichText2";
this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
this.xrRichText2.SizeF = new System.Drawing.SizeF(232.5972F, 277.0278F);
this.xrRichText2.StylePriority.UseBorderColor = false;
this.xrRichText2.StylePriority.UseFont = false;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
@@ -863,49 +794,17 @@ namespace DieBrueckeHilfeUndHalt.Alt
this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell58.Weight = 0.21685899000901443D;
//
// xrPictureBox1
// xrLabel7
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(487.1111F, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(204.8889F, 110F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrRichText2
//
this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(514.1113F, 0F);
this.xrRichText2.Name = "xrRichText2";
this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
this.xrRichText2.SizeF = new System.Drawing.SizeF(187.8887F, 154.1111F);
this.xrRichText2.StylePriority.UseFont = false;
//
// xrRichText1
//
this.xrRichText1.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
this.xrRichText1.SizeF = new System.Drawing.SizeF(417.0553F, 110F);
this.xrRichText1.StylePriority.UseFont = false;
//
// xrRichText3
//
this.xrRichText3.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 21.52778F);
this.xrRichText3.Name = "xrRichText3";
this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString");
this.xrRichText3.SizeF = new System.Drawing.SizeF(363.5831F, 29.52779F);
this.xrRichText3.StylePriority.UseFont = false;
//
// xrRichText4
//
this.xrRichText4.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrRichText4.Name = "xrRichText4";
this.xrRichText4.SerializableRtfString = resources.GetString("xrRichText4.SerializableRtfString");
this.xrRichText4.SizeF = new System.Drawing.SizeF(701.9999F, 110F);
this.xrRichText4.StylePriority.UseFont = false;
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F);
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(668.75F, 84.70834F);
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.Text = "Bei Überzahlung: Bitte senden Sie uns Ihr Kassenzeichen zu.\r\n\r\nBei fehlender Zahl" +
"ung: Bitte überweisen Sie uns den Rechnungsbetrag innerhalb von 14 Tagen auf uns" +
"er u.g. Konto.\r\n";
//
// Spitzabrechnung
//
@@ -922,20 +821,19 @@ namespace DieBrueckeHilfeUndHalt.Alt
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
this.Margins = new System.Drawing.Printing.Margins(75, 50, 50, 130);
this.Margins = new System.Drawing.Printing.Margins(75, 50, 50, 110);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -956,7 +854,6 @@ namespace DieBrueckeHilfeUndHalt.Alt
private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientContactPerson;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter;
private DevExpress.XtraReports.UI.XRLabel lblNotice;
private DevExpress.XtraReports.UI.XRLabel xrLabel12;
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
private DevExpress.XtraReports.UI.XRTable xrTable1;
@@ -970,17 +867,6 @@ namespace DieBrueckeHilfeUndHalt.Alt
private DevExpress.XtraReports.UI.XRTableRow rowErbrachteLeistung;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
private DevExpress.XtraReports.UI.XRTable xrTable3;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow20;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow21;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow22;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow23;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow24;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell31;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
private DevExpress.XtraReports.UI.FormattingRule ruleRateFactorNull;
private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
@@ -1018,5 +904,6 @@ namespace DieBrueckeHilfeUndHalt.Alt
private DevExpress.XtraReports.UI.XRRichText xrRichText3;
private DevExpress.XtraReports.UI.XRRichText xrRichText2;
private DevExpress.XtraReports.UI.XRRichText xrRichText4;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
}
}

2
ReportImp/DieBrueckeHilfeUndHalt/SettlementReport.cs
View File

@@ -21,7 +21,7 @@ namespace DieBrueckeHilfeUndHalt.Alt
if (String.IsNullOrEmpty(pRO.Notice))
{
lblNotice.Visible = false;
//lblNotice.Visible = false;
}
if (pRO.InvoiceItems != null && pRO.InvoiceItems.Count == 1)

6
ReportImp/DieBrueckeHilfeUndHalt/SettlementReport.resx
View File

File diff suppressed because one or more lines are too long

5
Service/Plugins/PluginLoader.cs
View File

@@ -106,7 +106,7 @@ namespace BeWo.Service.Plugins
//t = "9447917179"; // LH Rodenkirchen
//t = "4690407894"; // Bleib im Leben
//t = "2576513996"; // TRIAS
t = "2509786400"; // LH Stade
//t = "2509786400"; // LH Stade
//t = "8677523325"; // BeWo Richartz
//t = "1765854593"; // Mein Betreutes Wohnen
//t = "6802909544"; // Lebenshilfe Coburg
@@ -252,7 +252,7 @@ namespace BeWo.Service.Plugins
//t = "4500422855"; // BeWo Nordeifel
//t = "3565931805"; // Betreuungsbüro Frank Röhrig
//t = "4152581290"; // MVZ Medikus GmbH (Stoffwechsel Betreutes wohnen)
//t = "4529320405"; // BeWo Stelzel
//t = "4529320405"; // BeWo Stelzel
//t = "2594047883"; // KOMM Ambulante Dienste e. V.
//t = "1558685648"; // KIMM
//t = "3460972350"; // Caritas Kleve I
@@ -260,6 +260,7 @@ namespace BeWo.Service.Plugins
//t = "4368361336"; // Kompass BeWo Wesel
//t = "3257905806"; // Diakonisches Werk Herne
//t = "2535794597"; // Mobilo Ambulant
t = "7114701269"; // Die Brücke Hilfe und Halt
return t;
#else