USTVAnträge, zusätzliche Dokum. im Kundenblatt

SDL/SDL.vbproj

@@ -634,6 +634,12 @@
     <Compile Include="Formulare\KDFormulare\FormulareBaukasten\usrcntlVollmacht_GB_IE.vb">
       <SubType>UserControl</SubType>
     </Compile>
+    <Compile Include="Formulare\KDFormulare\FormulareBaukasten\usrCntlImportverzollung.Designer.vb">
+      <DependentUpon>usrCntlImportverzollung.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Formulare\KDFormulare\FormulareBaukasten\usrCntlImportverzollung.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="Formulare\KDFormulare\FormulareBaukasten\usrCntlZollbeschau.Designer.vb">
       <DependentUpon>usrCntlZollbeschau.vb</DependentUpon>
     </Compile>
@@ -3137,6 +3143,9 @@
     <EmbeddedResource Include="Formulare\KDFormulare\FormulareBaukasten\usrcntlVollmacht_GB_IE.resx">
       <DependentUpon>usrcntlVollmacht_GB_IE.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Formulare\KDFormulare\FormulareBaukasten\usrCntlImportverzollung.resx">
+      <DependentUpon>usrCntlImportverzollung.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Formulare\KDFormulare\FormulareBaukasten\usrCntlZollbeschau.resx">
       <DependentUpon>usrCntlZollbeschau.vb</DependentUpon>
     </EmbeddedResource>

SDL/USTV/frmMDM_USTVAntrag.vb

@@ -33,7 +33,7 @@ Public Class frmMDM_USTVAntrag
 
             .SET_SQL("SELECT  [UStVAn_ID] ,[UStVPo_ID] ,[UStVPo_ReDat],[UStVPo_ReNr],[UStVPo_Leistungsbezeichnung],[UStVPo_Leistender],leist.[UstV_Leistender_Strasse] + ' ' + leist.[UstV_Leistender_StrasseNr] as [UstV_Leistender_Strasse],leist.[UstV_Leistender_PLZ],leist.[UstV_Leistender_Stadt],leist.[UstV_Leistender_Land],leist.[UstV_Leistender_UstNr],[UStVPo_USteuerbetrag],[UStVPo_Schnittstelle],[UStVPo_SchnittstellenNr],[UStVPo_Umrechnungskurs],[UStVPo_USteuerbetragEUR],[UStVPo_Sachbearbeiter] 
                       FROM [tblUStVPositionen] 
-                      inner join [tblUStVLeistender] as leist on leist.UStV_Leistender = [tblUStVPositionen].[UStVPo_Leistender]                     
+                      left join [tblUStVLeistender] as leist on leist.UStV_Leistender = [tblUStVPositionen].[UStVPo_Leistender]                     
                       where UStVAn_ID='" & UStVAn_ID & "' ORDER BY UStVPo_ID", "FMZOLL")
             .LOAD()
             .RowTemplate.Height = 20

SDL/kunden/frmKundenblatt.Designer.vb

@@ -186,6 +186,8 @@ Partial Class frmKundenblatt
         Me.tbiKartenverwaltung = New System.Windows.Forms.ToolStripMenuItem()
         Me.tbiLKW = New System.Windows.Forms.ToolStripMenuItem()
         Me.tbiVERAGCard = New System.Windows.Forms.ToolStripMenuItem()
+        Me.scanUSTVsonstigeDokumente = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
+        Me.Label8 = New System.Windows.Forms.Label()
         Me.pnlInfo.SuspendLayout()
         Me.tbFirmendaten.SuspendLayout()
         Me.Panel4.SuspendLayout()
@@ -261,7 +263,7 @@ Partial Class frmKundenblatt
         Me.tbFirmendaten.Location = New System.Drawing.Point(4, 25)
         Me.tbFirmendaten.Name = "tbFirmendaten"
         Me.tbFirmendaten.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbFirmendaten.Size = New System.Drawing.Size(1630, 744)
+        Me.tbFirmendaten.Size = New System.Drawing.Size(1630, 761)
         Me.tbFirmendaten.TabIndex = 3
         Me.tbFirmendaten.Text = "Firmendaten"
         '
@@ -271,7 +273,7 @@ Partial Class frmKundenblatt
         Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill
         Me.Panel4.Location = New System.Drawing.Point(3, 3)
         Me.Panel4.Name = "Panel4"
-        Me.Panel4.Size = New System.Drawing.Size(1624, 738)
+        Me.Panel4.Size = New System.Drawing.Size(1624, 755)
         Me.Panel4.TabIndex = 0
         '
         'UsrcntlKundeBearbeitenFull1
@@ -281,7 +283,7 @@ Partial Class frmKundenblatt
         Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0)
         Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1"
-        Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1624, 738)
+        Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1624, 755)
         Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0
         '
         'tbcntrMain
@@ -721,7 +723,7 @@ Partial Class frmKundenblatt
         Me.tbZoll.Location = New System.Drawing.Point(4, 25)
         Me.tbZoll.Name = "tbZoll"
         Me.tbZoll.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbZoll.Size = New System.Drawing.Size(1630, 744)
+        Me.tbZoll.Size = New System.Drawing.Size(1630, 761)
         Me.tbZoll.TabIndex = 9
         Me.tbZoll.Text = "ZOLL"
         Me.tbZoll.UseVisualStyleBackColor = True
@@ -733,7 +735,7 @@ Partial Class frmKundenblatt
         Me.tbcntrZOLL.Location = New System.Drawing.Point(3, 3)
         Me.tbcntrZOLL.Name = "tbcntrZOLL"
         Me.tbcntrZOLL.SelectedIndex = 0
-        Me.tbcntrZOLL.Size = New System.Drawing.Size(1624, 738)
+        Me.tbcntrZOLL.Size = New System.Drawing.Size(1624, 755)
         Me.tbcntrZOLL.TabIndex = 0
         '
         'tabZoll_Artikel
@@ -741,7 +743,7 @@ Partial Class frmKundenblatt
         Me.tabZoll_Artikel.Location = New System.Drawing.Point(4, 22)
         Me.tabZoll_Artikel.Name = "tabZoll_Artikel"
         Me.tabZoll_Artikel.Padding = New System.Windows.Forms.Padding(3)
-        Me.tabZoll_Artikel.Size = New System.Drawing.Size(1616, 712)
+        Me.tabZoll_Artikel.Size = New System.Drawing.Size(1616, 729)
         Me.tabZoll_Artikel.TabIndex = 1
         Me.tabZoll_Artikel.Text = "Artikel"
         Me.tabZoll_Artikel.UseVisualStyleBackColor = True
@@ -752,7 +754,7 @@ Partial Class frmKundenblatt
         Me.tbMdm.Location = New System.Drawing.Point(4, 25)
         Me.tbMdm.Name = "tbMdm"
         Me.tbMdm.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbMdm.Size = New System.Drawing.Size(1630, 744)
+        Me.tbMdm.Size = New System.Drawing.Size(1630, 761)
         Me.tbMdm.TabIndex = 10
         Me.tbMdm.Text = "MDM"
         Me.tbMdm.UseVisualStyleBackColor = True
@@ -770,7 +772,7 @@ Partial Class frmKundenblatt
         Me.tbcntrMDM.Margin = New System.Windows.Forms.Padding(0)
         Me.tbcntrMDM.Name = "tbcntrMDM"
         Me.tbcntrMDM.SelectedIndex = 0
-        Me.tbcntrMDM.Size = New System.Drawing.Size(1624, 738)
+        Me.tbcntrMDM.Size = New System.Drawing.Size(1624, 755)
         Me.tbcntrMDM.TabIndex = 0
         '
         'tbSDL
@@ -782,7 +784,7 @@ Partial Class frmKundenblatt
         Me.tbSDL.Margin = New System.Windows.Forms.Padding(0)
         Me.tbSDL.Name = "tbSDL"
         Me.tbSDL.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbSDL.Size = New System.Drawing.Size(1616, 712)
+        Me.tbSDL.Size = New System.Drawing.Size(1616, 729)
         Me.tbSDL.TabIndex = 5
         Me.tbSDL.Text = "SDL-Leistungen"
         Me.tbSDL.UseVisualStyleBackColor = True
@@ -824,7 +826,7 @@ Partial Class frmKundenblatt
         DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
         Me.dgvSDLLeistungenFull.RowHeadersDefaultCellStyle = DataGridViewCellStyle10
         Me.dgvSDLLeistungenFull.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1610, 516)
+        Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1610, 533)
         Me.dgvSDLLeistungenFull.TabIndex = 5
         '
         'Panel6
@@ -928,7 +930,7 @@ Partial Class frmKundenblatt
         Me.Panel5.Controls.Add(Me.lblLetzterSA_SDL)
         Me.Panel5.Controls.Add(Me.rtbVermerke)
         Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.Panel5.Location = New System.Drawing.Point(3, 566)
+        Me.Panel5.Location = New System.Drawing.Point(3, 583)
         Me.Panel5.Name = "Panel5"
         Me.Panel5.Size = New System.Drawing.Size(1610, 143)
         Me.Panel5.TabIndex = 177
@@ -1792,7 +1794,7 @@ Partial Class frmKundenblatt
         Me.tbOfferte.Location = New System.Drawing.Point(4, 25)
         Me.tbOfferte.Margin = New System.Windows.Forms.Padding(2)
         Me.tbOfferte.Name = "tbOfferte"
-        Me.tbOfferte.Size = New System.Drawing.Size(1630, 744)
+        Me.tbOfferte.Size = New System.Drawing.Size(1630, 761)
         Me.tbOfferte.TabIndex = 11
         Me.tbOfferte.Text = "Offerte"
         Me.tbOfferte.UseVisualStyleBackColor = True
@@ -1804,7 +1806,7 @@ Partial Class frmKundenblatt
         Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0)
         Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1)
         Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1"
-        Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1630, 744)
+        Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1630, 761)
         Me.UsrCntlOfferte1.TabIndex = 0
         '
         'tbUSTV
@@ -1831,6 +1833,8 @@ Partial Class frmKundenblatt
         '
         'tbUSTVDokumente
         '
+        Me.tbUSTVDokumente.Controls.Add(Me.Label8)
+        Me.tbUSTVDokumente.Controls.Add(Me.scanUSTVsonstigeDokumente)
         Me.tbUSTVDokumente.Controls.Add(Me.Label27)
         Me.tbUSTVDokumente.Controls.Add(Me.Label37)
         Me.tbUSTVDokumente.Controls.Add(Me.scanUSTVFABest)
@@ -1906,7 +1910,7 @@ Partial Class frmKundenblatt
         Me.tbUSTVAntrage.Location = New System.Drawing.Point(4, 22)
         Me.tbUSTVAntrage.Name = "tbUSTVAntrage"
         Me.tbUSTVAntrage.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbUSTVAntrage.Size = New System.Drawing.Size(1622, 735)
+        Me.tbUSTVAntrage.Size = New System.Drawing.Size(184, 45)
         Me.tbUSTVAntrage.TabIndex = 9
         Me.tbUSTVAntrage.Text = "USTV-Anträge"
         Me.tbUSTVAntrage.UseVisualStyleBackColor = True
@@ -1916,7 +1920,7 @@ Partial Class frmKundenblatt
         Me.UsrCntlUSTV.Dock = System.Windows.Forms.DockStyle.Fill
         Me.UsrCntlUSTV.Location = New System.Drawing.Point(3, 3)
         Me.UsrCntlUSTV.Name = "UsrCntlUSTV"
-        Me.UsrCntlUSTV.Size = New System.Drawing.Size(1616, 729)
+        Me.UsrCntlUSTV.Size = New System.Drawing.Size(178, 39)
         Me.UsrCntlUSTV.TabIndex = 0
         '
         'cntxtExcel
@@ -2061,7 +2065,6 @@ Partial Class frmKundenblatt
         '
         Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM"
-        Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8
         Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4)
         Me.cntxtCntxtMDM.Text = "cntxtMDM"
         '
@@ -2195,6 +2198,35 @@ Partial Class frmKundenblatt
         Me.tbiVERAGCard.Size = New System.Drawing.Size(186, 22)
         Me.tbiVERAGCard.Text = "VERAG Card"
         '
+        'scanUSTVsonstigeDokumente
+        '
+        Me.scanUSTVsonstigeDokumente._DATENSERVER_KATEGORIE = "DOKUMENTE"
+        Me.scanUSTVsonstigeDokumente._DATENSERVER_ORDNER = "MDM"
+        Me.scanUSTVsonstigeDokumente._DATENSERVER_UOrdner1 = ""
+        Me.scanUSTVsonstigeDokumente._DATENSERVER_UOrdner2 = ""
+        Me.scanUSTVsonstigeDokumente._DATENSERVER_UOrdner3 = ""
+        Me.scanUSTVsonstigeDokumente._OPEN_ORIGINAL = False
+        Me.scanUSTVsonstigeDokumente._TYPE = "PDF"
+        Me.scanUSTVsonstigeDokumente.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+        Me.scanUSTVsonstigeDokumente.BackColor = System.Drawing.Color.White
+        Me.scanUSTVsonstigeDokumente.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.scanUSTVsonstigeDokumente.Cursor = System.Windows.Forms.Cursors.Default
+        Me.scanUSTVsonstigeDokumente.Location = New System.Drawing.Point(607, 36)
+        Me.scanUSTVsonstigeDokumente.Margin = New System.Windows.Forms.Padding(0)
+        Me.scanUSTVsonstigeDokumente.Name = "scanUSTVsonstigeDokumente"
+        Me.scanUSTVsonstigeDokumente.Size = New System.Drawing.Size(285, 505)
+        Me.scanUSTVsonstigeDokumente.TabIndex = 7
+        '
+        'Label8
+        '
+        Me.Label8.AutoSize = True
+        Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label8.Location = New System.Drawing.Point(604, 17)
+        Me.Label8.Name = "Label8"
+        Me.Label8.Size = New System.Drawing.Size(126, 13)
+        Me.Label8.TabIndex = 8
+        Me.Label8.Text = "sonstige Dokumente:"
+        '
         'frmKundenblatt
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -2425,4 +2457,6 @@ Partial Class frmKundenblatt
     Friend WithEvents scanUSTVVollmachten As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList
     Friend WithEvents tbUSTVAntrage As TabPage
     Friend WithEvents UsrCntlUSTV As usrCntlUSTV
+    Friend WithEvents Label8 As Label
+    Friend WithEvents scanUSTVsonstigeDokumente As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList
 End Class