diff --git a/ReportImp/Mittelpunkt/Bereitschaftsliste.cs b/ReportImp/Mittelpunkt/Bereitschaftsliste.cs index cb4aecf1a..9cffcff66 100644 --- a/ReportImp/Mittelpunkt/Bereitschaftsliste.cs +++ b/ReportImp/Mittelpunkt/Bereitschaftsliste.cs @@ -12,8 +12,6 @@ namespace Mittelpunkt { public partial class Bereitschaftsliste : DevExpress.XtraReports.UI.XtraReport, IBeWoReport { - private decimal maxWochenstunden = 39; - public Bereitschaftsliste() { InitializeComponent(); diff --git a/ReportImp/Mittelpunkt/Lohnliste.cs b/ReportImp/Mittelpunkt/Lohnliste.cs index 867bd5ef6..a5e348ade 100644 --- a/ReportImp/Mittelpunkt/Lohnliste.cs +++ b/ReportImp/Mittelpunkt/Lohnliste.cs @@ -9,8 +9,6 @@ namespace Mittelpunkt { public partial class Lohnliste : DevExpress.XtraReports.UI.XtraReport, IBeWoReport { - private decimal maxWochenstunden = 39; - public Lohnliste() { InitializeComponent(); diff --git a/ReportImp/Mittelpunkt/Service/CustomEmployeeService.cs b/ReportImp/Mittelpunkt/Service/CustomEmployeeService.cs index 8822af657..be83c9722 100644 --- a/ReportImp/Mittelpunkt/Service/CustomEmployeeService.cs +++ b/ReportImp/Mittelpunkt/Service/CustomEmployeeService.cs @@ -60,53 +60,25 @@ namespace Mittelpunkt.Service } } } - } if (bruttogehaltFuerArbeitszuschlaege != null && stundensatzFuerArbeitszuschlaege is null) { stundensatzFuerArbeitszuschlaege = bruttogehaltFuerArbeitszuschlaege / currentContract.WeeklyTotalHours / (decimal)4.33; stundensatzFuerArbeitszuschlaege = Math.Round((decimal)stundensatzFuerArbeitszuschlaege, 2, MidpointRounding.AwayFromZero); + + var serializedValue = BS.Shared.Core.Utils.XMLSerializeToString(stundensatzFuerArbeitszuschlaege); + VarFieldValue varFieldValue = + new VarFieldValue { SerializedValue = serializedValue, TypeName = "System.Decimal", VarFieldDefOid = 4, ObjectOid = employee.Oid, ObjectTid = BS.Shared.TableID.Employee }; + + employee.VarFieldValueList.Add(varFieldValue); + + DAOFactory.GenericDAO.Update(employee); } - - DAOFactory.GenericDAO.Update(employee); - } var employeeDc = MapperFactory.EmployeeDC_Employee.MapToNewDC(employee); return employeeDc; } - - - private string LeseEntgeldstufenVarfield(Employee employee) - { - string entgeldstufe = null; - foreach (var vv in employee.VarFieldValueList) - { - if (vv.VarFieldDefOid == 2) - { - var varFieldValue = BS.Shared.Core.Utils.XMLDeserializeFromString(vv.SerializedValue, Type.GetType(vv.TypeName)); - if (varFieldValue != null) - { - entgeldstufe = varFieldValue.ToString(); - } - - /* - var varFieldValue = BS.Shared.Core.Utils.XMLDeserializeFromString(vv.SerializedValue, Type.GetType(vv.TypeName)); - - decimal dec = 0; - if (varFieldValue != null && Decimal.TryParse(varFieldValue.ToString(), out dec)) - { - if (dec > 0) - { - return dec / 5; - } - } - */ - } - } - - return entgeldstufe; - } } } diff --git a/ReportImp/Mittelpunkt/ZuschlaegeArbeit.cs b/ReportImp/Mittelpunkt/ZuschlaegeArbeit.cs index a4dd531bc..76700b14f 100644 --- a/ReportImp/Mittelpunkt/ZuschlaegeArbeit.cs +++ b/ReportImp/Mittelpunkt/ZuschlaegeArbeit.cs @@ -1,15 +1,23 @@ using System; using System.Collections.Generic; +using System.Linq; using BeWo.Data.Access; using BeWo.Data.Entities; using BeWo.Report; using BeWo.Report.ReportObjects; +using BeWo.Service.DCEntityMapper; +using BS.Shared; using BS.Shared.Extensions; namespace Mittelpunkt { public partial class ZuschlaegeArbeit : DevExpress.XtraReports.UI.XtraReport, IBeWoReport { + private decimal wechselschichtZulageMtl = 0; + private decimal wechselschichtZulageStdl = 0; + private decimal schichtarbeitZulageMtl = 0; + private decimal schichtarbeitZulageStdl = 0; + public ZuschlaegeArbeit() { InitializeComponent(); @@ -28,39 +36,26 @@ namespace Mittelpunkt } DateTime monatsAnfang = pRO.ReportStartDate; + LesePreise(monatsAnfang); foreach (var empDetail in pRO.EmployeeDetailList) { - long empOid = (long)empDetail.Employee.Oid; - // Custom1: Stundensatz - if (empDict.ContainsKey(empOid)) - { - Employee emp = empDict[empOid]; - Contract c = emp.GetValidContractForDate(pRO.ReportStartDate); + // Custom1 Stundensatz + decimal stundensatz = ErmittleStundensatz(empDetail.Employee, monatsAnfang); + if (stundensatz > 0) + empDetail.Custom1 = stundensatz; - if (c is null) // Kein Vertrag vom 1. gefunden, gucken, ob es einen gibt, der mitten im Monat beginnt. - { - var c2 = GetNextValidContractForDate(monatsAnfang, emp); - if (c2 != null && c2.EntryDate.HasValue && c2.EntryDate.Value < pRO.ReportEndDate) - c = c2; - } + bool isLMHD = LeseLmhdVarfield(empDetail.Employee); - if (c != null) - { - decimal? bruttoGehalt = c.GrossSalary; - if (c.WeeklyTotalHours.HasValue) - { - decimal wochenstunden = (decimal)c.WeeklyTotalHours.Value; - // Stundensatz aus Bruttogehalt und Wochenstunden berechnen (durchschn. 4,33 Wochen pro Monat) - if (bruttoGehalt != null) - empDetail.Custom1 = (decimal) bruttoGehalt / wochenstunden / 4.33m; - } - } - } + int anzahlNachtschichten = 0; + int anzahlFruehschichten = 0; + int anzahlSpaetschichten = 0; + decimal fruehschichtMinuten = 0; + decimal spaetschichtMinuten = 0; foreach (var day in empDetail.Days) { - // Custom2+3 Samstagsarbeit 13-21 Uhr (20 Prozent) + // Custom2+3 Samstagsarbeit 13-21 Uhr if (day.ServiceRecords != null && day.ServiceRecords.Count > 0) { foreach (var sr in day.ServiceRecords) @@ -78,48 +73,157 @@ namespace Mittelpunkt } } - // Custom4+5 Sonntagsarbeit (25 Prozent) + // Custom4+5 Sonntagsarbeit empDetail.Custom4 += day.HoursSunday; - // Custom6+7 Feiertagsarbeit (35 Prozent) + // Custom6+7 Feiertagsarbeit empDetail.Custom6 += day.HoursHoliday; - // Custom8+9 Nachtarbeit 21-05:59 Uhr (20 Prozent) - empDetail.Custom8 += day.SpecialHours; + // Custom8+9 Nachtarbeit 21-05:59 Uhr + if (day.SpecialHours > 0) + { + anzahlNachtschichten++; + empDetail.Custom8 += day.SpecialHours; + } + + if (day.MinutesTotal >= 420 && day.StartDateTime1 != null && day.EndDateTime1 != null) + { + if (((DateTime)day.StartDateTime1).Hour < 8 && ((DateTime)day.EndDateTime1).Hour < 15) + { + anzahlFruehschichten++; + fruehschichtMinuten += day.MinutesTotal; + } + else if (((DateTime)day.StartDateTime1).Hour > 13 && ((DateTime)day.EndDateTime1).Hour > 20) + { + anzahlSpaetschichten++; + spaetschichtMinuten += day.MinutesTotal; + } + } } + + // Summe Samstag (plus 20 Prozent) empDetail.Custom3 = empDetail.Custom2 * empDetail.Custom1 * 0.2m; + + // Summe Sonntag (plus 25 Prozent) empDetail.Custom5 = empDetail.Custom4 * empDetail.Custom1 * 0.25m; + + // Summe Feiertag (plus 35 Prozent) empDetail.Custom7 = empDetail.Custom6 * empDetail.Custom1 * 0.35m; + + // Summe Nacht (plus 20 Prozent) empDetail.Custom9 = empDetail.Custom8 * empDetail.Custom1 * 0.2m; - // Custom10 Summe der Zulagen - empDetail.Custom10 = empDetail.Custom3 + empDetail.Custom5 + empDetail.Custom7 + empDetail.Custom9; + // Wechselschicht- und Schichtzulagen nur für LMHD-Mitarbeiter + if (isLMHD) + { + // Wechselschichtzulagen wenn es Nachtschichten gab und zusaetzlich auch Frueh- oder Spaetschichten + if (anzahlNachtschichten > 0 && (anzahlFruehschichten > 0 || anzahlSpaetschichten > 0)) + { + // Wechselschichtzulage mtl. ab 3 Nachtschichten wenn es auch andere Schichten gab + if (anzahlNachtschichten > 2) + empDetail.Custom12 = wechselschichtZulageMtl; + else + { + // sonst Wechselschichtzulage stdl. + empDetail.Custom10 = empDetail.Custom8; + empDetail.Custom11 = empDetail.Custom8 * wechselschichtZulageStdl; + } + } + + // Schichtarbeitzulagen wenn es Frueh- und Spaetschichten gab + if (anzahlFruehschichten > 2 && anzahlSpaetschichten > 2) + { + // Schichtarbeitzulage mtl. bei mind. dreimal Frueh- und dreimal Spaetschicht + empDetail.Custom15 = schichtarbeitZulageMtl; + } + else if (anzahlFruehschichten > 0 && anzahlSpaetschichten > 0) + { + // sonst Schichtarbeitzulage stdl. wenn es Frueh- und Spaetschichten gab + empDetail.Custom13 = (fruehschichtMinuten + spaetschichtMinuten) / 60; + empDetail.Custom14 = empDetail.Custom13 * schichtarbeitZulageStdl; + } + } + + // Summe aller Zulagen + empDetail.Bu = empDetail.Custom3 + empDetail.Custom5 + empDetail.Custom7 + empDetail.Custom9 + + empDetail.Custom11 + empDetail.Custom12 + empDetail.Custom14 + empDetail.Custom15; } this.bindingSource1.DataSource = pRO; } - public Contract GetNextValidContractForDate(DateTime dt, Employee emp) + private void LesePreise(DateTime datum) { - Contract contractNextToStartDate = emp.GetValidContractForDate(dt); + var preise = DAOFactory.GenericDAO.GetAllActive(); - if (contractNextToStartDate == null) + wechselschichtZulageMtl = lesePreis(preise, "Wechselschichtzulage mtl.", datum); + wechselschichtZulageStdl = lesePreis(preise, "Wechselschichtzulage stdl.", datum); + schichtarbeitZulageMtl = lesePreis(preise, "Schichtarbeitzulage mtl.", datum); + schichtarbeitZulageStdl = lesePreis(preise, "Schichtarbeitzulage stdl.", datum); + } + + private decimal lesePreis(IList preise, String preisName, DateTime datum) + { + decimal result = 0; + var preis = preise.Where(p => p.Name.Contains(preisName)).FirstOrDefault(); + if (preis != null) { - DateTime minDate = DateTime.MinValue; - DateTime maxDate = DateTime.MaxValue; - - foreach (var item in emp.Contracts) + var crlist = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(preis.CostRatePeriods); + var cr = crlist.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, datum); + if (cr != null && cr.CostRateValue.HasValue) { - if (item.EntryDate.HasValue && item.EntryDate.Value >= dt) - { - if (contractNextToStartDate == null || item.EntryDate.Value < contractNextToStartDate.EntryDate.Value) - { - contractNextToStartDate = item; - } - } + result = cr.CostRateValue.Value; } } - return contractNextToStartDate; + return result; + } + + private decimal ErmittleStundensatz(Employee employee, DateTime dt) + { + // Varfield verwenden falls gesetzt + decimal stundensatz = LeseStundensatzVarfield(employee); + if (!(stundensatz > 0)) + { + // sonst im aktuellen Vetrag schauen + Contract c = employee.GetValidContractForDate(dt); + if (c != null && c.HourlyRate != null) + stundensatz = (decimal) c.HourlyRate; + } + return stundensatz; + } + + private decimal LeseStundensatzVarfield(Employee employee) + { + decimal stundensatzFuerZuschlaege = 0; + foreach (var vv in employee.VarFieldValueList) + { + if (vv.VarFieldDefOid == 4) + { + var varFieldValue = BS.Shared.Core.Utils.XMLDeserializeFromString(vv.SerializedValue, Type.GetType(vv.TypeName)); + if (varFieldValue != null) + { + Decimal.TryParse(varFieldValue.ToString(), out stundensatzFuerZuschlaege); + } + } + } + return stundensatzFuerZuschlaege; + } + + private bool LeseLmhdVarfield(Employee employee) + { + bool lmhd = false; + foreach (var vv in employee.VarFieldValueList) + { + if (vv.VarFieldDefOid == 1) + { + var varFieldValue = BS.Shared.Core.Utils.XMLDeserializeFromString(vv.SerializedValue, Type.GetType(vv.TypeName)); + if (varFieldValue != null) + { + Boolean.TryParse(varFieldValue.ToString(), out lmhd); + } + } + } + return lmhd; } } } diff --git a/ReportImp/Mittelpunkt/ZuschlaegeArbeit.designer.cs b/ReportImp/Mittelpunkt/ZuschlaegeArbeit.designer.cs index 2804f34c8..27533b550 100644 --- a/ReportImp/Mittelpunkt/ZuschlaegeArbeit.designer.cs +++ b/ReportImp/Mittelpunkt/ZuschlaegeArbeit.designer.cs @@ -38,14 +38,14 @@ namespace Mittelpunkt DevExpress.XtraReports.UI.XRSummary xrSummary6 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary7 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary8 = new DevExpress.XtraReports.UI.XRSummary(); - DevExpress.XtraReports.UI.XRSummary xrSummary15 = new DevExpress.XtraReports.UI.XRSummary(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ZuschlaegeArbeit)); DevExpress.XtraReports.UI.XRSummary xrSummary9 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary10 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary11 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary12 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary13 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary14 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary15 = new DevExpress.XtraReports.UI.XRSummary(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ZuschlaegeArbeit)); DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); @@ -63,6 +63,12 @@ namespace Mittelpunkt this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); @@ -76,6 +82,8 @@ namespace Mittelpunkt this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); @@ -90,8 +98,13 @@ namespace Mittelpunkt this.cellGesamtGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); this.cellRelationGesamt = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.lblMonat = new DevExpress.XtraReports.UI.XRLabel(); @@ -105,20 +118,7 @@ namespace Mittelpunkt this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); - this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -153,7 +153,7 @@ namespace Mittelpunkt this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRowDetail}); - this.xrTableDetail.SizeF = new System.Drawing.SizeF(1019F, 24F); + this.xrTableDetail.SizeF = new System.Drawing.SizeF(1025F, 24F); this.xrTableDetail.StylePriority.UseBorders = false; this.xrTableDetail.StylePriority.UseFont = false; this.xrTableDetail.StylePriority.UsePadding = false; @@ -299,6 +299,66 @@ namespace Mittelpunkt this.xrTableCell9.TextFormatString = "{0:#.##}"; this.xrTableCell9.Weight = 0.063899404803841833D; // + // xrTableCell15 + // + this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom10")}); + this.xrTableCell15.Multiline = true; + this.xrTableCell15.Name = "xrTableCell15"; + this.xrTableCell15.Text = "xrTableCell15"; + this.xrTableCell15.TextFormatString = "{0:#.##}"; + this.xrTableCell15.Weight = 0.046859222259037117D; + // + // xrTableCell19 + // + this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom11")}); + this.xrTableCell19.Multiline = true; + this.xrTableCell19.Name = "xrTableCell19"; + this.xrTableCell19.Text = "xrTableCell19"; + this.xrTableCell19.TextFormatString = "{0:#.##}"; + this.xrTableCell19.Weight = 0.055379080609896922D; + // + // xrTableCell20 + // + this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom12")}); + this.xrTableCell20.Multiline = true; + this.xrTableCell20.Name = "xrTableCell20"; + this.xrTableCell20.Text = "xrTableCell20"; + this.xrTableCell20.TextFormatString = "{0:#.##}"; + this.xrTableCell20.Weight = 0.051119151434467068D; + // + // xrTableCell22 + // + this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom13")}); + this.xrTableCell22.Multiline = true; + this.xrTableCell22.Name = "xrTableCell22"; + this.xrTableCell22.Text = "xrTableCell22"; + this.xrTableCell22.TextFormatString = "{0:#.##}"; + this.xrTableCell22.Weight = 0.046859222259037131D; + // + // xrTableCell24 + // + this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom14")}); + this.xrTableCell24.Multiline = true; + this.xrTableCell24.Name = "xrTableCell24"; + this.xrTableCell24.Text = "xrTableCell24"; + this.xrTableCell24.TextFormatString = "{0:#.##}"; + this.xrTableCell24.Weight = 0.055379080609896936D; + // + // xrTableCell26 + // + this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom15")}); + this.xrTableCell26.Multiline = true; + this.xrTableCell26.Name = "xrTableCell26"; + this.xrTableCell26.Text = "xrTableCell26"; + this.xrTableCell26.TextFormatString = "{0:#.##}"; + this.xrTableCell26.Weight = 0.05111915143446704D; + // // xrTableCell11 // this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -307,7 +367,7 @@ namespace Mittelpunkt this.xrTableCell11.Name = "xrTableCell11"; this.xrTableCell11.Text = "xrTableCell9"; this.xrTableCell11.TextFormatString = "{0:#.##}"; - this.xrTableCell11.Weight = 0.1405782005309249D; + this.xrTableCell11.Weight = 0.12353800715256005D; // // DetailReport // @@ -339,7 +399,7 @@ namespace Mittelpunkt this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRowHeader}); - this.xrTableHeader.SizeF = new System.Drawing.SizeF(1019F, 40.83335F); + this.xrTableHeader.SizeF = new System.Drawing.SizeF(1025F, 40.83335F); this.xrTableHeader.StylePriority.UseBorders = false; this.xrTableHeader.StylePriority.UseFont = false; this.xrTableHeader.StylePriority.UsePadding = false; @@ -438,6 +498,24 @@ namespace Mittelpunkt this.xrTableCell2.Text = "Nachtarbeit\r\nh / Betrag"; this.xrTableCell2.Weight = 0.10617882288581945D; // + // xrTableCell13 + // + this.xrTableCell13.BackColor = System.Drawing.SystemColors.Control; + this.xrTableCell13.Multiline = true; + this.xrTableCell13.Name = "xrTableCell13"; + this.xrTableCell13.StylePriority.UseBackColor = false; + this.xrTableCell13.Text = "Wechselschicht\r\nh / Betrag / mtl."; + this.xrTableCell13.Weight = 0.1274148756106164D; + // + // xrTableCell14 + // + this.xrTableCell14.BackColor = System.Drawing.SystemColors.Control; + this.xrTableCell14.Multiline = true; + this.xrTableCell14.Name = "xrTableCell14"; + this.xrTableCell14.StylePriority.UseBackColor = false; + this.xrTableCell14.Text = "Schichtzulage\r\nh / Betrag / mtl."; + this.xrTableCell14.Weight = 0.1274145875821239D; + // // xrTableCell18 // this.xrTableCell18.BackColor = System.Drawing.SystemColors.Control; @@ -445,7 +523,7 @@ namespace Mittelpunkt this.xrTableCell18.Name = "xrTableCell18"; this.xrTableCell18.StylePriority.UseBackColor = false; this.xrTableCell18.Text = "Summe Zulagen"; - this.xrTableCell18.Weight = 0.11679697450958408D; + this.xrTableCell18.Weight = 0.10263951001688859D; // // GroupFooter1 // @@ -465,7 +543,7 @@ namespace Mittelpunkt this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow1}); - this.xrTable1.SizeF = new System.Drawing.SizeF(1019F, 25F); + this.xrTable1.SizeF = new System.Drawing.SizeF(1025F, 25F); this.xrTable1.StylePriority.UseBorders = false; this.xrTable1.StylePriority.UseFont = false; this.xrTable1.StylePriority.UsePadding = false; @@ -643,6 +721,114 @@ namespace Mittelpunkt this.cellRelationGesamt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; this.cellRelationGesamt.Weight = 0.0672991019763754D; // + // xrTableCell28 + // + this.xrTableCell28.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Double; + this.xrTableCell28.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrTableCell28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom10")}); + this.xrTableCell28.Multiline = true; + this.xrTableCell28.Name = "xrTableCell28"; + this.xrTableCell28.StylePriority.UseBorderDashStyle = false; + this.xrTableCell28.StylePriority.UseBorders = false; + this.xrTableCell28.StylePriority.UseTextAlignment = false; + xrSummary9.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell28.Summary = xrSummary9; + this.xrTableCell28.Text = "xrTableCell28"; + this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + this.xrTableCell28.TextFormatString = "{0:0,#}"; + this.xrTableCell28.Weight = 0.049352633343331981D; + // + // xrTableCell34 + // + this.xrTableCell34.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Double; + this.xrTableCell34.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrTableCell34.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom11")}); + this.xrTableCell34.Multiline = true; + this.xrTableCell34.Name = "xrTableCell34"; + this.xrTableCell34.StylePriority.UseBorderDashStyle = false; + this.xrTableCell34.StylePriority.UseBorders = false; + this.xrTableCell34.StylePriority.UseTextAlignment = false; + xrSummary10.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell34.Summary = xrSummary10; + this.xrTableCell34.Text = "xrTableCell34"; + this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + this.xrTableCell34.TextFormatString = "{0:0.00}"; + this.xrTableCell34.Weight = 0.058325725034860741D; + // + // xrTableCell36 + // + this.xrTableCell36.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Double; + this.xrTableCell36.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrTableCell36.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom12")}); + this.xrTableCell36.Multiline = true; + this.xrTableCell36.Name = "xrTableCell36"; + this.xrTableCell36.StylePriority.UseBorderDashStyle = false; + this.xrTableCell36.StylePriority.UseBorders = false; + this.xrTableCell36.StylePriority.UseTextAlignment = false; + xrSummary11.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell36.Summary = xrSummary11; + this.xrTableCell36.Text = "xrTableCell36"; + this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + this.xrTableCell36.TextFormatString = "{0:0,#}"; + this.xrTableCell36.Weight = 0.053839130696598764D; + // + // xrTableCell38 + // + this.xrTableCell38.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Double; + this.xrTableCell38.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrTableCell38.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom13")}); + this.xrTableCell38.Multiline = true; + this.xrTableCell38.Name = "xrTableCell38"; + this.xrTableCell38.StylePriority.UseBorderDashStyle = false; + this.xrTableCell38.StylePriority.UseBorders = false; + this.xrTableCell38.StylePriority.UseTextAlignment = false; + xrSummary12.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell38.Summary = xrSummary12; + this.xrTableCell38.Text = "xrTableCell38"; + this.xrTableCell38.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + this.xrTableCell38.TextFormatString = "{0:0,#}"; + this.xrTableCell38.Weight = 0.049352536358336779D; + // + // xrTableCell40 + // + this.xrTableCell40.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Double; + this.xrTableCell40.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom14")}); + this.xrTableCell40.Multiline = true; + this.xrTableCell40.Name = "xrTableCell40"; + this.xrTableCell40.StylePriority.UseBorderDashStyle = false; + this.xrTableCell40.StylePriority.UseBorders = false; + this.xrTableCell40.StylePriority.UseTextAlignment = false; + xrSummary13.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell40.Summary = xrSummary13; + this.xrTableCell40.Text = "xrTableCell40"; + this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + this.xrTableCell40.TextFormatString = "{0:0.00}"; + this.xrTableCell40.Weight = 0.058325907594851678D; + // + // xrTableCell41 + // + this.xrTableCell41.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Double; + this.xrTableCell41.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrTableCell41.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom15")}); + this.xrTableCell41.Multiline = true; + this.xrTableCell41.Name = "xrTableCell41"; + this.xrTableCell41.StylePriority.UseBorderDashStyle = false; + this.xrTableCell41.StylePriority.UseBorders = false; + this.xrTableCell41.StylePriority.UseTextAlignment = false; + xrSummary14.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell41.Summary = xrSummary14; + this.xrTableCell41.Text = "xrTableCell41"; + this.xrTableCell41.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + this.xrTableCell41.TextFormatString = "{0:0,#}"; + this.xrTableCell41.Weight = 0.053838948136607785D; + // // xrTableCell47 // this.xrTableCell47.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Double; @@ -657,11 +843,7 @@ namespace Mittelpunkt this.xrTableCell47.Summary = xrSummary15; this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; this.xrTableCell47.TextFormatString = "{0:0.00}"; - this.xrTableCell47.Weight = 0.14805789856486412D; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); + this.xrTableCell47.Weight = 0.13011136717682381D; // // ReportHeader // @@ -674,7 +856,7 @@ namespace Mittelpunkt // xrPictureBox1 // this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource")); - this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(949.2086F, 0F); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(954.2086F, 0F); this.xrPictureBox1.Name = "xrPictureBox1"; this.xrPictureBox1.SizeF = new System.Drawing.SizeF(69.79144F, 95.52075F); this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; @@ -697,13 +879,13 @@ namespace Mittelpunkt this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrPageInfo2, this.xrPageInfo1}); - this.pageFooterBand1.HeightF = 48F; + this.pageFooterBand1.HeightF = 50.56193F; this.pageFooterBand1.Name = "pageFooterBand1"; // // xrPageInfo2 // this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F); - this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(879.0001F, 25F); + this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(884.0001F, 25F); this.xrPageInfo2.Name = "xrPageInfo2"; this.xrPageInfo2.SizeF = new System.Drawing.SizeF(139.9999F, 23F); this.xrPageInfo2.StyleName = "PageInfo"; @@ -778,185 +960,9 @@ namespace Mittelpunkt this.bottomMarginBand1.HeightF = 30F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // - // xrTableCell13 + // bindingSource1 // - this.xrTableCell13.BackColor = System.Drawing.SystemColors.Control; - this.xrTableCell13.Multiline = true; - this.xrTableCell13.Name = "xrTableCell13"; - this.xrTableCell13.StylePriority.UseBackColor = false; - this.xrTableCell13.Text = "Wechselschicht\r\nh / Betrag / mtl."; - this.xrTableCell13.Weight = 0.11679670523397168D; - // - // xrTableCell14 - // - this.xrTableCell14.BackColor = System.Drawing.SystemColors.Control; - this.xrTableCell14.Multiline = true; - this.xrTableCell14.Name = "xrTableCell14"; - this.xrTableCell14.StylePriority.UseBackColor = false; - this.xrTableCell14.Text = "Schichtzulage\r\nh / Betrag / mtl."; - this.xrTableCell14.Weight = 0.11679670523397166D; - // - // xrTableCell15 - // - this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom10")}); - this.xrTableCell15.Multiline = true; - this.xrTableCell15.Name = "xrTableCell15"; - this.xrTableCell15.Text = "xrTableCell15"; - this.xrTableCell15.Weight = 0.046859222259037117D; - // - // xrTableCell19 - // - this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom11")}); - this.xrTableCell19.Multiline = true; - this.xrTableCell19.Name = "xrTableCell19"; - this.xrTableCell19.Text = "xrTableCell19"; - this.xrTableCell19.Weight = 0.0468592222590371D; - // - // xrTableCell20 - // - this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom12")}); - this.xrTableCell20.Multiline = true; - this.xrTableCell20.Name = "xrTableCell20"; - this.xrTableCell20.Text = "xrTableCell20"; - this.xrTableCell20.Weight = 0.046858875585113369D; - // - // xrTableCell22 - // - this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom13")}); - this.xrTableCell22.Multiline = true; - this.xrTableCell22.Name = "xrTableCell22"; - this.xrTableCell22.Text = "xrTableCell22"; - this.xrTableCell22.Weight = 0.046859222259037131D; - // - // xrTableCell24 - // - this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom14")}); - this.xrTableCell24.Multiline = true; - this.xrTableCell24.Name = "xrTableCell24"; - this.xrTableCell24.Text = "xrTableCell24"; - this.xrTableCell24.Weight = 0.046859222259037117D; - // - // xrTableCell26 - // - this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom15")}); - this.xrTableCell26.Multiline = true; - this.xrTableCell26.Name = "xrTableCell26"; - this.xrTableCell26.Text = "xrTableCell26"; - this.xrTableCell26.Weight = 0.04685909225631571D; - // - // xrTableCell28 - // - this.xrTableCell28.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Double; - this.xrTableCell28.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrTableCell28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom10")}); - this.xrTableCell28.Multiline = true; - this.xrTableCell28.Name = "xrTableCell28"; - this.xrTableCell28.StylePriority.UseBorderDashStyle = false; - this.xrTableCell28.StylePriority.UseBorders = false; - this.xrTableCell28.StylePriority.UseTextAlignment = false; - xrSummary9.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell28.Summary = xrSummary9; - this.xrTableCell28.Text = "xrTableCell28"; - this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; - this.xrTableCell28.TextFormatString = "{0:0,#}"; - this.xrTableCell28.Weight = 0.049352633343331981D; - // - // xrTableCell34 - // - this.xrTableCell34.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Double; - this.xrTableCell34.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrTableCell34.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom11")}); - this.xrTableCell34.Multiline = true; - this.xrTableCell34.Name = "xrTableCell34"; - this.xrTableCell34.StylePriority.UseBorderDashStyle = false; - this.xrTableCell34.StylePriority.UseBorders = false; - this.xrTableCell34.StylePriority.UseTextAlignment = false; - xrSummary10.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell34.Summary = xrSummary10; - this.xrTableCell34.Text = "xrTableCell34"; - this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; - this.xrTableCell34.TextFormatString = "{0:0.00}"; - this.xrTableCell34.Weight = 0.0493525420633365D; - // - // xrTableCell36 - // - this.xrTableCell36.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Double; - this.xrTableCell36.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrTableCell36.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom12")}); - this.xrTableCell36.Multiline = true; - this.xrTableCell36.Name = "xrTableCell36"; - this.xrTableCell36.StylePriority.UseBorderDashStyle = false; - this.xrTableCell36.StylePriority.UseBorders = false; - this.xrTableCell36.StylePriority.UseTextAlignment = false; - xrSummary11.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell36.Summary = xrSummary11; - this.xrTableCell36.Text = "xrTableCell36"; - this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; - this.xrTableCell36.TextFormatString = "{0:0.00}"; - this.xrTableCell36.Weight = 0.049352268223350038D; - // - // xrTableCell38 - // - this.xrTableCell38.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Double; - this.xrTableCell38.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrTableCell38.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom13")}); - this.xrTableCell38.Multiline = true; - this.xrTableCell38.Name = "xrTableCell38"; - this.xrTableCell38.StylePriority.UseBorderDashStyle = false; - this.xrTableCell38.StylePriority.UseBorders = false; - this.xrTableCell38.StylePriority.UseTextAlignment = false; - xrSummary12.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell38.Summary = xrSummary12; - this.xrTableCell38.Text = "xrTableCell38"; - this.xrTableCell38.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; - this.xrTableCell38.TextFormatString = "{0:0,#}"; - this.xrTableCell38.Weight = 0.049352450783341009D; - // - // xrTableCell40 - // - this.xrTableCell40.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Double; - this.xrTableCell40.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom14")}); - this.xrTableCell40.Multiline = true; - this.xrTableCell40.Name = "xrTableCell40"; - this.xrTableCell40.StylePriority.UseBorderDashStyle = false; - this.xrTableCell40.StylePriority.UseBorders = false; - this.xrTableCell40.StylePriority.UseTextAlignment = false; - xrSummary13.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell40.Summary = xrSummary13; - this.xrTableCell40.Text = "xrTableCell40"; - this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; - this.xrTableCell40.TextFormatString = "{0:0.00}"; - this.xrTableCell40.Weight = 0.049352359503345489D; - // - // xrTableCell41 - // - this.xrTableCell41.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Double; - this.xrTableCell41.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrTableCell41.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom15")}); - this.xrTableCell41.Multiline = true; - this.xrTableCell41.Name = "xrTableCell41"; - this.xrTableCell41.StylePriority.UseBorderDashStyle = false; - this.xrTableCell41.StylePriority.UseBorders = false; - this.xrTableCell41.StylePriority.UseTextAlignment = false; - xrSummary14.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell41.Summary = xrSummary14; - this.xrTableCell41.Text = "xrTableCell41"; - this.xrTableCell41.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; - this.xrTableCell41.TextFormatString = "{0:0.00}"; - this.xrTableCell41.Weight = 0.049352907183318459D; + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); // // ZuschlaegeArbeit // @@ -971,7 +977,7 @@ namespace Mittelpunkt this.fieldFLS}); this.DataSource = this.bindingSource1; this.Landscape = true; - this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 50F, 30F); + this.Margins = new DevExpress.Drawing.DXMargins(75F, 69F, 50F, 30F); this.PageHeight = 827; this.PageWidth = 1169; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;