diff --git a/SchaumKommiCollo/.vs/KommiCollo/v15/.suo b/SchaumKommiCollo/.vs/KommiCollo/v15/.suo index 61eacaa..39a3fa8 100644 Binary files a/SchaumKommiCollo/.vs/KommiCollo/v15/.suo and b/SchaumKommiCollo/.vs/KommiCollo/v15/.suo differ diff --git a/SchaumKommiCollo/KommiCollo/KommiCollo.vbproj b/SchaumKommiCollo/KommiCollo/KommiCollo.vbproj index 387dc2c..637a830 100644 --- a/SchaumKommiCollo/KommiCollo/KommiCollo.vbproj +++ b/SchaumKommiCollo/KommiCollo/KommiCollo.vbproj @@ -56,7 +56,6 @@ False - @@ -225,6 +224,12 @@ MyDataset.xsd + + reportPositionen.vb + + + Component + reportHinweis.vb @@ -270,6 +275,9 @@ My.Resources Designer + + reportPositionen.vb + reportHinweis.vb diff --git a/SchaumKommiCollo/KommiCollo/bin/Debug/KommiCollo.exe b/SchaumKommiCollo/KommiCollo/bin/Debug/KommiCollo.exe index 82b32f0..0d08940 100644 Binary files a/SchaumKommiCollo/KommiCollo/bin/Debug/KommiCollo.exe and b/SchaumKommiCollo/KommiCollo/bin/Debug/KommiCollo.exe differ diff --git a/SchaumKommiCollo/KommiCollo/bin/Debug/KommiCollo.pdb b/SchaumKommiCollo/KommiCollo/bin/Debug/KommiCollo.pdb index cf0a055..c507342 100644 Binary files a/SchaumKommiCollo/KommiCollo/bin/Debug/KommiCollo.pdb and b/SchaumKommiCollo/KommiCollo/bin/Debug/KommiCollo.pdb differ diff --git a/SchaumKommiCollo/KommiCollo/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/SchaumKommiCollo/KommiCollo/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index 7882d43..e260585 100644 Binary files a/SchaumKommiCollo/KommiCollo/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache and b/SchaumKommiCollo/KommiCollo/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/SchaumKommiCollo/KommiCollo/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SchaumKommiCollo/KommiCollo/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index ed5f82c..a5f98af 100644 Binary files a/SchaumKommiCollo/KommiCollo/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/SchaumKommiCollo/KommiCollo/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.exe b/SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.exe index 82b32f0..0d08940 100644 Binary files a/SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.exe and b/SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.exe differ diff --git a/SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.pdb b/SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.pdb index cf0a055..c507342 100644 Binary files a/SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.pdb and b/SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.pdb differ diff --git a/SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.reportUebergabe.resources b/SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.reportUebergabe.resources index b09886a..84a0061 100644 Binary files a/SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.reportUebergabe.resources and b/SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.reportUebergabe.resources differ diff --git a/SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.vbproj.FileListAbsolute.txt b/SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.vbproj.FileListAbsolute.txt index 48b8cfe..392787d 100644 --- a/SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.vbproj.FileListAbsolute.txt +++ b/SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.vbproj.FileListAbsolute.txt @@ -1350,3 +1350,4 @@ E:\JenneJ\Visual Studio\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\Ko E:\JenneJ\Visual Studio\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.vbproj.CopyComplete E:\JenneJ\Visual Studio\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.exe E:\JenneJ\Visual Studio\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.xml +E:\JenneJ\Visual Studio\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.reportPositionen.resources diff --git a/SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.vbproj.GenerateResource.Cache b/SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.vbproj.GenerateResource.Cache index d53ca91..d933f9a 100644 Binary files a/SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.vbproj.GenerateResource.Cache and b/SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.vbproj.GenerateResource.Cache differ diff --git a/SchaumKommiCollo/KommiCollo/obj/x86/Debug/kommicollo.exe.licenses b/SchaumKommiCollo/KommiCollo/obj/x86/Debug/kommicollo.exe.licenses index 0975243..12a1337 100644 Binary files a/SchaumKommiCollo/KommiCollo/obj/x86/Debug/kommicollo.exe.licenses and b/SchaumKommiCollo/KommiCollo/obj/x86/Debug/kommicollo.exe.licenses differ diff --git a/SchaumKommiCollo/KommiCollo/reportHinweis.Designer.vb b/SchaumKommiCollo/KommiCollo/reportHinweis.Designer.vb index 418e4ef..22e0462 100644 --- a/SchaumKommiCollo/KommiCollo/reportHinweis.Designer.vb +++ b/SchaumKommiCollo/KommiCollo/reportHinweis.Designer.vb @@ -39,7 +39,6 @@ Partial Public Class reportHinweis 'Detail ' Me.Detail.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.XrLabel6, Me.XrLabel7, Me.XrLabel8}) - Me.Detail.Dpi = 100.0! Me.Detail.HeightF = 18.0! Me.Detail.Name = "Detail" Me.Detail.Padding = New DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100.0!) @@ -48,7 +47,6 @@ Partial Public Class reportHinweis 'XrLabel6 ' Me.XrLabel6.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.HINW_CODE")}) - Me.XrLabel6.Dpi = 100.0! Me.XrLabel6.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.XrLabel6.LocationFloat = New DevExpress.Utils.PointFloat(0!, 0!) Me.XrLabel6.Name = "XrLabel6" @@ -62,7 +60,6 @@ Partial Public Class reportHinweis 'XrLabel7 ' Me.XrLabel7.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.HINW_TEXT")}) - Me.XrLabel7.Dpi = 100.0! Me.XrLabel7.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.XrLabel7.LocationFloat = New DevExpress.Utils.PointFloat(89.79168!, 0!) Me.XrLabel7.Name = "XrLabel7" @@ -76,7 +73,6 @@ Partial Public Class reportHinweis 'XrLabel8 ' Me.XrLabel8.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.HINW_TEXT_ERG")}) - Me.XrLabel8.Dpi = 100.0! Me.XrLabel8.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.XrLabel8.LocationFloat = New DevExpress.Utils.PointFloat(526.25!, 0!) Me.XrLabel8.Name = "XrLabel8" @@ -89,7 +85,6 @@ Partial Public Class reportHinweis ' 'TopMargin ' - Me.TopMargin.Dpi = 100.0! Me.TopMargin.HeightF = 0! Me.TopMargin.Name = "TopMargin" Me.TopMargin.Padding = New DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100.0!) @@ -97,7 +92,6 @@ Partial Public Class reportHinweis ' 'BottomMargin ' - Me.BottomMargin.Dpi = 100.0! Me.BottomMargin.HeightF = 0! Me.BottomMargin.Name = "BottomMargin" Me.BottomMargin.Padding = New DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100.0!) @@ -173,7 +167,7 @@ Partial Public Class reportHinweis Me.Parameters.AddRange(New DevExpress.XtraReports.Parameters.Parameter() {Me.SendungNr}) Me.ScriptLanguage = DevExpress.XtraReports.ScriptLanguage.VisualBasic Me.StyleSheet.AddRange(New DevExpress.XtraReports.UI.XRControlStyle() {Me.Title, Me.FieldCaption, Me.PageInfo, Me.DataField}) - Me.Version = "15.2" + Me.Version = "18.1" CType(Me, System.ComponentModel.ISupportInitialize).EndInit() End Sub diff --git a/SchaumKommiCollo/KommiCollo/reportPositionen.Designer.vb b/SchaumKommiCollo/KommiCollo/reportPositionen.Designer.vb new file mode 100644 index 0000000..d0371a2 --- /dev/null +++ b/SchaumKommiCollo/KommiCollo/reportPositionen.Designer.vb @@ -0,0 +1,190 @@ + _ +Partial Public Class reportPositionen + Inherits DevExpress.XtraReports.UI.XtraReport + + 'XtraReport overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + MyBase.Dispose(disposing) + End Sub + + 'Required by the Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Designer + 'It can be modified using the Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() + Dim CustomSqlQuery1 As DevExpress.DataAccess.Sql.CustomSqlQuery = New DevExpress.DataAccess.Sql.CustomSqlQuery() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(reportPositionen)) + Dim DynamicListLookUpSettings1 As DevExpress.XtraReports.Parameters.DynamicListLookUpSettings = New DevExpress.XtraReports.Parameters.DynamicListLookUpSettings() + Me.Detail = New DevExpress.XtraReports.UI.DetailBand() + Me.XrLabel2 = New DevExpress.XtraReports.UI.XRLabel() + Me.XrLabel1 = New DevExpress.XtraReports.UI.XRLabel() + Me.TopMargin = New DevExpress.XtraReports.UI.TopMarginBand() + Me.BottomMargin = New DevExpress.XtraReports.UI.BottomMarginBand() + Me.SqlDataSource1 = New DevExpress.DataAccess.Sql.SqlDataSource(Me.components) + Me.Title = New DevExpress.XtraReports.UI.XRControlStyle() + Me.DetailCaption3 = New DevExpress.XtraReports.UI.XRControlStyle() + Me.DetailData3 = New DevExpress.XtraReports.UI.XRControlStyle() + Me.DetailData3_Odd = New DevExpress.XtraReports.UI.XRControlStyle() + Me.DetailCaptionBackground3 = New DevExpress.XtraReports.UI.XRControlStyle() + Me.PageInfo = New DevExpress.XtraReports.UI.XRControlStyle() + Me.SendungNr = New DevExpress.XtraReports.Parameters.Parameter() + CType(Me, System.ComponentModel.ISupportInitialize).BeginInit() + ' + 'Detail + ' + Me.Detail.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.XrLabel2, Me.XrLabel1}) + Me.Detail.HeightF = 24.04! + Me.Detail.Name = "Detail" + Me.Detail.Padding = New DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100.0!) + Me.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft + ' + 'XrLabel2 + ' + Me.XrLabel2.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.POSINHALT")}) + Me.XrLabel2.Font = New System.Drawing.Font("Arial", 8.0!) + Me.XrLabel2.LocationFloat = New DevExpress.Utils.PointFloat(0!, 0!) + Me.XrLabel2.Multiline = True + Me.XrLabel2.Name = "XrLabel2" + Me.XrLabel2.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) + Me.XrLabel2.SizeF = New System.Drawing.SizeF(148.96!, 11.54!) + Me.XrLabel2.StylePriority.UseFont = False + ' + 'XrLabel1 + ' + Me.XrLabel1.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.NVE")}) + Me.XrLabel1.Font = New System.Drawing.Font("Arial", 8.0!) + Me.XrLabel1.LocationFloat = New DevExpress.Utils.PointFloat(0!, 12.5!) + Me.XrLabel1.Multiline = True + Me.XrLabel1.Name = "XrLabel1" + Me.XrLabel1.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) + Me.XrLabel1.SizeF = New System.Drawing.SizeF(148.96!, 11.54!) + Me.XrLabel1.StylePriority.UseFont = False + ' + 'TopMargin + ' + Me.TopMargin.HeightF = 0! + Me.TopMargin.Name = "TopMargin" + Me.TopMargin.Padding = New DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100.0!) + Me.TopMargin.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft + ' + 'BottomMargin + ' + Me.BottomMargin.HeightF = 0! + Me.BottomMargin.Name = "BottomMargin" + Me.BottomMargin.Padding = New DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100.0!) + Me.BottomMargin.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft + ' + 'SqlDataSource1 + ' + Me.SqlDataSource1.ConnectionName = "REPORT_Connection" + Me.SqlDataSource1.Name = "SqlDataSource1" + CustomSqlQuery1.Name = "Query" + CustomSqlQuery1.Sql = "SELECT DISTINCT GUID, NVE, POSINHALT FROM VWHUP_REPORT1" + Me.SqlDataSource1.Queries.AddRange(New DevExpress.DataAccess.Sql.SqlQuery() {CustomSqlQuery1}) + Me.SqlDataSource1.ResultSchemaSerializable = resources.GetString("SqlDataSource1.ResultSchemaSerializable") + ' + 'Title + ' + Me.Title.BackColor = System.Drawing.Color.Transparent + Me.Title.BorderColor = System.Drawing.Color.Black + Me.Title.Borders = DevExpress.XtraPrinting.BorderSide.None + Me.Title.BorderWidth = 1.0! + Me.Title.Font = New System.Drawing.Font("Tahoma", 14.0!) + Me.Title.ForeColor = System.Drawing.Color.FromArgb(CType(CType(75, Byte), Integer), CType(CType(75, Byte), Integer), CType(CType(75, Byte), Integer)) + Me.Title.Name = "Title" + ' + 'DetailCaption3 + ' + Me.DetailCaption3.BackColor = System.Drawing.Color.Transparent + Me.DetailCaption3.BorderColor = System.Drawing.Color.Transparent + Me.DetailCaption3.Borders = DevExpress.XtraPrinting.BorderSide.None + Me.DetailCaption3.Font = New System.Drawing.Font("Tahoma", 8.0!, System.Drawing.FontStyle.Bold) + Me.DetailCaption3.ForeColor = System.Drawing.Color.FromArgb(CType(CType(75, Byte), Integer), CType(CType(75, Byte), Integer), CType(CType(75, Byte), Integer)) + Me.DetailCaption3.Name = "DetailCaption3" + Me.DetailCaption3.Padding = New DevExpress.XtraPrinting.PaddingInfo(6, 6, 0, 0, 100.0!) + Me.DetailCaption3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft + ' + 'DetailData3 + ' + Me.DetailData3.Font = New System.Drawing.Font("Tahoma", 8.0!) + Me.DetailData3.ForeColor = System.Drawing.Color.Black + Me.DetailData3.Name = "DetailData3" + Me.DetailData3.Padding = New DevExpress.XtraPrinting.PaddingInfo(6, 6, 0, 0, 100.0!) + Me.DetailData3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft + ' + 'DetailData3_Odd + ' + Me.DetailData3_Odd.BackColor = System.Drawing.Color.FromArgb(CType(CType(231, Byte), Integer), CType(CType(231, Byte), Integer), CType(CType(231, Byte), Integer)) + Me.DetailData3_Odd.BorderColor = System.Drawing.Color.Transparent + Me.DetailData3_Odd.Borders = DevExpress.XtraPrinting.BorderSide.None + Me.DetailData3_Odd.BorderWidth = 1.0! + Me.DetailData3_Odd.Font = New System.Drawing.Font("Tahoma", 8.0!) + Me.DetailData3_Odd.ForeColor = System.Drawing.Color.Black + Me.DetailData3_Odd.Name = "DetailData3_Odd" + Me.DetailData3_Odd.Padding = New DevExpress.XtraPrinting.PaddingInfo(6, 6, 0, 0, 100.0!) + Me.DetailData3_Odd.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft + ' + 'DetailCaptionBackground3 + ' + Me.DetailCaptionBackground3.BackColor = System.Drawing.Color.Transparent + Me.DetailCaptionBackground3.BorderColor = System.Drawing.Color.FromArgb(CType(CType(206, Byte), Integer), CType(CType(206, Byte), Integer), CType(CType(206, Byte), Integer)) + Me.DetailCaptionBackground3.Borders = DevExpress.XtraPrinting.BorderSide.Top + Me.DetailCaptionBackground3.BorderWidth = 2.0! + Me.DetailCaptionBackground3.Name = "DetailCaptionBackground3" + ' + 'PageInfo + ' + Me.PageInfo.Font = New System.Drawing.Font("Tahoma", 8.0!, System.Drawing.FontStyle.Bold) + Me.PageInfo.ForeColor = System.Drawing.Color.FromArgb(CType(CType(75, Byte), Integer), CType(CType(75, Byte), Integer), CType(CType(75, Byte), Integer)) + Me.PageInfo.Name = "PageInfo" + Me.PageInfo.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) + ' + 'SendungNr + ' + Me.SendungNr.Description = "Parameter1" + DynamicListLookUpSettings1.DataAdapter = Nothing + DynamicListLookUpSettings1.DataMember = "Query" + DynamicListLookUpSettings1.DataSource = Me.SqlDataSource1 + DynamicListLookUpSettings1.DisplayMember = "GUID" + DynamicListLookUpSettings1.ValueMember = "GUID" + Me.SendungNr.LookUpSettings = DynamicListLookUpSettings1 + Me.SendungNr.Name = "SendungNr" + Me.SendungNr.Type = GetType(Integer) + Me.SendungNr.ValueInfo = "0" + ' + 'reportPositionen + ' + Me.Bands.AddRange(New DevExpress.XtraReports.UI.Band() {Me.Detail, Me.TopMargin, Me.BottomMargin}) + Me.ComponentStorage.AddRange(New System.ComponentModel.IComponent() {Me.SqlDataSource1}) + Me.DataMember = "Query" + Me.DataSource = Me.SqlDataSource1 + Me.FilterString = "[GUID] = ?SendungNr" + Me.Margins = New System.Drawing.Printing.Margins(100, 100, 0, 0) + Me.Parameters.AddRange(New DevExpress.XtraReports.Parameters.Parameter() {Me.SendungNr}) + Me.StyleSheet.AddRange(New DevExpress.XtraReports.UI.XRControlStyle() {Me.Title, Me.DetailCaption3, Me.DetailData3, Me.DetailData3_Odd, Me.DetailCaptionBackground3, Me.PageInfo}) + Me.Version = "18.1" + CType(Me, System.ComponentModel.ISupportInitialize).EndInit() + + End Sub + Friend WithEvents Detail As DevExpress.XtraReports.UI.DetailBand + Friend WithEvents TopMargin As DevExpress.XtraReports.UI.TopMarginBand + Friend WithEvents BottomMargin As DevExpress.XtraReports.UI.BottomMarginBand + Friend WithEvents SqlDataSource1 As DevExpress.DataAccess.Sql.SqlDataSource + Friend WithEvents Title As DevExpress.XtraReports.UI.XRControlStyle + Friend WithEvents DetailCaption3 As DevExpress.XtraReports.UI.XRControlStyle + Friend WithEvents DetailData3 As DevExpress.XtraReports.UI.XRControlStyle + Friend WithEvents DetailData3_Odd As DevExpress.XtraReports.UI.XRControlStyle + Friend WithEvents DetailCaptionBackground3 As DevExpress.XtraReports.UI.XRControlStyle + Friend WithEvents PageInfo As DevExpress.XtraReports.UI.XRControlStyle + Friend WithEvents XrLabel1 As DevExpress.XtraReports.UI.XRLabel + Friend WithEvents XrLabel2 As DevExpress.XtraReports.UI.XRLabel + Friend WithEvents SendungNr As DevExpress.XtraReports.Parameters.Parameter +End Class diff --git a/SchaumKommiCollo/KommiCollo/reportPositionen.resx b/SchaumKommiCollo/KommiCollo/reportPositionen.resx new file mode 100644 index 0000000..af6dcda --- /dev/null +++ b/SchaumKommiCollo/KommiCollo/reportPositionen.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + PERhdGFTZXQgTmFtZT0iU3FsRGF0YVNvdXJjZTEiPjxWaWV3IE5hbWU9IlF1ZXJ5Ij48RmllbGQgTmFtZT0iR1VJRCIgVHlwZT0iSW50MzIiIC8+PEZpZWxkIE5hbWU9Ik5WRSIgVHlwZT0iU3RyaW5nIiAvPjxGaWVsZCBOYW1lPSJQT1NJTkhBTFQiIFR5cGU9IlN0cmluZyIgLz48L1ZpZXc+PC9EYXRhU2V0Pg== + + \ No newline at end of file diff --git a/SchaumKommiCollo/KommiCollo/reportPositionen.vb b/SchaumKommiCollo/KommiCollo/reportPositionen.vb new file mode 100644 index 0000000..e1fd236 --- /dev/null +++ b/SchaumKommiCollo/KommiCollo/reportPositionen.vb @@ -0,0 +1,3 @@ +Public Class reportPositionen + +End Class \ No newline at end of file diff --git a/SchaumKommiCollo/KommiCollo/reportUebergabe.designer.vb b/SchaumKommiCollo/KommiCollo/reportUebergabe.designer.vb index 4241b94..7863f03 100644 --- a/SchaumKommiCollo/KommiCollo/reportUebergabe.designer.vb +++ b/SchaumKommiCollo/KommiCollo/reportUebergabe.designer.vb @@ -23,6 +23,7 @@ Partial Public Class reportUebergabe Dim CustomSqlQuery1 As DevExpress.DataAccess.Sql.CustomSqlQuery = New DevExpress.DataAccess.Sql.CustomSqlQuery() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(reportUebergabe)) Dim CustomSqlQuery2 As DevExpress.DataAccess.Sql.CustomSqlQuery = New DevExpress.DataAccess.Sql.CustomSqlQuery() + Dim CustomSqlQuery3 As DevExpress.DataAccess.Sql.CustomSqlQuery = New DevExpress.DataAccess.Sql.CustomSqlQuery() Dim MasterDetailInfo1 As DevExpress.DataAccess.Sql.MasterDetailInfo = New DevExpress.DataAccess.Sql.MasterDetailInfo() Dim RelationColumnInfo1 As DevExpress.DataAccess.Sql.RelationColumnInfo = New DevExpress.DataAccess.Sql.RelationColumnInfo() Dim XrSummary1 As DevExpress.XtraReports.UI.XRSummary = New DevExpress.XtraReports.UI.XRSummary() @@ -91,7 +92,6 @@ Partial Public Class reportUebergabe Me.XrLine5 = New DevExpress.XtraReports.UI.XRLine() Me.XrLine1 = New DevExpress.XtraReports.UI.XRLine() Me.GroupFooter2 = New DevExpress.XtraReports.UI.GroupFooterBand() - Me.XrSubreport1 = New DevExpress.XtraReports.UI.XRSubreport() Me.XrLabel46 = New DevExpress.XtraReports.UI.XRLabel() Me.XrLabel58 = New DevExpress.XtraReports.UI.XRLabel() Me.GroupHeader3 = New DevExpress.XtraReports.UI.GroupHeaderBand() @@ -109,12 +109,15 @@ Partial Public Class reportUebergabe Me.GroupHeader2 = New DevExpress.XtraReports.UI.GroupHeaderBand() Me.GroupHeader4 = New DevExpress.XtraReports.UI.GroupHeaderBand() Me.XrLabel1 = New DevExpress.XtraReports.UI.XRLabel() + Me.XrLabel2 = New DevExpress.XtraReports.UI.XRLabel() + Me.XrSubreport1 = New DevExpress.XtraReports.UI.XRSubreport() + Me.FormattingRule1 = New DevExpress.XtraReports.UI.FormattingRule() CType(Me, System.ComponentModel.ISupportInitialize).BeginInit() ' 'Detail ' Me.Detail.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.XrLabel49, Me.XrLabel51}) - Me.Detail.HeightF = 24.12504! + Me.Detail.HeightF = 24.12505! Me.Detail.KeepTogether = True Me.Detail.KeepTogetherWithDetailReports = True Me.Detail.MultiColumn.Mode = DevExpress.XtraReports.UI.MultiColumnMode.UseColumnCount @@ -134,6 +137,7 @@ Partial Public Class reportUebergabe Me.XrLabel49.ProcessDuplicatesTarget = DevExpress.XtraReports.UI.ProcessDuplicatesTarget.Tag Me.XrLabel49.SizeF = New System.Drawing.SizeF(148.9583!, 12.58333!) Me.XrLabel49.StylePriority.UseFont = False + Me.XrLabel49.Visible = False ' 'XrLabel51 ' @@ -146,6 +150,7 @@ Partial Public Class reportUebergabe Me.XrLabel51.ProcessDuplicatesTarget = DevExpress.XtraReports.UI.ProcessDuplicatesTarget.Tag Me.XrLabel51.SizeF = New System.Drawing.SizeF(148.9583!, 11.54167!) Me.XrLabel51.StylePriority.UseFont = False + Me.XrLabel51.Visible = False ' 'TopMargin ' @@ -217,7 +222,9 @@ Partial Public Class reportUebergabe CustomSqlQuery1.Sql = resources.GetString("CustomSqlQuery1.Sql") CustomSqlQuery2.Name = "Query_Hinweistext" CustomSqlQuery2.Sql = resources.GetString("CustomSqlQuery2.Sql") - Me.SqlDataSource1.Queries.AddRange(New DevExpress.DataAccess.Sql.SqlQuery() {CustomSqlQuery1, CustomSqlQuery2}) + CustomSqlQuery3.Name = "Query_Positionen" + CustomSqlQuery3.Sql = "SELECT NVE, POSINHALT, SENDUNGNR FROM VWHUP_REPORT1" + Me.SqlDataSource1.Queries.AddRange(New DevExpress.DataAccess.Sql.SqlQuery() {CustomSqlQuery1, CustomSqlQuery2, CustomSqlQuery3}) MasterDetailInfo1.DetailQueryName = "Query_Hinweistext" RelationColumnInfo1.NestedKeyColumn = "SENDUNGNR" RelationColumnInfo1.ParentKeyColumn = "GUID" @@ -785,14 +792,6 @@ Partial Public Class reportUebergabe Me.GroupFooter2.Level = 2 Me.GroupFooter2.Name = "GroupFooter2" ' - 'XrSubreport1 - ' - Me.XrSubreport1.LocationFloat = New DevExpress.Utils.PointFloat(0!, 0!) - Me.XrSubreport1.Name = "XrSubreport1" - Me.XrSubreport1.ParameterBindings.Add(New DevExpress.XtraReports.UI.ParameterBinding("SendungNr", Nothing, "Query.GUID")) - Me.XrSubreport1.ReportSource = New KommiCollo.reportHinweis() - Me.XrSubreport1.SizeF = New System.Drawing.SizeF(650.0!, 32.99999!) - ' 'XrLabel46 ' Me.XrLabel46.Font = New System.Drawing.Font("Arial", 8.25!) @@ -923,24 +922,24 @@ Partial Public Class reportUebergabe ' Me.XrLabel54.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.EMP_STRASSE"), New DevExpress.XtraReports.UI.XRBinding("Tag", Nothing, "Query.GUID")}) Me.XrLabel54.Font = New System.Drawing.Font("Arial", 8.25!) - Me.XrLabel54.LocationFloat = New DevExpress.Utils.PointFloat(0!, 36.54162!) + Me.XrLabel54.LocationFloat = New DevExpress.Utils.PointFloat(0!, 36.54161!) Me.XrLabel54.Name = "XrLabel54" Me.XrLabel54.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) Me.XrLabel54.ProcessDuplicatesMode = DevExpress.XtraReports.UI.ProcessDuplicatesMode.SuppressAndShrink Me.XrLabel54.ProcessDuplicatesTarget = DevExpress.XtraReports.UI.ProcessDuplicatesTarget.Tag - Me.XrLabel54.SizeF = New System.Drawing.SizeF(156.9534!, 10.58332!) + Me.XrLabel54.SizeF = New System.Drawing.SizeF(169.2364!, 10.58332!) Me.XrLabel54.StylePriority.UseFont = False ' 'XrLabel45 ' Me.XrLabel45.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.EMP_PLZ_STR"), New DevExpress.XtraReports.UI.XRBinding("Tag", Nothing, "Query.GUID")}) Me.XrLabel45.Font = New System.Drawing.Font("Arial", 8.25!) - Me.XrLabel45.LocationFloat = New DevExpress.Utils.PointFloat(0!, 47.12494!) + Me.XrLabel45.LocationFloat = New DevExpress.Utils.PointFloat(21.33848!, 48.12492!) Me.XrLabel45.Name = "XrLabel45" Me.XrLabel45.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) Me.XrLabel45.ProcessDuplicatesMode = DevExpress.XtraReports.UI.ProcessDuplicatesMode.SuppressAndShrink Me.XrLabel45.ProcessDuplicatesTarget = DevExpress.XtraReports.UI.ProcessDuplicatesTarget.Tag - Me.XrLabel45.SizeF = New System.Drawing.SizeF(156.9534!, 11.54167!) + Me.XrLabel45.SizeF = New System.Drawing.SizeF(147.8979!, 11.54168!) Me.XrLabel45.StylePriority.UseFont = False ' 'XrLabel55 @@ -952,7 +951,7 @@ Partial Public Class reportUebergabe Me.XrLabel55.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) Me.XrLabel55.ProcessDuplicatesMode = DevExpress.XtraReports.UI.ProcessDuplicatesMode.SuppressAndShrink Me.XrLabel55.ProcessDuplicatesTarget = DevExpress.XtraReports.UI.ProcessDuplicatesTarget.Tag - Me.XrLabel55.SizeF = New System.Drawing.SizeF(154.9481!, 10.49999!) + Me.XrLabel55.SizeF = New System.Drawing.SizeF(169.2364!, 10.49999!) Me.XrLabel55.StylePriority.UseFont = False ' 'GroupHeader1 @@ -971,9 +970,9 @@ Partial Public Class reportUebergabe ' 'GroupHeader4 ' - Me.GroupHeader4.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.XrLabel1, Me.XrLabel55, Me.labelPalettenanzahl, Me.labelColliCode, Me.XrLabel35, Me.XrLabel34, Me.labelGewicht, Me.labelEmpfaenger, Me.XrLabel54, Me.XrLabel45, Me.labelSendungNr}) + Me.GroupHeader4.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.XrLabel2, Me.XrLabel1, Me.XrLabel55, Me.labelPalettenanzahl, Me.labelColliCode, Me.XrLabel35, Me.XrLabel34, Me.labelGewicht, Me.labelEmpfaenger, Me.XrLabel54, Me.XrLabel45, Me.labelSendungNr}) Me.GroupHeader4.GroupFields.AddRange(New DevExpress.XtraReports.UI.GroupField() {New DevExpress.XtraReports.UI.GroupField("NVE", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)}) - Me.GroupHeader4.HeightF = 58.66661! + Me.GroupHeader4.HeightF = 59.6666! Me.GroupHeader4.Name = "GroupHeader4" ' 'XrLabel1 @@ -985,15 +984,41 @@ Partial Public Class reportUebergabe Me.XrLabel1.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) Me.XrLabel1.ProcessDuplicatesMode = DevExpress.XtraReports.UI.ProcessDuplicatesMode.SuppressAndShrink Me.XrLabel1.ProcessDuplicatesTarget = DevExpress.XtraReports.UI.ProcessDuplicatesTarget.Tag - Me.XrLabel1.SizeF = New System.Drawing.SizeF(154.9481!, 10.49999!) + Me.XrLabel1.SizeF = New System.Drawing.SizeF(156.9478!, 10.49999!) Me.XrLabel1.StylePriority.UseFont = False ' + 'XrLabel2 + ' + Me.XrLabel2.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.EMP_LKZ"), New DevExpress.XtraReports.UI.XRBinding("Tag", Nothing, "Query.GUID")}) + Me.XrLabel2.Font = New System.Drawing.Font("Arial", 8.25!) + Me.XrLabel2.LocationFloat = New DevExpress.Utils.PointFloat(0!, 48.11999!) + Me.XrLabel2.Name = "XrLabel2" + Me.XrLabel2.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) + Me.XrLabel2.ProcessDuplicatesMode = DevExpress.XtraReports.UI.ProcessDuplicatesMode.SuppressAndShrink + Me.XrLabel2.ProcessDuplicatesTarget = DevExpress.XtraReports.UI.ProcessDuplicatesTarget.Tag + Me.XrLabel2.SizeF = New System.Drawing.SizeF(21.33847!, 11.54167!) + Me.XrLabel2.StylePriority.UseFont = False + ' + 'XrSubreport1 + ' + Me.XrSubreport1.LocationFloat = New DevExpress.Utils.PointFloat(0!, 0!) + Me.XrSubreport1.Name = "XrSubreport1" + Me.XrSubreport1.ParameterBindings.Add(New DevExpress.XtraReports.UI.ParameterBinding("SendungNr", Nothing, "Query.GUID")) + Me.XrSubreport1.ReportSource = New KommiCollo.reportHinweis() + Me.XrSubreport1.SizeF = New System.Drawing.SizeF(650.0!, 32.99999!) + ' + 'FormattingRule1 + ' + Me.FormattingRule1.DataMember = "Query" + Me.FormattingRule1.Name = "FormattingRule1" + ' 'reportUebergabe ' Me.Bands.AddRange(New DevExpress.XtraReports.UI.Band() {Me.Detail, Me.TopMargin, Me.BottomMargin, Me.PageHeaderBand1, Me.ReportHeaderBand1, Me.ReportFooter, Me.GroupFooter2, Me.GroupHeader3, Me.GroupHeader1, Me.GroupHeader2, Me.GroupHeader4}) Me.ComponentStorage.AddRange(New System.ComponentModel.IComponent() {Me.SqlDataSource1}) Me.DataMember = "Query" Me.DataSource = Me.SqlDataSource1 + Me.FormattingRuleSheet.AddRange(New DevExpress.XtraReports.UI.FormattingRule() {Me.FormattingRule1}) Me.Margins = New System.Drawing.Printing.Margins(100, 100, 41, 54) Me.ScriptLanguage = DevExpress.XtraReports.ScriptLanguage.VisualBasic Me.StyleSheet.AddRange(New DevExpress.XtraReports.UI.XRControlStyle() {Me.Title, Me.FieldCaption, Me.PageInfo, Me.DataField}) @@ -1081,4 +1106,6 @@ Partial Public Class reportUebergabe Friend WithEvents GroupHeader2 As DevExpress.XtraReports.UI.GroupHeaderBand Friend WithEvents GroupHeader4 As DevExpress.XtraReports.UI.GroupHeaderBand Friend WithEvents XrLabel1 As DevExpress.XtraReports.UI.XRLabel + Friend WithEvents XrLabel2 As DevExpress.XtraReports.UI.XRLabel + Friend WithEvents FormattingRule1 As DevExpress.XtraReports.UI.FormattingRule End Class diff --git a/SchaumKommiCollo/KommiCollo/reportUebergabe.resx b/SchaumKommiCollo/KommiCollo/reportUebergabe.resx index d6405c0..4e26979 100644 --- a/SchaumKommiCollo/KommiCollo/reportUebergabe.resx +++ b/SchaumKommiCollo/KommiCollo/reportUebergabe.resx @@ -159,6 +159,6 @@ INNER JOIN VWHUP_REPORT1 T1 ON T.SENDUNGNR = T1.GUID - PERhdGFTZXQgTmFtZT0iU3FsRGF0YVNvdXJjZTEiPjxWaWV3IE5hbWU9IlF1ZXJ5Ij48RmllbGQgTmFtZT0iR1VJRCIgVHlwZT0iSW50MzIiIC8+PEZpZWxkIE5hbWU9IkxBRDEiIFR5cGU9IlN0cmluZyIgLz48RmllbGQgTmFtZT0iTEFEX1NUUkFTU0UiIFR5cGU9IlN0cmluZyIgLz48RmllbGQgTmFtZT0iTEFEX0xLWl9QTFpfT1JUIiBUeXBlPSJTdHJpbmciIC8+PEZpZWxkIE5hbWU9IkZFUlRJRyIgVHlwZT0iQm9vbGVhbiIgLz48RmllbGQgTmFtZT0iU0VORFVOR05SIiBUeXBlPSJTdHJpbmciIC8+PEZpZWxkIE5hbWU9IlNER19SRUZFUkVOWiIgVHlwZT0iU3RyaW5nIiAvPjxGaWVsZCBOYW1lPSJFTVAiIFR5cGU9IlN0cmluZyIgLz48RmllbGQgTmFtZT0iRU1QX1pVU0FUWiIgVHlwZT0iU3RyaW5nIiAvPjxGaWVsZCBOYW1lPSJFTVBfWlVTQVRaMiIgVHlwZT0iU3RyaW5nIiAvPjxGaWVsZCBOYW1lPSJFTVBfU1RSQVNTRSIgVHlwZT0iU3RyaW5nIiAvPjxGaWVsZCBOYW1lPSJFTVBfUExaX1NUUiIgVHlwZT0iU3RyaW5nIiAvPjxGaWVsZCBOYW1lPSJFTVBfTEtaIiBUeXBlPSJTdHJpbmciIC8+PEZpZWxkIE5hbWU9IkVNUF9PUlQiIFR5cGU9IlN0cmluZyIgLz48RmllbGQgTmFtZT0iRU1QX09URUlMIiBUeXBlPSJTdHJpbmciIC8+PEZpZWxkIE5hbWU9IkFCSE9MREFUVU0iIFR5cGU9IkRhdGVUaW1lIiAvPjxGaWVsZCBOYW1lPSJTREdfR0VXSUNIVCIgVHlwZT0iRG91YmxlIiAvPjxGaWVsZCBOYW1lPSJTREdfU1RFTExQTEFFVFpFIiBUeXBlPSJJbnQxNiIgLz48RmllbGQgTmFtZT0iU0RHX0ZSQU5LQVRVUiIgVHlwZT0iU3RyaW5nIiAvPjxGaWVsZCBOYW1lPSJOVkUiIFR5cGU9IlN0cmluZyIgLz48RmllbGQgTmFtZT0iUE9TSU5IQUxUIiBUeXBlPSJTdHJpbmciIC8+PEZpZWxkIE5hbWU9IlBPU19HRVdJQ0hUIiBUeXBlPSJEb3VibGUiIC8+PEZpZWxkIE5hbWU9IlBBQ0tTVFVFQ0tBTlpBSEwiIFR5cGU9IkJ5dGUiIC8+PEZpZWxkIE5hbWU9IlBBTEVUVEVOQU5aQUhMIiBUeXBlPSJJbnQzMiIgLz48RmllbGQgTmFtZT0iQ09ERSIgVHlwZT0iU3RyaW5nIiAvPjxGaWVsZCBOYW1lPSJCRU1FUktVTkciIFR5cGU9IlN0cmluZyIgLz48RmllbGQgTmFtZT0iSElOV19DT0RFIiBUeXBlPSJTdHJpbmciIC8+PEZpZWxkIE5hbWU9IkhJTldfVEVYVCIgVHlwZT0iU3RyaW5nIiAvPjxGaWVsZCBOYW1lPSJISU5XX1RFWFRfRVJHIiBUeXBlPSJTdHJpbmciIC8+PEZpZWxkIE5hbWU9IkJPUkRFUk9OUiIgVHlwZT0iSW50MzIiIC8+PEZpZWxkIE5hbWU9IktVTkRFTl9JRCIgVHlwZT0iU3RyaW5nIiAvPjwvVmlldz48VmlldyBOYW1lPSJRdWVyeV9IaW53ZWlzdGV4dCI+PEZpZWxkIE5hbWU9IlRFWFQiIFR5cGU9IlN0cmluZyIgLz48RmllbGQgTmFtZT0iQ09ERSIgVHlwZT0iU3RyaW5nIiAvPjxGaWVsZCBOYW1lPSJCRVpFSUNITlVORyIgVHlwZT0iU3RyaW5nIiAvPjxGaWVsZCBOYW1lPSJTRU5EVU5HTlIiIFR5cGU9IkludDMyIiAvPjwvVmlldz48UmVsYXRpb24gTWFzdGVyPSJRdWVyeSIgRGV0YWlsPSJRdWVyeV9IaW53ZWlzdGV4dCI+PEtleUNvbHVtbiBNYXN0ZXI9IkdVSUQiIERldGFpbD0iU0VORFVOR05SIiAvPjwvUmVsYXRpb24+PC9EYXRhU2V0Pg== + PERhdGFTZXQgTmFtZT0iU3FsRGF0YVNvdXJjZTEiPjxWaWV3IE5hbWU9IlF1ZXJ5Ij48RmllbGQgTmFtZT0iR1VJRCIgVHlwZT0iVW5rbm93biIgLz48RmllbGQgTmFtZT0iTEFEMSIgVHlwZT0iVW5rbm93biIgLz48RmllbGQgTmFtZT0iTEFEX1NUUkFTU0UiIFR5cGU9IlVua25vd24iIC8+PEZpZWxkIE5hbWU9IkxBRF9MS1pfUExaX09SVCIgVHlwZT0iVW5rbm93biIgLz48RmllbGQgTmFtZT0iRkVSVElHIiBUeXBlPSJVbmtub3duIiAvPjxGaWVsZCBOYW1lPSJTRU5EVU5HTlIiIFR5cGU9IlVua25vd24iIC8+PEZpZWxkIE5hbWU9IlNER19SRUZFUkVOWiIgVHlwZT0iVW5rbm93biIgLz48RmllbGQgTmFtZT0iRU1QIiBUeXBlPSJVbmtub3duIiAvPjxGaWVsZCBOYW1lPSJFTVBfWlVTQVRaIiBUeXBlPSJVbmtub3duIiAvPjxGaWVsZCBOYW1lPSJFTVBfWlVTQVRaMiIgVHlwZT0iVW5rbm93biIgLz48RmllbGQgTmFtZT0iRU1QX1NUUkFTU0UiIFR5cGU9IlVua25vd24iIC8+PEZpZWxkIE5hbWU9IkVNUF9QTFpfU1RSIiBUeXBlPSJVbmtub3duIiAvPjxGaWVsZCBOYW1lPSJFTVBfTEtaIiBUeXBlPSJVbmtub3duIiAvPjxGaWVsZCBOYW1lPSJFTVBfT1JUIiBUeXBlPSJVbmtub3duIiAvPjxGaWVsZCBOYW1lPSJFTVBfT1RFSUwiIFR5cGU9IlVua25vd24iIC8+PEZpZWxkIE5hbWU9IkFCSE9MREFUVU0iIFR5cGU9IlVua25vd24iIC8+PEZpZWxkIE5hbWU9IlNER19HRVdJQ0hUIiBUeXBlPSJVbmtub3duIiAvPjxGaWVsZCBOYW1lPSJTREdfU1RFTExQTEFFVFpFIiBUeXBlPSJVbmtub3duIiAvPjxGaWVsZCBOYW1lPSJTREdfRlJBTktBVFVSIiBUeXBlPSJVbmtub3duIiAvPjxGaWVsZCBOYW1lPSJOVkUiIFR5cGU9IlVua25vd24iIC8+PEZpZWxkIE5hbWU9IlBPU0lOSEFMVCIgVHlwZT0iVW5rbm93biIgLz48RmllbGQgTmFtZT0iUE9TX0dFV0lDSFQiIFR5cGU9IlVua25vd24iIC8+PEZpZWxkIE5hbWU9IlBBQ0tTVFVFQ0tBTlpBSEwiIFR5cGU9IlVua25vd24iIC8+PEZpZWxkIE5hbWU9IlBBTEVUVEVOQU5aQUhMIiBUeXBlPSJVbmtub3duIiAvPjxGaWVsZCBOYW1lPSJDT0RFIiBUeXBlPSJVbmtub3duIiAvPjxGaWVsZCBOYW1lPSJCRU1FUktVTkciIFR5cGU9IlVua25vd24iIC8+PEZpZWxkIE5hbWU9IkhJTldfQ09ERSIgVHlwZT0iVW5rbm93biIgLz48RmllbGQgTmFtZT0iSElOV19URVhUIiBUeXBlPSJVbmtub3duIiAvPjxGaWVsZCBOYW1lPSJISU5XX1RFWFRfRVJHIiBUeXBlPSJVbmtub3duIiAvPjxGaWVsZCBOYW1lPSJCT1JERVJPTlIiIFR5cGU9IlVua25vd24iIC8+PEZpZWxkIE5hbWU9IktVTkRFTl9JRCIgVHlwZT0iVW5rbm93biIgLz48L1ZpZXc+PFZpZXcgTmFtZT0iUXVlcnlfSGlud2Vpc3RleHQiPjxGaWVsZCBOYW1lPSJURVhUIiBUeXBlPSJVbmtub3duIiAvPjxGaWVsZCBOYW1lPSJDT0RFIiBUeXBlPSJVbmtub3duIiAvPjxGaWVsZCBOYW1lPSJCRVpFSUNITlVORyIgVHlwZT0iVW5rbm93biIgLz48RmllbGQgTmFtZT0iU0VORFVOR05SIiBUeXBlPSJVbmtub3duIiAvPjwvVmlldz48VmlldyBOYW1lPSJRdWVyeV9Qb3NpdGlvbmVuIj48RmllbGQgTmFtZT0iTlZFIiBUeXBlPSJTdHJpbmciIC8+PEZpZWxkIE5hbWU9IlBPU0lOSEFMVCIgVHlwZT0iU3RyaW5nIiAvPjxGaWVsZCBOYW1lPSJTRU5EVU5HTlIiIFR5cGU9IlN0cmluZyIgLz48L1ZpZXc+PFJlbGF0aW9uIE1hc3Rlcj0iUXVlcnkiIERldGFpbD0iUXVlcnlfSGlud2Vpc3RleHQiPjxLZXlDb2x1bW4gTWFzdGVyPSJHVUlEIiBEZXRhaWw9IlNFTkRVTkdOUiIgLz48L1JlbGF0aW9uPjwvRGF0YVNldD4= \ No newline at end of file diff --git a/SchaumKommiCollo/SetupWix/Product.wxs b/SchaumKommiCollo/SetupWix/Product.wxs index 788e88a..87e20dd 100644 --- a/SchaumKommiCollo/SetupWix/Product.wxs +++ b/SchaumKommiCollo/SetupWix/Product.wxs @@ -65,65 +65,70 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SchaumKommiCollo/SetupWix/obj/Debug/SetupWix.wixproj.FileList.txt b/SchaumKommiCollo/SetupWix/obj/Debug/SetupWix.wixproj.FileList.txt index 930aa63..7026de7 100644 --- a/SchaumKommiCollo/SetupWix/obj/Debug/SetupWix.wixproj.FileList.txt +++ b/SchaumKommiCollo/SetupWix/obj/Debug/SetupWix.wixproj.FileList.txt @@ -4,3 +4,9 @@ E:\SchreiberM\Visual Studio\GIT\SetupWix\bin\Debug\KommiCollo-x86-2.0.0.0.msi E:\SchreiberM\Visual Studio\GIT\SetupWix\bin\Debug\KommiCollo-x86-2.0.0.0.wixpdb E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.2.0.4.msi E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.2.0.4.wixpdb +E:\JenneJ\Visual Studio\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.2.0.7.msi +E:\JenneJ\Visual Studio\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.2.0.7.wixpdb +obj\Debug\Product.wixobj +obj\Debug\SetupWix.wixproj.BindContentsFileListde-DE.txt +obj\Debug\SetupWix.wixproj.BindOutputsFileListde-DE.txt +obj\Debug\SetupWix.wixproj.BindBuiltOutputsFileListde-DE.txt