diff --git a/.vs/KommiCollo/v15/.suo b/.vs/KommiCollo/v15/.suo index 005c169..b0f26dc 100644 Binary files a/.vs/KommiCollo/v15/.suo and b/.vs/KommiCollo/v15/.suo differ diff --git a/KommiCollo/bin/Debug/KommiCollo.exe b/KommiCollo/bin/Debug/KommiCollo.exe index 723f87b..cb4a5e9 100644 Binary files a/KommiCollo/bin/Debug/KommiCollo.exe and b/KommiCollo/bin/Debug/KommiCollo.exe differ diff --git a/KommiCollo/bin/Debug/KommiCollo.pdb b/KommiCollo/bin/Debug/KommiCollo.pdb index 7ee870f..dc9c7ce 100644 Binary files a/KommiCollo/bin/Debug/KommiCollo.pdb and b/KommiCollo/bin/Debug/KommiCollo.pdb differ diff --git a/KommiCollo/frmMain.Designer.vb b/KommiCollo/frmMain.Designer.vb index 89060f1..b5337fb 100644 --- a/KommiCollo/frmMain.Designer.vb +++ b/KommiCollo/frmMain.Designer.vb @@ -73,6 +73,7 @@ Partial Class frmMain Me.pnlError = New System.Windows.Forms.Panel() Me.TBKOMMCOLLI_TERMINARTTableAdapter = New KommiCollo.MyDatasetTableAdapters.TBKOMMCOLLI_TERMINARTTableAdapter() Me.Panel1 = New System.Windows.Forms.Panel() + Me.Button3 = New System.Windows.Forms.Button() Me.Button1 = New System.Windows.Forms.Button() Me.txtPaketID = New System.Windows.Forms.TextBox() Me.btndeletePaket = New System.Windows.Forms.Button() @@ -109,36 +110,37 @@ Partial Class frmMain Me.TBKOMMCOLLI_SDGPOSITIONENTableAdapter = New KommiCollo.MyDatasetTableAdapters.TBKOMMCOLLI_SDGPOSITIONENTableAdapter() Me.TBKOMMCOLLI_TEXTSCHLUESSELTableAdapter = New KommiCollo.MyDatasetTableAdapters.TBKOMMCOLLI_TEXTSCHLUESSELTableAdapter() Me.TBKOMMCOLLI_HINWEISTableAdapter = New KommiCollo.MyDatasetTableAdapters.TBKOMMCOLLI_HINWEISTableAdapter() + Me.bw_Tagesabschluss = New System.ComponentModel.BackgroundWorker() PAKET_IDLabel = New System.Windows.Forms.Label() Label3 = New System.Windows.Forms.Label() GESAMTGEWICHTLabel = New System.Windows.Forms.Label() Label5 = New System.Windows.Forms.Label() - Me.MenuStrip1.SuspendLayout - Me.ToolStrip1.SuspendLayout - CType(Me.picbxError,System.ComponentModel.ISupportInitialize).BeginInit - Me.pnlPaketadd.SuspendLayout - CType(Me.TBWH_MANDANTBindingSource,System.ComponentModel.ISupportInitialize).BeginInit - CType(Me.MyDataset,System.ComponentModel.ISupportInitialize).BeginInit - CType(Me.TBKOMMCOLLI_PAKET_KOPFBindingSource,System.ComponentModel.ISupportInitialize).BeginInit - Me.pnlAddBarcodes.SuspendLayout - CType(Me.TBKOMMCOLLI_TERMINARTBindingSource,System.ComponentModel.ISupportInitialize).BeginInit - CType(Me.TBKOMMCOLLI_PAKET_POSBindingSource,System.ComponentModel.ISupportInitialize).BeginInit - Me.StatusStrip1.SuspendLayout - Me.pnlError.SuspendLayout - Me.Panel1.SuspendLayout - Me.Panel2.SuspendLayout - Me.pnlHuP.SuspendLayout - Me.GroupBox1.SuspendLayout - CType(Me.TBKOMMCOLLI_HINWEISBindingSource,System.ComponentModel.ISupportInitialize).BeginInit - CType(Me.TBKOMMCOLLI_TEXTSCHLUESSELBindingSource,System.ComponentModel.ISupportInitialize).BeginInit - CType(Me.GridControlPos,System.ComponentModel.ISupportInitialize).BeginInit - CType(Me.TBKOMMCOLLI_SDGPOSITIONENBindingSource,System.ComponentModel.ISupportInitialize).BeginInit - CType(Me.grvwGridPos,System.ComponentModel.ISupportInitialize).BeginInit - Me.SuspendLayout + Me.MenuStrip1.SuspendLayout() + Me.ToolStrip1.SuspendLayout() + CType(Me.picbxError, System.ComponentModel.ISupportInitialize).BeginInit() + Me.pnlPaketadd.SuspendLayout() + CType(Me.TBWH_MANDANTBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TBKOMMCOLLI_PAKET_KOPFBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + Me.pnlAddBarcodes.SuspendLayout() + CType(Me.TBKOMMCOLLI_TERMINARTBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TBKOMMCOLLI_PAKET_POSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + Me.StatusStrip1.SuspendLayout() + Me.pnlError.SuspendLayout() + Me.Panel1.SuspendLayout() + Me.Panel2.SuspendLayout() + Me.pnlHuP.SuspendLayout() + Me.GroupBox1.SuspendLayout() + CType(Me.TBKOMMCOLLI_HINWEISBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TBKOMMCOLLI_TEXTSCHLUESSELBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridControlPos, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TBKOMMCOLLI_SDGPOSITIONENBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.grvwGridPos, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() ' 'PAKET_IDLabel ' - PAKET_IDLabel.AutoSize = true + PAKET_IDLabel.AutoSize = True PAKET_IDLabel.Location = New System.Drawing.Point(12, 12) PAKET_IDLabel.Name = "PAKET_IDLabel" PAKET_IDLabel.Size = New System.Drawing.Size(129, 21) @@ -551,6 +553,7 @@ Partial Class frmMain ' 'Panel1 ' + Me.Panel1.Controls.Add(Me.Button3) Me.Panel1.Controls.Add(Me.Button1) Me.Panel1.Controls.Add(Me.txtPaketID) Me.Panel1.Controls.Add(Me.btndeletePaket) @@ -562,6 +565,20 @@ Partial Class frmMain Me.Panel1.Size = New System.Drawing.Size(135, 648) Me.Panel1.TabIndex = 7 ' + 'Button3 + ' + Me.Button3.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Button3.ForeColor = System.Drawing.Color.Red + Me.Button3.Image = Global.KommiCollo.My.Resources.Resources.package_green + Me.Button3.ImageAlign = System.Drawing.ContentAlignment.TopLeft + Me.Button3.Location = New System.Drawing.Point(12, 173) + Me.Button3.Name = "Button3" + Me.Button3.Size = New System.Drawing.Size(112, 69) + Me.Button3.TabIndex = 5 + Me.Button3.Text = "Tages-" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Abschluss" + Me.Button3.TextAlign = System.Drawing.ContentAlignment.BottomLeft + Me.Button3.UseVisualStyleBackColor = True + ' 'Button1 ' Me.Button1.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -926,8 +943,8 @@ Partial Class frmMain ' 'Label9 ' - Me.Label9.AutoSize = true - Me.Label9.Font = New System.Drawing.Font("Segoe UI", 14.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.Label9.AutoSize = True + Me.Label9.Font = New System.Drawing.Font("Segoe UI", 14.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label9.Location = New System.Drawing.Point(13, 65) Me.Label9.Name = "Label9" Me.Label9.Size = New System.Drawing.Size(166, 25) @@ -936,15 +953,18 @@ Partial Class frmMain ' 'TBKOMMCOLLI_SDGPOSITIONENTableAdapter ' - Me.TBKOMMCOLLI_SDGPOSITIONENTableAdapter.ClearBeforeFill = true + Me.TBKOMMCOLLI_SDGPOSITIONENTableAdapter.ClearBeforeFill = True ' 'TBKOMMCOLLI_TEXTSCHLUESSELTableAdapter ' - Me.TBKOMMCOLLI_TEXTSCHLUESSELTableAdapter.ClearBeforeFill = true + Me.TBKOMMCOLLI_TEXTSCHLUESSELTableAdapter.ClearBeforeFill = True ' 'TBKOMMCOLLI_HINWEISTableAdapter ' - Me.TBKOMMCOLLI_HINWEISTableAdapter.ClearBeforeFill = true + Me.TBKOMMCOLLI_HINWEISTableAdapter.ClearBeforeFill = True + ' + 'bw_Tagesabschluss + ' ' 'frmMain ' @@ -1079,5 +1099,6 @@ End Sub Friend WithEvents TBKOMMCOLLI_HINWEISTableAdapter As KommiCollo.MyDatasetTableAdapters.TBKOMMCOLLI_HINWEISTableAdapter Friend WithEvents Button2 As System.Windows.Forms.Button Friend WithEvents btnPrintOptions As System.Windows.Forms.Button - + Friend WithEvents Button3 As Button + Friend WithEvents bw_Tagesabschluss As System.ComponentModel.BackgroundWorker End Class diff --git a/KommiCollo/frmMain.resx b/KommiCollo/frmMain.resx index 37e6f6c..4bfc219 100644 --- a/KommiCollo/frmMain.resx +++ b/KommiCollo/frmMain.resx @@ -186,6 +186,12 @@ 286, 134 + + 549, 134 + + + 172 + diff --git a/KommiCollo/frmMain.vb b/KommiCollo/frmMain.vb index 7f7a329..3cee7fe 100644 --- a/KommiCollo/frmMain.vb +++ b/KommiCollo/frmMain.vb @@ -637,4 +637,27 @@ Public Class frmMain CURRENT_SENDUNG = aktGUID frmPrintOptions.ShowDialog() End Sub + + Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click + Dim result As DialogResult = MessageBox.Show("Dies wird die Sendungsdaten exportieren und verschicken." & vbNewLine & vbNewLine & "DIES KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN!" & vbNewLine & vbNewLine & "Sind Sie sicher dass Sie den Tageschluss durchführen wollen?", "Tagesabschluss", MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation, MessageBoxDefaultButton.Button2) + + If result = DialogResult.Yes Then + bw_Tagesabschluss.RunWorkerAsync() + End If + End Sub + + Private Sub bw_Tagesabschluss_DoWork(sender As Object, e As System.ComponentModel.DoWorkEventArgs) Handles bw_Tagesabschluss.DoWork + 'Threading.Thread.Sleep(3000) + Dim Result As Boolean = True + Result = ClassDatabase.Execute_non_Query("EXEC PRKOMMCOLLI_BORDERO_EXPORTIEREN", False) + e.Result = Result + End Sub + + Private Sub bw_Tagesabschluss_RunWorkerCompleted(sender As Object, e As System.ComponentModel.RunWorkerCompletedEventArgs) Handles bw_Tagesabschluss.RunWorkerCompleted + If e.Result = True Then + MsgBox("Abschluss erfolgreich ausgeführt.", MsgBoxStyle.Information, "Tagesabschluss") + Else + MsgBox("Fehler bei Abschluss, bitte Log prüfen.") + End If + End Sub End Class diff --git a/KommiCollo/obj/x86/Debug/KommiCollo.exe b/KommiCollo/obj/x86/Debug/KommiCollo.exe index 723f87b..cb4a5e9 100644 Binary files a/KommiCollo/obj/x86/Debug/KommiCollo.exe and b/KommiCollo/obj/x86/Debug/KommiCollo.exe differ diff --git a/KommiCollo/obj/x86/Debug/KommiCollo.pdb b/KommiCollo/obj/x86/Debug/KommiCollo.pdb index 7ee870f..dc9c7ce 100644 Binary files a/KommiCollo/obj/x86/Debug/KommiCollo.pdb and b/KommiCollo/obj/x86/Debug/KommiCollo.pdb differ diff --git a/KommiCollo/obj/x86/Debug/KommiCollo.reportUebergabe.resources b/KommiCollo/obj/x86/Debug/KommiCollo.reportUebergabe.resources index 8bb3180..2cb7f5f 100644 Binary files a/KommiCollo/obj/x86/Debug/KommiCollo.reportUebergabe.resources and b/KommiCollo/obj/x86/Debug/KommiCollo.reportUebergabe.resources differ diff --git a/KommiCollo/obj/x86/Debug/KommiCollo.vbproj.FileListAbsolute.txt b/KommiCollo/obj/x86/Debug/KommiCollo.vbproj.FileListAbsolute.txt index b28114d..8e22163 100644 --- a/KommiCollo/obj/x86/Debug/KommiCollo.vbproj.FileListAbsolute.txt +++ b/KommiCollo/obj/x86/Debug/KommiCollo.vbproj.FileListAbsolute.txt @@ -189,3 +189,194 @@ E:\JenneJ\Visual Studio\SchaumKommi\obj\x86\Debug\KommiCollo.exe.licenses E:\JenneJ\Visual Studio\SchaumKommi\obj\x86\Debug\KommiCollo.exe E:\JenneJ\Visual Studio\SchaumKommi\obj\x86\Debug\KommiCollo.xml E:\JenneJ\Visual Studio\SchaumKommi\obj\x86\Debug\KommiCollo.pdb +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\Testreport.rdlc +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\KommiCollo.exe.config +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\KommiCollo.exe +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\KommiCollo.pdb +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\KommiCollo.xml +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.Charts.v15.2.Core.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.CodeParser.v15.2.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.Data.v15.2.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.DataAccess.v15.2.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.DataAccess.v15.2.UI.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.Office.v15.2.Core.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.PivotGrid.v15.2.Core.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.Printing.v15.2.Core.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.RichEdit.v15.2.Core.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.Sparkline.v15.2.Core.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.Utils.v15.2.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.Utils.v15.2.UI.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.Xpo.v15.2.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.XtraBars.v15.2.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.XtraCharts.v15.2.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.XtraCharts.v15.2.Extensions.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.XtraCharts.v15.2.Wizard.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.XtraEditors.v15.2.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.XtraGauges.v15.2.Core.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.XtraGrid.v15.2.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.XtraLayout.v15.2.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.XtraNavBar.v15.2.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.XtraPivotGrid.v15.2.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.XtraPrinting.v15.2.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.XtraReports.v15.2.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.XtraReports.v15.2.Extensions.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.XtraRichEdit.v15.2.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.XtraTreeList.v15.2.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.XtraVerticalGrid.v15.2.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\Microsoft.ReportViewer.Common.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\Microsoft.ReportViewer.ProcessingObjectModel.DLL +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\Microsoft.ReportViewer.WinForms.DLL +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\Microsoft.SqlServer.Types.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.Pdf.v15.2.Core.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.Pdf.v15.2.Drawing.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.Data.v15.2.xml +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.DataAccess.v15.2.xml +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.DataAccess.v15.2.UI.xml +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.Office.v15.2.Core.xml +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.PivotGrid.v15.2.Core.xml +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.Printing.v15.2.Core.xml +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.RichEdit.v15.2.Core.xml +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.Sparkline.v15.2.Core.xml +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.Utils.v15.2.xml +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.Utils.v15.2.UI.xml +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.Xpo.v15.2.xml +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.XtraBars.v15.2.xml +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.XtraCharts.v15.2.xml +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.XtraCharts.v15.2.Wizard.xml +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.XtraEditors.v15.2.xml +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.XtraGauges.v15.2.Core.xml +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.XtraGrid.v15.2.xml +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.XtraLayout.v15.2.xml +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.XtraNavBar.v15.2.xml +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.XtraPivotGrid.v15.2.xml +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.XtraPrinting.v15.2.xml +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.XtraReports.v15.2.xml +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.XtraReports.v15.2.Extensions.xml +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.XtraRichEdit.v15.2.xml +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.XtraTreeList.v15.2.xml +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.XtraVerticalGrid.v15.2.xml +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.Pdf.v15.2.Core.xml +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\DevExpress.Pdf.v15.2.Drawing.xml +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\de\DevExpress.Data.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\es\DevExpress.Data.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ja\DevExpress.Data.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ru\DevExpress.Data.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\de\DevExpress.DataAccess.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\es\DevExpress.DataAccess.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ja\DevExpress.DataAccess.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ru\DevExpress.DataAccess.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\de\DevExpress.DataAccess.v15.2.UI.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\es\DevExpress.DataAccess.v15.2.UI.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ja\DevExpress.DataAccess.v15.2.UI.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ru\DevExpress.DataAccess.v15.2.UI.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\de\DevExpress.Office.v15.2.Core.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\es\DevExpress.Office.v15.2.Core.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ja\DevExpress.Office.v15.2.Core.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ru\DevExpress.Office.v15.2.Core.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\de\DevExpress.PivotGrid.v15.2.Core.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\es\DevExpress.PivotGrid.v15.2.Core.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ja\DevExpress.PivotGrid.v15.2.Core.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ru\DevExpress.PivotGrid.v15.2.Core.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\de\DevExpress.Printing.v15.2.Core.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\es\DevExpress.Printing.v15.2.Core.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ja\DevExpress.Printing.v15.2.Core.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ru\DevExpress.Printing.v15.2.Core.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\de\DevExpress.RichEdit.v15.2.Core.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\es\DevExpress.RichEdit.v15.2.Core.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ja\DevExpress.RichEdit.v15.2.Core.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ru\DevExpress.RichEdit.v15.2.Core.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\de\DevExpress.Sparkline.v15.2.Core.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\es\DevExpress.Sparkline.v15.2.Core.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ja\DevExpress.Sparkline.v15.2.Core.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ru\DevExpress.Sparkline.v15.2.Core.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\de\DevExpress.Utils.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\es\DevExpress.Utils.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ja\DevExpress.Utils.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ru\DevExpress.Utils.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\de\DevExpress.Utils.v15.2.UI.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\es\DevExpress.Utils.v15.2.UI.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ja\DevExpress.Utils.v15.2.UI.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ru\DevExpress.Utils.v15.2.UI.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\de\DevExpress.Xpo.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\es\DevExpress.Xpo.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ja\DevExpress.Xpo.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ru\DevExpress.Xpo.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\de\DevExpress.XtraBars.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\es\DevExpress.XtraBars.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ja\DevExpress.XtraBars.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ru\DevExpress.XtraBars.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\de\DevExpress.XtraCharts.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\es\DevExpress.XtraCharts.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ja\DevExpress.XtraCharts.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ru\DevExpress.XtraCharts.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\de\DevExpress.XtraCharts.v15.2.Wizard.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\es\DevExpress.XtraCharts.v15.2.Wizard.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ja\DevExpress.XtraCharts.v15.2.Wizard.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ru\DevExpress.XtraCharts.v15.2.Wizard.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\de\DevExpress.XtraEditors.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\es\DevExpress.XtraEditors.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ja\DevExpress.XtraEditors.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ru\DevExpress.XtraEditors.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\de\DevExpress.XtraGauges.v15.2.Core.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\es\DevExpress.XtraGauges.v15.2.Core.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ja\DevExpress.XtraGauges.v15.2.Core.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ru\DevExpress.XtraGauges.v15.2.Core.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\de\DevExpress.XtraGrid.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\es\DevExpress.XtraGrid.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ja\DevExpress.XtraGrid.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ru\DevExpress.XtraGrid.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\de\DevExpress.XtraLayout.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\es\DevExpress.XtraLayout.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ja\DevExpress.XtraLayout.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ru\DevExpress.XtraLayout.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\de\DevExpress.XtraNavBar.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\es\DevExpress.XtraNavBar.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ja\DevExpress.XtraNavBar.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ru\DevExpress.XtraNavBar.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\de\DevExpress.XtraPivotGrid.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\es\DevExpress.XtraPivotGrid.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ja\DevExpress.XtraPivotGrid.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ru\DevExpress.XtraPivotGrid.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\de\DevExpress.XtraPrinting.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\es\DevExpress.XtraPrinting.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ja\DevExpress.XtraPrinting.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ru\DevExpress.XtraPrinting.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\de\DevExpress.XtraReports.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\es\DevExpress.XtraReports.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ja\DevExpress.XtraReports.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ru\DevExpress.XtraReports.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\de\DevExpress.XtraReports.v15.2.Extensions.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\es\DevExpress.XtraReports.v15.2.Extensions.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ja\DevExpress.XtraReports.v15.2.Extensions.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ru\DevExpress.XtraReports.v15.2.Extensions.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\de\DevExpress.XtraRichEdit.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\es\DevExpress.XtraRichEdit.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ja\DevExpress.XtraRichEdit.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ru\DevExpress.XtraRichEdit.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\de\DevExpress.XtraTreeList.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\es\DevExpress.XtraTreeList.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ja\DevExpress.XtraTreeList.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ru\DevExpress.XtraTreeList.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\de\DevExpress.XtraVerticalGrid.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\es\DevExpress.XtraVerticalGrid.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ja\DevExpress.XtraVerticalGrid.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ru\DevExpress.XtraVerticalGrid.v15.2.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\de\DevExpress.Pdf.v15.2.Core.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\es\DevExpress.Pdf.v15.2.Core.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ja\DevExpress.Pdf.v15.2.Core.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\bin\Debug\ru\DevExpress.Pdf.v15.2.Core.resources.dll +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\obj\x86\Debug\KommiCollo.vbprojResolveAssemblyReference.cache +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\obj\x86\Debug\KommiCollo.DocumentViewerEx.resources +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\obj\x86\Debug\KommiCollo.frmAbschluss.resources +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\obj\x86\Debug\KommiCollo.frmConnection.resources +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\obj\x86\Debug\KommiCollo.frmLabel.resources +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\obj\x86\Debug\KommiCollo.frmMain.resources +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\obj\x86\Debug\KommiCollo.frmPrintOptions.resources +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\obj\x86\Debug\KommiCollo.frmStammdatenverwaltung.resources +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\obj\x86\Debug\KommiCollo.Resources.resources +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\obj\x86\Debug\KommiCollo.reportUebergabe.resources +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\obj\x86\Debug\KommiCollo.vbproj.GenerateResource.Cache +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\obj\x86\Debug\KommiCollo.exe.licenses +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\obj\x86\Debug\KommiCollo.exe +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\obj\x86\Debug\KommiCollo.xml +E:\JenneJ\Visual Studio\SchaumKommi\KommiCollo\obj\x86\Debug\KommiCollo.pdb diff --git a/KommiCollo/obj/x86/Debug/KommiCollo.vbproj.GenerateResource.Cache b/KommiCollo/obj/x86/Debug/KommiCollo.vbproj.GenerateResource.Cache index e25241b..5dd8637 100644 Binary files a/KommiCollo/obj/x86/Debug/KommiCollo.vbproj.GenerateResource.Cache and b/KommiCollo/obj/x86/Debug/KommiCollo.vbproj.GenerateResource.Cache differ diff --git a/KommiCollo/obj/x86/Debug/KommiCollo.vbprojResolveAssemblyReference.cache b/KommiCollo/obj/x86/Debug/KommiCollo.vbprojResolveAssemblyReference.cache index ee230bb..100f706 100644 Binary files a/KommiCollo/obj/x86/Debug/KommiCollo.vbprojResolveAssemblyReference.cache and b/KommiCollo/obj/x86/Debug/KommiCollo.vbprojResolveAssemblyReference.cache differ diff --git a/KommiCollo/reportUebergabe.designer.vb b/KommiCollo/reportUebergabe.designer.vb index 2a76290..10bbbaa 100644 --- a/KommiCollo/reportUebergabe.designer.vb +++ b/KommiCollo/reportUebergabe.designer.vb @@ -22,10 +22,11 @@ Partial Public Class reportUebergabe 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(reportUebergabe)) + Dim XrSummary1 As DevExpress.XtraReports.UI.XRSummary = New DevExpress.XtraReports.UI.XRSummary() Dim XrSummary2 As DevExpress.XtraReports.UI.XRSummary = New DevExpress.XtraReports.UI.XRSummary() Dim XrSummary3 As DevExpress.XtraReports.UI.XRSummary = New DevExpress.XtraReports.UI.XRSummary() - Dim XrSummary1 As DevExpress.XtraReports.UI.XRSummary = New DevExpress.XtraReports.UI.XRSummary() Me.Detail = New DevExpress.XtraReports.UI.DetailBand() + Me.XrLabel49 = New DevExpress.XtraReports.UI.XRLabel() Me.XrLabel47 = New DevExpress.XtraReports.UI.XRLabel() Me.XrLabel46 = New DevExpress.XtraReports.UI.XRLabel() Me.XrLabel45 = New DevExpress.XtraReports.UI.XRLabel() @@ -73,6 +74,7 @@ Partial Public Class reportUebergabe Me.PageInfo = New DevExpress.XtraReports.UI.XRControlStyle() Me.DataField = New DevExpress.XtraReports.UI.XRControlStyle() Me.ReportFooter = New DevExpress.XtraReports.UI.ReportFooterBand() + Me.XrLabel50 = New DevExpress.XtraReports.UI.XRLabel() Me.XrPageBreak1 = New DevExpress.XtraReports.UI.XRPageBreak() Me.XrLabel31 = New DevExpress.XtraReports.UI.XRLabel() Me.XrLine1 = New DevExpress.XtraReports.UI.XRLine() @@ -99,8 +101,6 @@ Partial Public Class reportUebergabe Me.XrLabel16 = New DevExpress.XtraReports.UI.XRLabel() Me.XrLine7 = New DevExpress.XtraReports.UI.XRLine() Me.XrLabel9 = New DevExpress.XtraReports.UI.XRLabel() - Me.XrLabel49 = New DevExpress.XtraReports.UI.XRLabel() - Me.XrLabel50 = New DevExpress.XtraReports.UI.XRLabel() CType(Me, System.ComponentModel.ISupportInitialize).BeginInit() ' 'Detail @@ -113,6 +113,18 @@ Partial Public Class reportUebergabe Me.Detail.StyleName = "DataField" Me.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft ' + 'XrLabel49 + ' + Me.XrLabel49.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.NVE")}) + Me.XrLabel49.Dpi = 100.0! + Me.XrLabel49.Font = New System.Drawing.Font("Arial", 8.25!) + Me.XrLabel49.LocationFloat = New DevExpress.Utils.PointFloat(241.0878!, 22.04164!) + Me.XrLabel49.Name = "XrLabel49" + Me.XrLabel49.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) + Me.XrLabel49.SizeF = New System.Drawing.SizeF(156.8752!, 11.54169!) + Me.XrLabel49.StylePriority.UseFont = False + Me.XrLabel49.Text = "XrLabel49" + ' 'XrLabel47 ' Me.XrLabel47.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.BEMERKUNG")}) @@ -667,6 +679,21 @@ Partial Public Class reportUebergabe Me.ReportFooter.Name = "ReportFooter" Me.ReportFooter.PrintAtBottom = True ' + 'XrLabel50 + ' + Me.XrLabel50.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.EMP")}) + Me.XrLabel50.Dpi = 100.0! + Me.XrLabel50.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.XrLabel50.LocationFloat = New DevExpress.Utils.PointFloat(200.0!, 12.5!) + Me.XrLabel50.Name = "XrLabel50" + Me.XrLabel50.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) + Me.XrLabel50.SizeF = New System.Drawing.SizeF(112.4995!, 25.0!) + Me.XrLabel50.StylePriority.UseFont = False + XrSummary1.FormatString = "Summe Kolli: {0}" + XrSummary1.Func = DevExpress.XtraReports.UI.SummaryFunc.Count + XrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Report + Me.XrLabel50.Summary = XrSummary1 + ' 'XrPageBreak1 ' Me.XrPageBreak1.Dpi = 100.0! @@ -955,33 +982,6 @@ Partial Public Class reportUebergabe Me.XrLabel9.Text = "Unterschrift Fahrer:" Me.XrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft ' - 'XrLabel49 - ' - Me.XrLabel49.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.NVE")}) - Me.XrLabel49.Dpi = 100.0! - Me.XrLabel49.Font = New System.Drawing.Font("Arial", 8.25!) - Me.XrLabel49.LocationFloat = New DevExpress.Utils.PointFloat(241.0878!, 22.04164!) - Me.XrLabel49.Name = "XrLabel49" - Me.XrLabel49.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96.0!) - Me.XrLabel49.SizeF = New System.Drawing.SizeF(156.8752!, 11.54169!) - Me.XrLabel49.StylePriority.UseFont = False - Me.XrLabel49.Text = "XrLabel49" - ' - 'XrLabel50 - ' - Me.XrLabel50.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.EMP")}) - Me.XrLabel50.Dpi = 100.0! - Me.XrLabel50.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.XrLabel50.LocationFloat = New DevExpress.Utils.PointFloat(200.0!, 12.5!) - Me.XrLabel50.Name = "XrLabel50" - Me.XrLabel50.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) - Me.XrLabel50.SizeF = New System.Drawing.SizeF(112.4995!, 25.0!) - Me.XrLabel50.StylePriority.UseFont = False - XrSummary1.FormatString = "Summe Kolli: {0}" - XrSummary1.Func = DevExpress.XtraReports.UI.SummaryFunc.Count - XrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Report - Me.XrLabel50.Summary = XrSummary1 - ' 'reportUebergabe ' Me.Bands.AddRange(New DevExpress.XtraReports.UI.Band() {Me.Detail, Me.TopMargin, Me.BottomMargin, Me.PageHeaderBand1, Me.PageFooterBand1, Me.ReportHeaderBand1, Me.ReportFooter}) diff --git a/SetupWix/bin/Debug/KommiCollo-x86-1.0.0.0.msi b/SetupWix/bin/Debug/KommiCollo-x86-1.0.0.0.msi index 46ebefd..9613e09 100644 Binary files a/SetupWix/bin/Debug/KommiCollo-x86-1.0.0.0.msi and b/SetupWix/bin/Debug/KommiCollo-x86-1.0.0.0.msi differ diff --git a/SetupWix/bin/Debug/KommiCollo-x86-1.0.0.0.wixpdb b/SetupWix/bin/Debug/KommiCollo-x86-1.0.0.0.wixpdb index 11114cb..f8183c8 100644 Binary files a/SetupWix/bin/Debug/KommiCollo-x86-1.0.0.0.wixpdb and b/SetupWix/bin/Debug/KommiCollo-x86-1.0.0.0.wixpdb differ diff --git a/SetupWix/obj/Debug/SetupWix.wixproj.BindBuiltOutputsFileListnull.txt b/SetupWix/obj/Debug/SetupWix.wixproj.BindBuiltOutputsFileListde-DE.txt similarity index 100% rename from SetupWix/obj/Debug/SetupWix.wixproj.BindBuiltOutputsFileListnull.txt rename to SetupWix/obj/Debug/SetupWix.wixproj.BindBuiltOutputsFileListde-DE.txt diff --git a/SetupWix/obj/Debug/SetupWix.wixproj.BindContentsFileListnull.txt b/SetupWix/obj/Debug/SetupWix.wixproj.BindContentsFileListde-DE.txt similarity index 100% rename from SetupWix/obj/Debug/SetupWix.wixproj.BindContentsFileListnull.txt rename to SetupWix/obj/Debug/SetupWix.wixproj.BindContentsFileListde-DE.txt diff --git a/SetupWix/obj/Debug/SetupWix.wixproj.BindOutputsFileListnull.txt b/SetupWix/obj/Debug/SetupWix.wixproj.BindOutputsFileListde-DE.txt similarity index 100% rename from SetupWix/obj/Debug/SetupWix.wixproj.BindOutputsFileListnull.txt rename to SetupWix/obj/Debug/SetupWix.wixproj.BindOutputsFileListde-DE.txt diff --git a/SetupWix/obj/Debug/SetupWix.wixproj.FileList.txt b/SetupWix/obj/Debug/SetupWix.wixproj.FileList.txt index 261452e..b1b44cc 100644 --- a/SetupWix/obj/Debug/SetupWix.wixproj.FileList.txt +++ b/SetupWix/obj/Debug/SetupWix.wixproj.FileList.txt @@ -1,6 +1,6 @@ obj\Debug\Product.wixobj E:\JenneJ\Visual Studio\SchaumKommi\SetupWix\bin\Debug\KommiCollo-x86-1.0.0.0.msi E:\JenneJ\Visual Studio\SchaumKommi\SetupWix\bin\Debug\KommiCollo-x86-1.0.0.0.wixpdb -obj\Debug\SetupWix.wixproj.BindContentsFileListnull.txt -obj\Debug\SetupWix.wixproj.BindOutputsFileListnull.txt -obj\Debug\SetupWix.wixproj.BindBuiltOutputsFileListnull.txt +obj\Debug\SetupWix.wixproj.BindContentsFileListde-DE.txt +obj\Debug\SetupWix.wixproj.BindOutputsFileListde-DE.txt +obj\Debug\SetupWix.wixproj.BindBuiltOutputsFileListde-DE.txt