diff --git a/MultiTool.Common/Report/ReportGenerator.vb b/MultiTool.Common/Report/ReportGenerator.vb index d0d81ff..44f92d4 100644 --- a/MultiTool.Common/Report/ReportGenerator.vb +++ b/MultiTool.Common/Report/ReportGenerator.vb @@ -45,7 +45,7 @@ Public Class ReportGenerator(Of TReport As IReport) Dim oPositionMapper = oMapperConfig.GetMapper(Of ReportPosition)(New Dictionary(Of String, String) From { {"Artikelnummer", "Text1"}, - {"Lieferantenartikelnummer", "Text2"}, + {"Positionstext", "Text2"}, {"Bezeichnung", "Text3"}, {"Menge_bestellt", "Text4"}, {"Menge_geliefert", "Text5"}, diff --git a/MultiTool.Form/Reports/OrderReport.Designer.vb b/MultiTool.Form/Reports/OrderReport.Designer.vb index 223a971..cf0180d 100644 --- a/MultiTool.Form/Reports/OrderReport.Designer.vb +++ b/MultiTool.Form/Reports/OrderReport.Designer.vb @@ -87,9 +87,9 @@ Partial Public Class OrderReport Me.XrTableCell18 = New DevExpress.XtraReports.UI.XRTableCell() Me.tableCell46 = New DevExpress.XtraReports.UI.XRTableCell() Me.XrTableCell8 = New DevExpress.XtraReports.UI.XRTableCell() - Me.ObjectDataSource1 = New DevExpress.DataAccess.ObjectBinding.ObjectDataSource(Me.components) Me.GroupFooter1 = New DevExpress.XtraReports.UI.GroupFooterBand() Me.label2 = New DevExpress.XtraReports.UI.XRLabel() + Me.ObjectDataSource1 = New DevExpress.DataAccess.ObjectBinding.ObjectDataSource(Me.components) CType(Me.XrTable2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.XrTable1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.table3, System.ComponentModel.ISupportInitialize).BeginInit() @@ -488,7 +488,7 @@ Partial Public Class OrderReport Me.tableCell31.Multiline = True Me.tableCell31.Name = "tableCell31" Me.tableCell31.StyleName = "DetailCaption2" - Me.tableCell31.Text = "Artikelnummer" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Lieferant" + Me.tableCell31.Text = "Positionstext" Me.tableCell31.Weight = 0.13529574805877542R ' 'XrTableCell13 @@ -688,11 +688,6 @@ Partial Public Class OrderReport Me.XrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight Me.XrTableCell8.Weight = 0.089263976911086243R ' - 'ObjectDataSource1 - ' - Me.ObjectDataSource1.DataSource = GetType(MultiTool.Common.Report.ReportSource) - Me.ObjectDataSource1.Name = "ObjectDataSource1" - ' 'GroupFooter1 ' Me.GroupFooter1.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.label2}) @@ -711,6 +706,11 @@ Partial Public Class OrderReport Me.label2.StylePriority.UseBackColor = False Me.label2.StylePriority.UseBorders = False ' + 'ObjectDataSource1 + ' + Me.ObjectDataSource1.DataSource = GetType(MultiTool.Common.Report.ReportSource) + Me.ObjectDataSource1.Name = "ObjectDataSource1" + ' 'OrderReport ' Me.Bands.AddRange(New DevExpress.XtraReports.UI.Band() {Me.TopMargin, Me.BottomMargin, Me.ReportHeader, Me.Detail, Me.DetailReport})