ustva-Design angepasst

SDL/USTV/usrCntlUSTV.Designer.vb

@@ -23,12 +23,13 @@ Partial Class usrCntlUSTV
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlUSTV))
         Me.pnlFilter = New System.Windows.Forms.Panel()
         Me.dgvUSTV = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.Label1 = New System.Windows.Forms.Label()
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.cbxMWSTnichtFakt = New System.Windows.Forms.CheckBox()
         Me.btnoffeneAntraege = New System.Windows.Forms.Button()
         Me.txtSucheID = New System.Windows.Forms.TextBox()
         Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
@@ -73,9 +74,7 @@ Partial Class usrCntlUSTV
         Me.Panel2 = New System.Windows.Forms.Panel()
         Me.Panel3 = New System.Windows.Forms.Panel()
         Me.Button2 = New System.Windows.Forms.Button()
-        Me.btn_Zahlungen_importieren = New System.Windows.Forms.Button()
         Me.btn3470 = New System.Windows.Forms.Button()
-        Me.Button4 = New System.Windows.Forms.Button()
         Me.btnVZ = New System.Windows.Forms.Button()
         Me.btnFAPruefung = New System.Windows.Forms.Button()
         Me.btnVorschau = New System.Windows.Forms.Button()
@@ -87,11 +86,18 @@ Partial Class usrCntlUSTV
         Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ContextMenuStrip4 = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.cbxMWSTnichtFakt = New System.Windows.Forms.CheckBox()
+        Me.ContextMenuStrip5 = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.ExportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ImportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ContextMenuStrip6 = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
         CType(Me.dgvUSTV, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel1.SuspendLayout()
         Me.Panel2.SuspendLayout()
         Me.Panel3.SuspendLayout()
+        Me.ContextMenuStrip5.SuspendLayout()
+        Me.ContextMenuStrip6.SuspendLayout()
         Me.SuspendLayout()
         '
         'pnlFilter
@@ -109,8 +115,8 @@ Partial Class usrCntlUSTV
         Me.dgvUSTV.AKTUALISIERUNGS_INTERVALL = -1
         Me.dgvUSTV.AllowUserToAddRows = False
         Me.dgvUSTV.AllowUserToDeleteRows = False
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvUSTV.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
+        Me.dgvUSTV.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8
         Me.dgvUSTV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvUSTV.Dock = System.Windows.Forms.DockStyle.Fill
         Me.dgvUSTV.Location = New System.Drawing.Point(0, 108)
@@ -182,6 +188,19 @@ Partial Class usrCntlUSTV
         Me.Panel1.Size = New System.Drawing.Size(1737, 108)
         Me.Panel1.TabIndex = 0
         '
+        'cbxMWSTnichtFakt
+        '
+        Me.cbxMWSTnichtFakt.AutoSize = True
+        Me.cbxMWSTnichtFakt.Checked = True
+        Me.cbxMWSTnichtFakt.CheckState = System.Windows.Forms.CheckState.Indeterminate
+        Me.cbxMWSTnichtFakt.Location = New System.Drawing.Point(565, 25)
+        Me.cbxMWSTnichtFakt.Name = "cbxMWSTnichtFakt"
+        Me.cbxMWSTnichtFakt.Size = New System.Drawing.Size(152, 17)
+        Me.cbxMWSTnichtFakt.TabIndex = 80
+        Me.cbxMWSTnichtFakt.Text = "MWST-Eingang nicht fakt."
+        Me.cbxMWSTnichtFakt.ThreeState = True
+        Me.cbxMWSTnichtFakt.UseVisualStyleBackColor = True
+        '
         'btnoffeneAntraege
         '
         Me.btnoffeneAntraege.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -196,9 +215,9 @@ Partial Class usrCntlUSTV
         '
         'txtSucheID
         '
-        Me.txtSucheID.Location = New System.Drawing.Point(554, 36)
+        Me.txtSucheID.Location = New System.Drawing.Point(320, 56)
         Me.txtSucheID.Name = "txtSucheID"
-        Me.txtSucheID.Size = New System.Drawing.Size(94, 20)
+        Me.txtSucheID.Size = New System.Drawing.Size(75, 20)
         Me.txtSucheID.TabIndex = 78
         '
         'MyComboBox1
@@ -207,24 +226,24 @@ Partial Class usrCntlUSTV
         Me.MyComboBox1._allowFreiText = False
         Me.MyComboBox1._value = ""
         Me.MyComboBox1.FormattingEnabled = True
-        Me.MyComboBox1.Location = New System.Drawing.Point(443, 37)
+        Me.MyComboBox1.Location = New System.Drawing.Point(226, 56)
         Me.MyComboBox1.Name = "MyComboBox1"
-        Me.MyComboBox1.Size = New System.Drawing.Size(78, 21)
+        Me.MyComboBox1.Size = New System.Drawing.Size(60, 21)
         Me.MyComboBox1.TabIndex = 77
         '
         'Label12
         '
         Me.Label12.AutoSize = True
-        Me.Label12.Location = New System.Drawing.Point(364, 40)
+        Me.Label12.Location = New System.Drawing.Point(176, 59)
         Me.Label12.Name = "Label12"
-        Me.Label12.Size = New System.Drawing.Size(73, 13)
+        Me.Label12.Size = New System.Drawing.Size(34, 13)
         Me.Label12.TabIndex = 76
-        Me.Label12.Text = "Antrags-Land:"
+        Me.Label12.Text = "Land:"
         '
         'lblID
         '
         Me.lblID.AutoSize = True
-        Me.lblID.Location = New System.Drawing.Point(527, 40)
+        Me.lblID.Location = New System.Drawing.Point(293, 60)
         Me.lblID.Name = "lblID"
         Me.lblID.Size = New System.Drawing.Size(21, 13)
         Me.lblID.TabIndex = 75
@@ -235,7 +254,7 @@ Partial Class usrCntlUSTV
         Me.cbxVZnichtabgerechnet.AutoSize = True
         Me.cbxVZnichtabgerechnet.Checked = True
         Me.cbxVZnichtabgerechnet.CheckState = System.Windows.Forms.CheckState.Indeterminate
-        Me.cbxVZnichtabgerechnet.Location = New System.Drawing.Point(668, 61)
+        Me.cbxVZnichtabgerechnet.Location = New System.Drawing.Point(565, 6)
         Me.cbxVZnichtabgerechnet.Name = "cbxVZnichtabgerechnet"
         Me.cbxVZnichtabgerechnet.Size = New System.Drawing.Size(90, 17)
         Me.cbxVZnichtabgerechnet.TabIndex = 74
@@ -610,7 +629,7 @@ Partial Class usrCntlUSTV
         Me.cbxDifferenzbetrag.AutoSize = True
         Me.cbxDifferenzbetrag.Checked = True
         Me.cbxDifferenzbetrag.CheckState = System.Windows.Forms.CheckState.Indeterminate
-        Me.cbxDifferenzbetrag.Location = New System.Drawing.Point(668, 44)
+        Me.cbxDifferenzbetrag.Location = New System.Drawing.Point(429, 41)
         Me.cbxDifferenzbetrag.Name = "cbxDifferenzbetrag"
         Me.cbxDifferenzbetrag.Size = New System.Drawing.Size(132, 17)
         Me.cbxDifferenzbetrag.TabIndex = 47
@@ -623,7 +642,7 @@ Partial Class usrCntlUSTV
         Me.cbxEingereicht.AutoSize = True
         Me.cbxEingereicht.Checked = True
         Me.cbxEingereicht.CheckState = System.Windows.Forms.CheckState.Indeterminate
-        Me.cbxEingereicht.Location = New System.Drawing.Point(668, 27)
+        Me.cbxEingereicht.Location = New System.Drawing.Point(429, 24)
         Me.cbxEingereicht.Name = "cbxEingereicht"
         Me.cbxEingereicht.Size = New System.Drawing.Size(118, 17)
         Me.cbxEingereicht.TabIndex = 46
@@ -636,7 +655,7 @@ Partial Class usrCntlUSTV
         Me.cbxTopMax.AutoSize = True
         Me.cbxTopMax.Checked = True
         Me.cbxTopMax.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.cbxTopMax.Location = New System.Drawing.Point(668, 10)
+        Me.cbxTopMax.Location = New System.Drawing.Point(429, 7)
         Me.cbxTopMax.Name = "cbxTopMax"
         Me.cbxTopMax.Size = New System.Drawing.Size(46, 17)
         Me.cbxTopMax.TabIndex = 45
@@ -659,7 +678,7 @@ Partial Class usrCntlUSTV
         Me.txtMaxSrch._WaehrungZeichen = True
         Me.txtMaxSrch.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.txtMaxSrch.ForeColor = System.Drawing.Color.Black
-        Me.txtMaxSrch.Location = New System.Drawing.Point(720, 9)
+        Me.txtMaxSrch.Location = New System.Drawing.Point(481, 6)
         Me.txtMaxSrch.MaxLineLength = -1
         Me.txtMaxSrch.MaxLines_Warning = ""
         Me.txtMaxSrch.MaxLines_Warning_Label = Nothing
@@ -675,15 +694,15 @@ Partial Class usrCntlUSTV
         Me.cboJahrBis._allowFreiText = False
         Me.cboJahrBis._value = ""
         Me.cboJahrBis.FormattingEnabled = True
-        Me.cboJahrBis.Location = New System.Drawing.Point(527, 8)
+        Me.cboJahrBis.Location = New System.Drawing.Point(310, 31)
         Me.cboJahrBis.Name = "cboJahrBis"
-        Me.cboJahrBis.Size = New System.Drawing.Size(121, 21)
+        Me.cboJahrBis.Size = New System.Drawing.Size(85, 21)
         Me.cboJahrBis.TabIndex = 7
         '
         'Label2
         '
         Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(364, 12)
+        Me.Label2.Location = New System.Drawing.Point(180, 35)
         Me.Label2.Name = "Label2"
         Me.Label2.Size = New System.Drawing.Size(30, 13)
         Me.Label2.TabIndex = 3
@@ -692,7 +711,7 @@ Partial Class usrCntlUSTV
         'lblKunde
         '
         Me.lblKunde.AutoSize = True
-        Me.lblKunde.Location = New System.Drawing.Point(99, 12)
+        Me.lblKunde.Location = New System.Drawing.Point(169, 13)
         Me.lblKunde.Name = "lblKunde"
         Me.lblKunde.Size = New System.Drawing.Size(41, 13)
         Me.lblKunde.TabIndex = 1
@@ -717,11 +736,11 @@ Partial Class usrCntlUSTV
         Me.KdSearchBox1.KdNr = "-1"
         Me.KdSearchBox1.kdNrField = Nothing
         Me.KdSearchBox1.KdNrNullInt = Nothing
-        Me.KdSearchBox1.Location = New System.Drawing.Point(146, 8)
+        Me.KdSearchBox1.Location = New System.Drawing.Point(226, 7)
         Me.KdSearchBox1.Name = "KdSearchBox1"
         Me.KdSearchBox1.nurAktive = True
         Me.KdSearchBox1.searchActive = True
-        Me.KdSearchBox1.Size = New System.Drawing.Size(212, 20)
+        Me.KdSearchBox1.Size = New System.Drawing.Size(169, 20)
         Me.KdSearchBox1.TabIndex = 2
         Me.KdSearchBox1.TIMER_SEARCH = True
         Me.KdSearchBox1.usrcntl = Nothing
@@ -732,9 +751,9 @@ Partial Class usrCntlUSTV
         Me.cboJahr._allowFreiText = False
         Me.cboJahr._value = ""
         Me.cboJahr.FormattingEnabled = True
-        Me.cboJahr.Location = New System.Drawing.Point(400, 8)
+        Me.cboJahr.Location = New System.Drawing.Point(227, 32)
         Me.cboJahr.Name = "cboJahr"
-        Me.cboJahr.Size = New System.Drawing.Size(121, 21)
+        Me.cboJahr.Size = New System.Drawing.Size(77, 21)
         Me.cboJahr.TabIndex = 4
         '
         'Button1
@@ -797,9 +816,7 @@ Partial Class usrCntlUSTV
         '
         Me.Panel3.AutoSize = True
         Me.Panel3.Controls.Add(Me.Button2)
-        Me.Panel3.Controls.Add(Me.btn_Zahlungen_importieren)
         Me.Panel3.Controls.Add(Me.btn3470)
-        Me.Panel3.Controls.Add(Me.Button4)
         Me.Panel3.Controls.Add(Me.btnVZ)
         Me.Panel3.Controls.Add(Me.btnFAPruefung)
         Me.Panel3.Controls.Add(Me.btnVorschau)
@@ -821,31 +838,16 @@ Partial Class usrCntlUSTV
         Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button2.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
         Me.Button2.ForeColor = System.Drawing.Color.Black
-        Me.Button2.Image = Global.SDL.My.Resources.Resources.statistik_small
+        Me.Button2.Image = Global.SDL.My.Resources.Resources.Excel_logo
         Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button2.Location = New System.Drawing.Point(480, 7)
+        Me.Button2.Location = New System.Drawing.Point(343, 7)
         Me.Button2.Name = "Button2"
         Me.Button2.Size = New System.Drawing.Size(132, 40)
         Me.Button2.TabIndex = 32
-        Me.Button2.Text = "MWST-Eingänge"
+        Me.Button2.Text = "MwSt-Eingänge"
         Me.Button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight
         Me.Button2.UseVisualStyleBackColor = True
         '
-        'btn_Zahlungen_importieren
-        '
-        Me.btn_Zahlungen_importieren.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btn_Zahlungen_importieren.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
-        Me.btn_Zahlungen_importieren.ForeColor = System.Drawing.Color.Black
-        Me.btn_Zahlungen_importieren.Image = Global.SDL.My.Resources.Resources.Excel_logo
-        Me.btn_Zahlungen_importieren.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btn_Zahlungen_importieren.Location = New System.Drawing.Point(778, 6)
-        Me.btn_Zahlungen_importieren.Name = "btn_Zahlungen_importieren"
-        Me.btn_Zahlungen_importieren.Size = New System.Drawing.Size(132, 40)
-        Me.btn_Zahlungen_importieren.TabIndex = 31
-        Me.btn_Zahlungen_importieren.Text = "Erstattungspos. importieren"
-        Me.btn_Zahlungen_importieren.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btn_Zahlungen_importieren.UseVisualStyleBackColor = True
-        '
         'btn3470
         '
         Me.btn3470.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -858,21 +860,6 @@ Partial Class usrCntlUSTV
         Me.btn3470.Text = "3470"
         Me.btn3470.UseVisualStyleBackColor = True
         '
-        'Button4
-        '
-        Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button4.Image = Global.SDL.My.Resources.Resources.statistik_small
-        Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button4.Location = New System.Drawing.Point(349, 7)
-        Me.Button4.Margin = New System.Windows.Forms.Padding(0)
-        Me.Button4.Name = "Button4"
-        Me.Button4.Size = New System.Drawing.Size(128, 41)
-        Me.Button4.TabIndex = 29
-        Me.Button4.Text = "Nicht Eingereichte Anträge"
-        Me.Button4.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.Button4.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText
-        Me.Button4.UseVisualStyleBackColor = True
-        '
         'btnVZ
         '
         Me.btnVZ.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -932,7 +919,7 @@ Partial Class usrCntlUSTV
         Me.btnPLOSEAlle.ForeColor = System.Drawing.Color.Black
         Me.btnPLOSEAlle.Image = CType(resources.GetObject("btnPLOSEAlle.Image"), System.Drawing.Image)
         Me.btnPLOSEAlle.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnPLOSEAlle.Location = New System.Drawing.Point(629, 7)
+        Me.btnPLOSEAlle.Location = New System.Drawing.Point(491, 7)
         Me.btnPLOSEAlle.Name = "btnPLOSEAlle"
         Me.btnPLOSEAlle.Size = New System.Drawing.Size(132, 40)
         Me.btnPLOSEAlle.TabIndex = 24
@@ -959,12 +946,12 @@ Partial Class usrCntlUSTV
         Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button8.Image = Global.SDL.My.Resources.Resources.statistik_small
         Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button8.Location = New System.Drawing.Point(194, 6)
+        Me.Button8.Location = New System.Drawing.Point(194, 7)
         Me.Button8.Margin = New System.Windows.Forms.Padding(0)
         Me.Button8.Name = "Button8"
-        Me.Button8.Size = New System.Drawing.Size(145, 41)
+        Me.Button8.Size = New System.Drawing.Size(136, 41)
         Me.Button8.TabIndex = 6
-        Me.Button8.Text = "Eingereichte Anträge" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "mit Differenzbetrag"
+        Me.Button8.Text = "Auswertung Anträge"
         Me.Button8.TextAlign = System.Drawing.ContentAlignment.MiddleRight
         Me.Button8.UseVisualStyleBackColor = True
         '
@@ -988,18 +975,45 @@ Partial Class usrCntlUSTV
         Me.ContextMenuStrip4.Name = "ContextMenuStrip1"
         Me.ContextMenuStrip4.Size = New System.Drawing.Size(61, 4)
         '
-        'cbxMWSTnichtFakt
+        'ContextMenuStrip5
         '
-        Me.cbxMWSTnichtFakt.AutoSize = True
+        Me.ContextMenuStrip5.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExportToolStripMenuItem, Me.ImportToolStripMenuItem})
-        Me.cbxMWSTnichtFakt.Checked = True
+        Me.ContextMenuStrip5.Name = "ContextMenuStrip5"
-        Me.cbxMWSTnichtFakt.CheckState = System.Windows.Forms.CheckState.Indeterminate
+        Me.ContextMenuStrip5.Size = New System.Drawing.Size(111, 48)
-        Me.cbxMWSTnichtFakt.Location = New System.Drawing.Point(764, 59)
+        '
-        Me.cbxMWSTnichtFakt.Name = "cbxMWSTnichtFakt"
+        'ExportToolStripMenuItem
-        Me.cbxMWSTnichtFakt.Size = New System.Drawing.Size(152, 17)
+        '
-        Me.cbxMWSTnichtFakt.TabIndex = 80
+        Me.ExportToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.ze_gehen
-        Me.cbxMWSTnichtFakt.Text = "MWST-Eingang nicht fakt."
+        Me.ExportToolStripMenuItem.Name = "ExportToolStripMenuItem"
-        Me.cbxMWSTnichtFakt.ThreeState = True
+        Me.ExportToolStripMenuItem.Size = New System.Drawing.Size(110, 22)
-        Me.cbxMWSTnichtFakt.UseVisualStyleBackColor = True
+        Me.ExportToolStripMenuItem.Text = "Export"
+        '
+        'ImportToolStripMenuItem
+        '
+        Me.ImportToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.ze_kommen
+        Me.ImportToolStripMenuItem.Name = "ImportToolStripMenuItem"
+        Me.ImportToolStripMenuItem.Size = New System.Drawing.Size(110, 22)
+        Me.ImportToolStripMenuItem.Text = "Import"
+        '
+        'ContextMenuStrip6
+        '
+        Me.ContextMenuStrip6.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem1, Me.ToolStripMenuItem2})
+        Me.ContextMenuStrip6.Name = "ContextMenuStrip5"
+        Me.ContextMenuStrip6.Size = New System.Drawing.Size(290, 48)
+        '
+        'ToolStripMenuItem1
+        '
+        Me.ToolStripMenuItem1.Image = Global.SDL.My.Resources.Resources.Excel_logo
+        Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1"
+        Me.ToolStripMenuItem1.Size = New System.Drawing.Size(289, 22)
+        Me.ToolStripMenuItem1.Text = "Eingereichte Anträge mit Differenzbetrag"
+        '
+        'ToolStripMenuItem2
+        '
+        Me.ToolStripMenuItem2.Image = Global.SDL.My.Resources.Resources.Excel_logo
+        Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2"
+        Me.ToolStripMenuItem2.Size = New System.Drawing.Size(289, 22)
+        Me.ToolStripMenuItem2.Text = "Nicht eingereichte Anträge"
         '
         'usrCntlUSTV
         '
@@ -1016,6 +1030,8 @@ Partial Class usrCntlUSTV
         Me.Panel2.ResumeLayout(False)
         Me.Panel2.PerformLayout()
         Me.Panel3.ResumeLayout(False)
+        Me.ContextMenuStrip5.ResumeLayout(False)
+        Me.ContextMenuStrip6.ResumeLayout(False)
         Me.ResumeLayout(False)
 
     End Sub
@@ -1075,11 +1091,15 @@ Partial Class usrCntlUSTV
     Friend WithEvents Label12 As Label
     Friend WithEvents lblID As Label
     Friend WithEvents btnVZ As Button
-    Friend WithEvents Button4 As Button
     Friend WithEvents btn3470 As Button
     Friend WithEvents ContextMenuStrip4 As ContextMenuStrip
     Friend WithEvents btnoffeneAntraege As Button
-    Friend WithEvents btn_Zahlungen_importieren As Button
     Friend WithEvents Button2 As Button
     Friend WithEvents cbxMWSTnichtFakt As CheckBox
+    Friend WithEvents ContextMenuStrip5 As ContextMenuStrip
+    Friend WithEvents ExportToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents ImportToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents ContextMenuStrip6 As ContextMenuStrip
+    Friend WithEvents ToolStripMenuItem1 As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem2 As ToolStripMenuItem
 End Class

SDL/USTV/usrCntlUSTV.resx

@@ -938,4 +938,10 @@
   <metadata name="ContextMenuStrip4.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>487, 17</value>
   </metadata>
+  <metadata name="ContextMenuStrip5.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>643, 17</value>
+  </metadata>
+  <metadata name="ContextMenuStrip6.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>799, 17</value>
+  </metadata>
 </root>

SDL/USTV/usrCntlUSTV.vb

@@ -401,40 +401,8 @@ Public Class usrCntlUSTV
 
     End Sub
 
-    Private Sub Button8_Click_1(sender As Object, e As EventArgs) Handles Button8.Click, Button2.Click
+    Private Sub Button8_Click_1(sender As Object, e As EventArgs) Handles Button8.Click
-
+        ContextMenuStrip6.Show(Cursor.Position)
-        Dim sqlStringSELECT As String = ""
-
-        If sender.Name = "Button2" Then
-            sqlStringSELECT = "SELECT [UStVAn_ID] as ID,[UStVAn_KuNr] as KDNR,[UStVAn_Name] as Kundename,Adressen.LandKz as LKZ_KD, case when UstIdKz is not null and UstIdNr is not null THEN UstIdKz +'' + UstIdNr ELSE isnull(Steuernummer,'') END as SteuerUIDNr,  LfdA.LandKz as LKZ,cast([UStVAn_ReDatVon] as Date) as ReDatVon,cast([UStVAn_ReDatBis] as Date) as ReDatBis , cast(UStVAn_AntragEingereichtAm as Date) as EingereichtAm,[UStVAn_3470] as An3470 ,[UStVAn_Währungscode] as WKZ,[UStVAn_USteuerbetrag] as Steuerbetrag,[UStVAn_Erstattungsbetrag] as Erstattungsbetrag,[UStVAn_USteuerbetragEUR] as SteuerbetragEUR,[UStVAn_ErstattungsbetragEUR] as ErstattungsbetragEUR,(cast([UStVAn_USteuerbetragEUR] as decimal(17,2)) - cast( [UStVAn_ErstattungsbetragEUR]  as decimal(17,2))) as DifferenzbetragEUR, [UStVAn_Sachbearbeiter] as Sachbearbeiter, UStVAn_AntragArt as Art, stnr.[StNrFürRückerstattungUSt] as SteuerNr,'' as BANK, ''as Diff, '' as BelNr,(isnull(UStVAn_VZBetrag,0) - isnull(UStVAn_RZBetragVZ,0)) as VZ, '' as '3470', '' as GS, '' as RZVZ, '' as Info, '' as VZDIFF,'' as 'RG Retour'"
-        Else
-            sqlStringSELECT = "SELECT [UStVAn_ID] as ID,[UStVAn_KuNr] as KDNR,[UStVAn_Name] as Kundename,Adressen.LandKz as LKZ_KD, case when UstIdKz is not null and UstIdNr is not null THEN UstIdKz +'' + UstIdNr ELSE isnull(Steuernummer,'') END as SteuerUIDNr,  LfdA.LandKz as LKZ,cast([UStVAn_ReDatVon] as Date) as ReDatVon,cast([UStVAn_ReDatBis] as Date) as ReDatBis , cast(UStVAn_AntragEingereichtAm as Date) as EingereichtAm,[UStVAn_3470] as An3470 ,[UStVAn_Währungscode] as WKZ,[UStVAn_USteuerbetrag] as Steuerbetrag,[UStVAn_Erstattungsbetrag] as Erstattungsbetrag,[UStVAn_USteuerbetragEUR] as SteuerbetragEUR,[UStVAn_ErstattungsbetragEUR] as ErstattungsbetragEUR,(cast([UStVAn_USteuerbetragEUR] as decimal(17,2)) - cast( [UStVAn_ErstattungsbetragEUR]  as decimal(17,2))) as DifferenzbetragEUR, (isnull(UStVAn_VZBetrag,0) - isnull(UStVAn_RZBetragVZ,0)) as VZ, [UStVAn_Sachbearbeiter] as Sachbearbeiter, UStVAn_AntragArt as Art, stnr.[StNrFürRückerstattungUSt] as SteuerNr"
-        End If
-
-        Dim sqlStr = sqlStringSELECT & " FROM [tblUStVAntrag] 
-				  inner join [Länderverzeichnis für die Außenhandelsstatistik] as LfdA on UStVAn_LandNr=Landnr
-				  inner join Adressen on AdressenNr=UStVAn_KuNr
-				  left join [tblSteuernummern] as stnr on stnr.AdressenNr = UStVAn_KuNr and stnr.LandNr=UStVAn_LandNr
-                    where 1=1  
-                      AND cast( [UStVAn_USteuerbetragEUR] as decimal(17,2))-cast( [UStVAn_ErstattungsbetragEUR]  as decimal(17,2))<>0
-                      AND UStVAn_AntragEingereichtAm is not null
-                  order by UStVAn_KuNr,UStVAn_Name,datepart(year,[UStVAn_ReDatVon] ) desc,LfdA .LandKz,[UStVAn_ReDatVon] desc"
-
-        Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL")
-        If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
-
-            Select Case sender.Name
-                Case "Button8"
-                    cProgramFunctions.genExcelFromDT_NEW(dt, ,,,,, True,,,,,, {"L1:Q" & (dt.Rows.Count + 1)})
-                Case Else
-                    cProgramFunctions.genExcelFromDT_NEW(dt, ,, "MWST-Eingang " & Today.ToShortDateString,,, True,,,,,, {"L1:Q" & (dt.Rows.Count + 1)}, {"D", "E", "I", "J", "M", "O", "N", "Q", "R", "S"})
-            End Select
-
-
-
-        Else
-            MsgBox("Keine Daten!")
-        End If
 
     End Sub
 
@@ -1776,24 +1744,9 @@ Public Class usrCntlUSTV
 
     End Sub
 
-    Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click
+    Private Sub Button4_Click(sender As Object, e As EventArgs)
 
 
-        Dim sqlStr = "SELECT [UStVAn_ID] as ID,[UStVAn_KuNr] as KundenNr,[UStVAn_Name] as Kundename,Adressen.LandKz as Land_Kunde, case when UstIdKz is not null and UstIdNr is not null THEN UstIdKz +'' + UstIdNr ELSE isnull(Steuernummer,'') END as SteuerUIDNr,  LfdA .LandKz Land_Antrag,cast([UStVAn_ReDatVon] as Date) as ReDatVon,cast([UStVAn_ReDatBis] as Date) as ReDatBis , cast(UStVAn_AntragEingereichtAm as Date) as EingereichtAm,[UStVAn_3470] as An3470 ,[UStVAn_Währungscode] as Währung,[UStVAn_USteuerbetrag] as Steuerbetrag,[UStVAn_Erstattungsbetrag] as Erstattungsbetrag,[UStVAn_USteuerbetragEUR] as SteuerbetragEUR,[UStVAn_ErstattungsbetragEUR] as ErstattungsbetragEUR,(cast([UStVAn_USteuerbetragEUR] as decimal(17,2)) - cast( [UStVAn_ErstattungsbetragEUR]  as decimal(17,2))) as DifferenzbetragEUR, UStVAn_VZBetrag as Vorauszahlungsbetrag, [UStVAn_Sachbearbeiter] as Sachbearbeiter, UStVAn_AntragArt as Art, stnr.[StNrFürRückerstattungUSt] as SteuerNr
-                  FROM [tblUStVAntrag] 
-				  inner join [Länderverzeichnis für die Außenhandelsstatistik] as LfdA on UStVAn_LandNr=Landnr
-				  inner join Adressen on AdressenNr=UStVAn_KuNr
-				  left join [tblSteuernummern] as stnr on stnr.AdressenNr = UStVAn_KuNr and stnr.LandNr=UStVAn_LandNr
-                    where 1=1 AND UStVAn_AntragEingereichtAm is null
-                  order by UStVAn_KuNr,UStVAn_Name,datepart(year,[UStVAn_ReDatVon] ) desc,LfdA .LandKz,[UStVAn_ReDatVon] desc"
-
-        Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL")
-        If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
-            cProgramFunctions.genExcelFromDT_NEW(dt, {"J1:M" & (dt.Rows.Count + 1)},,,,, True)
-        Else
-            MsgBox("Keine Daten!")
-        End If
-
     End Sub
 
     Private Sub btnoffeneAntraege_Click(sender As Object, e As EventArgs) Handles btnoffeneAntraege.Click
@@ -1802,7 +1755,98 @@ Public Class usrCntlUSTV
         init(,,, True)
     End Sub
 
-    Private Sub btn_Zahlungen_importieren_Click(sender As Object, e As EventArgs) Handles btn_Zahlungen_importieren.Click
+    Private Sub btn_Zahlungen_importieren_Click(sender As Object, e As EventArgs)
+
+
+    End Sub
+
+    Function getTrimedString(s As String, l As Integer) As String
+        Try
+            If s Is Nothing Then Return ""
+            If s.ToString.Length > l Then
+                Return s.Substring(0, l)
+            End If
+            Return s.ToString
+
+        Catch ex As Exception
+            MsgBox("getTrimedString: " & ex.Message & ex.StackTrace)
+        End Try
+        Return ""
+    End Function
+    Function getTrimedStringACCES(s As Object, l As Integer) As String
+
+        Try
+            If s Is Nothing Then Return ""
+            If s Is DBNull.Value Then Return ""
+            If s.ToString.Length > l Then
+                Return s.Substring(0, l)
+            End If
+            Return s
+
+        Catch ex As Exception
+            MsgBox("getTrimedString: " & ex.Message & ex.StackTrace)
+        End Try
+        Return ""
+    End Function
+    Function getTrimedStringACCESEUR(s As Object, l As Integer) As String
+
+        Try
+            If s Is Nothing Then Return ""
+            If s Is DBNull.Value Then Return ""
+            If s.ToString.Length > l Then
+                Return s.Substring(0, l)
+            End If
+
+            If IsNumeric(s) Then
+                Return CDbl(s).ToString("C2")
+            End If
+
+            Return s
+
+        Catch ex As Exception
+            MsgBox("getTrimedString: " & ex.Message & ex.StackTrace)
+        End Try
+        Return ""
+    End Function
+
+    Function isleernothing(s) As Object
+        If s Is DBNull.Value Then Return Nothing
+        If s.ToString.Trim = "" Then Return Nothing
+        Return s.trim
+    End Function
+
+    Private Sub Button2_Click_1(sender As Object, e As EventArgs) Handles Button2.Click
+        ContextMenuStrip5.Show(Cursor.Position)
+    End Sub
+
+    Private Sub ExportToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ExportToolStripMenuItem.Click
+
+
+        Dim sqlStr As String = "SELECT [UStVAn_ID] as ID,[UStVAn_KuNr] as KDNR,[UStVAn_Name] as Kundename,Adressen.LandKz as LKZ_KD, case when UstIdKz is not null and UstIdNr is not null THEN UstIdKz +'' + UstIdNr ELSE isnull(Steuernummer,'') END as SteuerUIDNr,  LfdA.LandKz as LKZ,cast([UStVAn_ReDatVon] as Date) as ReDatVon,cast([UStVAn_ReDatBis] as Date) as ReDatBis , cast(UStVAn_AntragEingereichtAm as Date) as EingereichtAm,[UStVAn_3470] as An3470 ,[UStVAn_Währungscode] as WKZ,[UStVAn_USteuerbetrag] as Steuerbetrag,[UStVAn_Erstattungsbetrag] as Erstattungsbetrag,[UStVAn_USteuerbetragEUR] as SteuerbetragEUR,[UStVAn_ErstattungsbetragEUR] as ErstattungsbetragEUR,(cast([UStVAn_USteuerbetragEUR] as decimal(17,2)) - cast( [UStVAn_ErstattungsbetragEUR]  as decimal(17,2))) as DifferenzbetragEUR, [UStVAn_Sachbearbeiter] as Sachbearbeiter, UStVAn_AntragArt as Art, stnr.[StNrFürRückerstattungUSt] as SteuerNr,'' as BANK, ''as Diff, '' as BelNr,(isnull(UStVAn_VZBetrag,0) - isnull(UStVAn_RZBetragVZ,0)) as VZ, '' as '3470', '' as GS, '' as RZVZ, '' as Info, '' as VZDIFF,'' as 'RG Retour' FROM [tblUStVAntrag] 
+				  inner join [Länderverzeichnis für die Außenhandelsstatistik] as LfdA on UStVAn_LandNr=Landnr
+				  inner join Adressen on AdressenNr=UStVAn_KuNr
+				  left join [tblSteuernummern] as stnr on stnr.AdressenNr = UStVAn_KuNr and stnr.LandNr=UStVAn_LandNr
+                    where 1=1  
+                      AND cast( [UStVAn_USteuerbetragEUR] as decimal(17,2))-cast( [UStVAn_ErstattungsbetragEUR]  as decimal(17,2))<>0
+                      AND UStVAn_AntragEingereichtAm is not null
+                  order by UStVAn_KuNr,UStVAn_Name,datepart(year,[UStVAn_ReDatVon] ) desc,LfdA .LandKz,[UStVAn_ReDatVon] desc"
+
+        Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL")
+        If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
+
+            cProgramFunctions.genExcelFromDT_NEW(dt, ,, "MWST-Eingang " & Today.ToShortDateString,,, True,,,,,, {"L1:Q" & (dt.Rows.Count + 1)}, {"D", "E", "I", "J", "M", "O", "N", "Q", "R", "S"})
+
+
+        Else
+            MsgBox("Keine Daten!")
+        End If
+
+
+
+    End Sub
+
+    Private Sub ImportToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ImportToolStripMenuItem.Click
+
         Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
 
         Try
@@ -1848,7 +1892,19 @@ Public Class usrCntlUSTV
                 exclApp.DisplayAlerts = False
                 exclApp.CutCopyMode = False
 
-                Datei = exclApp.Workbooks.Open(fd.FileName)
+                'Try to open exclusively
+                Datei = exclApp.Workbooks.Open(
+                Filename:=fd.FileName,
+                ReadOnly:=False,
+                IgnoreReadOnlyRecommended:=True,
+                Notify:=False)
+
+                If Datei.ReadOnly Then
+                    MessageBox.Show("Die Datei wird bereits von einem anderen Benutzer oder einer anderen Excel-Instanz verwendet, bitte Datei vor dem Import schließen!")
+                    Exit Sub
+                End If
+
+
                 Blatt = Datei.Worksheets(1)
 
                 ' Header einlesen
@@ -2090,7 +2146,7 @@ Public Class usrCntlUSTV
                     MsgBox("keine zu importierende Daten vorhanden!")
                     Exit Sub
 
-                    End If
+                End If
 
 
 
@@ -2154,67 +2210,43 @@ Public Class usrCntlUSTV
         Me.Refresh()
 
 
-
     End Sub
 
-    Function getTrimedString(s As String, l As Integer) As String
+    Private Sub ToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem1.Click
-        Try
-            If s Is Nothing Then Return ""
-            If s.ToString.Length > l Then
-                Return s.Substring(0, l)
-            End If
-            Return s.ToString
 
-        Catch ex As Exception
+        Dim sqlStr = "SELECT [UStVAn_ID] as ID,[UStVAn_KuNr] as KDNR,[UStVAn_Name] as Kundename,Adressen.LandKz as LKZ_KD, case when UstIdKz is not null and UstIdNr is not null THEN UstIdKz +'' + UstIdNr ELSE isnull(Steuernummer,'') END as SteuerUIDNr,  LfdA.LandKz as LKZ,cast([UStVAn_ReDatVon] as Date) as ReDatVon,cast([UStVAn_ReDatBis] as Date) as ReDatBis , cast(UStVAn_AntragEingereichtAm as Date) as EingereichtAm,[UStVAn_3470] as An3470 ,[UStVAn_Währungscode] as WKZ,[UStVAn_USteuerbetrag] as Steuerbetrag,[UStVAn_Erstattungsbetrag] as Erstattungsbetrag,[UStVAn_USteuerbetragEUR] as SteuerbetragEUR,[UStVAn_ErstattungsbetragEUR] as ErstattungsbetragEUR,(cast([UStVAn_USteuerbetragEUR] as decimal(17,2)) - cast( [UStVAn_ErstattungsbetragEUR]  as decimal(17,2))) as DifferenzbetragEUR, (isnull(UStVAn_VZBetrag,0) - isnull(UStVAn_RZBetragVZ,0)) as VZ, [UStVAn_Sachbearbeiter] as Sachbearbeiter, UStVAn_AntragArt as Art, stnr.[StNrFürRückerstattungUSt] as SteuerNr FROM [tblUStVAntrag] 
-            MsgBox("getTrimedString: " & ex.Message & ex.StackTrace)
+				  inner join [Länderverzeichnis für die Außenhandelsstatistik] as LfdA on UStVAn_LandNr=Landnr
-        End Try
+				  inner join Adressen on AdressenNr=UStVAn_KuNr
-        Return ""
+				  left join [tblSteuernummern] as stnr on stnr.AdressenNr = UStVAn_KuNr and stnr.LandNr=UStVAn_LandNr
-    End Function
+                    where 1=1  
-    Function getTrimedStringACCES(s As Object, l As Integer) As String
+                      AND cast( [UStVAn_USteuerbetragEUR] as decimal(17,2))-cast( [UStVAn_ErstattungsbetragEUR]  as decimal(17,2))<>0
-
+                      AND UStVAn_AntragEingereichtAm is not null
-        Try
+                  order by UStVAn_KuNr,UStVAn_Name,datepart(year,[UStVAn_ReDatVon] ) desc,LfdA .LandKz,[UStVAn_ReDatVon] desc"
-            If s Is Nothing Then Return ""
-            If s Is DBNull.Value Then Return ""
-            If s.ToString.Length > l Then
-                Return s.Substring(0, l)
-            End If
-            Return s
-
-        Catch ex As Exception
-            MsgBox("getTrimedString: " & ex.Message & ex.StackTrace)
-        End Try
-        Return ""
-    End Function
-    Function getTrimedStringACCESEUR(s As Object, l As Integer) As String
-
-        Try
-            If s Is Nothing Then Return ""
-            If s Is DBNull.Value Then Return ""
-            If s.ToString.Length > l Then
-                Return s.Substring(0, l)
-            End If
-
-            If IsNumeric(s) Then
-                Return CDbl(s).ToString("C2")
-            End If
-
-            Return s
-
-        Catch ex As Exception
-            MsgBox("getTrimedString: " & ex.Message & ex.StackTrace)
-        End Try
-        Return ""
-    End Function
-
-    Function isleernothing(s) As Object
-        If s Is DBNull.Value Then Return Nothing
-        If s.ToString.Trim = "" Then Return Nothing
-        Return s.trim
-    End Function
-
-    Private Sub Button2_Click_1(sender As Object, e As EventArgs) Handles Button2.Click
 
+        Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL")
+        If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
+            cProgramFunctions.genExcelFromDT_NEW(dt, ,,,,, True,,,,,, {"L1:Q" & (dt.Rows.Count + 1)})
+        Else
+            MsgBox("Keine Daten!")
+        End If
     End Sub
 
+    Private Sub ToolStripMenuItem2_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem2.Click
 
+
+        Dim sqlStr = "SELECT [UStVAn_ID] as ID,[UStVAn_KuNr] as KundenNr,[UStVAn_Name] as Kundename,Adressen.LandKz as Land_Kunde, case when UstIdKz is not null and UstIdNr is not null THEN UstIdKz +'' + UstIdNr ELSE isnull(Steuernummer,'') END as SteuerUIDNr,  LfdA .LandKz Land_Antrag,cast([UStVAn_ReDatVon] as Date) as ReDatVon,cast([UStVAn_ReDatBis] as Date) as ReDatBis , cast(UStVAn_AntragEingereichtAm as Date) as EingereichtAm,[UStVAn_3470] as An3470 ,[UStVAn_Währungscode] as Währung,[UStVAn_USteuerbetrag] as Steuerbetrag,[UStVAn_Erstattungsbetrag] as Erstattungsbetrag,[UStVAn_USteuerbetragEUR] as SteuerbetragEUR,[UStVAn_ErstattungsbetragEUR] as ErstattungsbetragEUR,(cast([UStVAn_USteuerbetragEUR] as decimal(17,2)) - cast( [UStVAn_ErstattungsbetragEUR]  as decimal(17,2))) as DifferenzbetragEUR, UStVAn_VZBetrag as Vorauszahlungsbetrag, [UStVAn_Sachbearbeiter] as Sachbearbeiter, UStVAn_AntragArt as Art, stnr.[StNrFürRückerstattungUSt] as SteuerNr
+                  FROM [tblUStVAntrag] 
+				  inner join [Länderverzeichnis für die Außenhandelsstatistik] as LfdA on UStVAn_LandNr=Landnr
+				  inner join Adressen on AdressenNr=UStVAn_KuNr
+				  left join [tblSteuernummern] as stnr on stnr.AdressenNr = UStVAn_KuNr and stnr.LandNr=UStVAn_LandNr
+                    where 1=1 AND UStVAn_AntragEingereichtAm is null
+                  order by UStVAn_KuNr,UStVAn_Name,datepart(year,[UStVAn_ReDatVon] ) desc,LfdA .LandKz,[UStVAn_ReDatVon] desc"
+
+        Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL")
+        If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
+            cProgramFunctions.genExcelFromDT_NEW(dt, {"J1:M" & (dt.Rows.Count + 1)},,,,, True)
+        Else
+            MsgBox("Keine Daten!")
+        End If
+    End Sub
 End Class