Update Div. Anpassungen Erneuerung DMS

2022-12-26 10:23:09 +01:00
parent 406d053e79
commit 7b68dffd3f
31 changed files with 750 additions and 670 deletions
--- a/EDOKA/Dokumentmanagement/frmBarcodeKleber.resx
+++ b/EDOKA/Dokumentmanagement/frmBarcodeKleber.resx
@@ -120,20 +120,20 @@
  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="Button1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAALHSURBVDhPdZNrSJNRGMel5m2ummPpwNDU/CAiCdGHiGFUpIVWZhiVDLcRiAYuUbTl/Vr2wYV4
-        oYsTKkxFp+alslhGgda8lKmplKbmZTrn0nmp5N97znSZ1oHfh/c5z/N7nsM5r0VreWgHA9oqRXhfE4bu
-        OjF66iV/8alRCgZ9d50kzGLjIsUw5kDbF4/+5giQ7/43yZgZLQOgMbNoeIKux2L9PwUr8zewMmdieSYL
-        k73xVITBm8DQKvoK1FafgedDPjzu8XLNIpL4y3Cd8nOWkE0h8eXOaKx0xQDdsZTqyiDsKeHBqXg7nBU7
-        1FRCEn/MZNPOy7o/kLhRI8NSR7RZ0F4lgluR/SHBbQ54+bZwzOCkUMHSVCYWtatMZmKBgcRnW6NgbJOh
-        VyNFQKUXAh94gTQV3OKobIstYZ9io6eChYkMGMfTYRxLx/wqJK59fRnvXongW+GBKl0ZTlT5UoFjlp2a
-        CDjJVqCCudE0zI2k4TthOBUGBhJXPz2Psw1CqHTliOoUwTWfS8ZW8nPZIAK23NIkMHxNxexQCvRfCMwV
-        fk5GRfkpBDcKoTY+Q7gmEAfqd2F3HhdO+duw875JYB3LMglIgW4gCbr+JEz3JeFbZxz8a3zwcqEJERp/
-        HGtypwJvlQNcy7hUwC5kBJe2qqlgui8RU72J0PYk0NFbykJxtGIvwlv8ENzsuUnAV7JhLWPpWZItPlRA
-        Cic+XsP4BzkVNNy5gMKiAAgLXODX4G4WeJby4ZBjB5tI1qCllCleewekcKzzKkbbTS+wuuAcHilCUFty
-        EUKFCw6qnOkR+ElsZOYK6U2sf4n63heRGNHEY/htHBWUZB9HXsIRlOeeRM3dIOxLE8CnVACe3BbPlSGm
-        zmuLKeAyqNqrxRhovoI2lRgxkv1RzL7bWg5HZsW1jWCprKRblZt+pnWi04xITyZQyA97/zdxw8ZvRHI4
-        8Bya8wcAAAAASUVORK5CYII=
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAslJREFUOE+F
+        kltIk2EcxkfOw+aqOZYODE3NCxFJiC4ihlGRFlqZYVQiOglEA5comuk8a9nFDPFABydU2BTdNA+VxTIK
+        tKauTE2lNLXU6Zym81DJ0/e+W5Pyoj/8Lr7n+57f+4f3Y3XWRPQwoKsuEu8aotDXFI3+ZslffGyNIRj7
+        miRRrH+HlGEqgn4wFUPtcSDPQ68zMTehBKC1srLwGL2Poo2W2saQwvrSdawvmlmbK8D0QCoVYeQGMGrB
+        WItG9Wn4PBDC+65AbqmbBb8WrlF+zhMKKSRf0yVivTcJ6EumqOtCsbtKANfKbXAr3q6xCn7MFdKT1wwb
+        kNyklWK1J9Eq6K6PhGeF00HRLR4EpRy45PGyqGB1Jh8regvT+VhmIPl8ZwJMXVIMaGMQXOeLkPu+IIeK
+        bvJUnEpbOGU5GKlgeSoPpslcmL7lYskCyfWvLuHty0gE1Hqj3qDE8foAKnApcNQQAS/TDlSwOJGDxfEc
+        fCeMZWOBgeSaJ+dwpkUMlaEGCbpIeJTyydoKoZwLIuCm2ZoFC1+yMT+aBeNnAnOFnzJRW3MSYa1iaExP
+        EasNwf7mndhVwodr6VbsuGcW2CezzQJSMAzLYBiSYXZQhq+6FAQ1+OPFchvitEE42uZFBX4qZ3go+VTA
+        LWcEF200VDA7mIGZgQzo+9Pp6h3KCByp3YPYjkCEtftsEggVXNhL2Ua2ZIs/FZDi1IermHyfRgUtt8+j
+        vCIY4jJ3BLZ4WQU+1UI4FznCIZ49YhvDlMmQAil+013BRLf5D1SXncXD4nA0Vl2AuNgdB1RuVCCUcZEv
+        F9ObsA5TMA48j8e4NhVjb1KooKrwGErSD6NGfgINd0KxN0cE/2oRBGkcPFOEm0/+M0yBz6DqVkdjuP0y
+        ulTRSJLsS2BeeZq/YLF4Ujs+J46tsouxUViizcNITpFtyAbFaYf8LPF/hsX6DURyOPDSOpEVAAAAAElF
+        TkSuQmCC
 </value>
  </data>
  <metadata name="OpenFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
--- a/EDOKA/Dokumentmanagement/frmBarcodeKleber.vb
+++ b/EDOKA/Dokumentmanagement/frmBarcodeKleber.vb
@@ -42,18 +42,25 @@ Public Class frmBarcodeKleber
    Friend WithEvents Label2 As System.Windows.Forms.Label
    Friend WithEvents Label3 As System.Windows.Forms.Label
    Friend WithEvents Label4 As System.Windows.Forms.Label
+    Friend WithEvents pnlimport As Panel
+    Friend WithEvents Button2 As Button
+    Friend WithEvents Label5 As Label
    Friend WithEvents TextBox1 As System.Windows.Forms.TextBox
    <System.Diagnostics.DebuggerStepThrough()> Private Sub InitializeComponent()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmBarcodeKleber))
-        Me.btnOK = New System.Windows.Forms.Button
-        Me.brnAbbruch = New System.Windows.Forms.Button
-        Me.Label1 = New System.Windows.Forms.Label
-        Me.TextBox1 = New System.Windows.Forms.TextBox
-        Me.Button1 = New System.Windows.Forms.Button
-        Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog
-        Me.Label2 = New System.Windows.Forms.Label
-        Me.Label3 = New System.Windows.Forms.Label
-        Me.Label4 = New System.Windows.Forms.Label
+        Me.btnOK = New System.Windows.Forms.Button()
+        Me.brnAbbruch = New System.Windows.Forms.Button()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.TextBox1 = New System.Windows.Forms.TextBox()
+        Me.Button1 = New System.Windows.Forms.Button()
+        Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.Label3 = New System.Windows.Forms.Label()
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.pnlimport = New System.Windows.Forms.Panel()
+        Me.Label5 = New System.Windows.Forms.Label()
+        Me.Button2 = New System.Windows.Forms.Button()
+        Me.pnlimport.SuspendLayout()
        Me.SuspendLayout()
        '
        'btnOK
@@ -126,11 +133,40 @@ Public Class frmBarcodeKleber
        Me.Label4.TabIndex = 7
        Me.Label4.Text = "Dateiname:"
        '
+        'pnlimport
+        '
+        Me.pnlimport.Controls.Add(Me.Button2)
+        Me.pnlimport.Controls.Add(Me.Label5)
+        Me.pnlimport.Location = New System.Drawing.Point(11, 6)
+        Me.pnlimport.Name = "pnlimport"
+        Me.pnlimport.Size = New System.Drawing.Size(305, 129)
+        Me.pnlimport.TabIndex = 8
+        '
+        'Label5
+        '
+        Me.Label5.AutoSize = True
+        Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label5.ForeColor = System.Drawing.Color.Red
+        Me.Label5.Location = New System.Drawing.Point(10, 16)
+        Me.Label5.Name = "Label5"
+        Me.Label5.Size = New System.Drawing.Size(291, 17)
+        Me.Label5.TabIndex = 0
+        Me.Label5.Text = "Dokumente bitte direk in OnBase importieren"
+        '
+        'Button2
+        '
+        Me.Button2.Location = New System.Drawing.Point(110, 79)
+        Me.Button2.Name = "Button2"
+        Me.Button2.Size = New System.Drawing.Size(75, 23)
+        Me.Button2.TabIndex = 1
+        Me.Button2.Text = "&OK"
+        '
        'frmBarcodeKleber
        '
        Me.AutoScaleBaseSize = New System.Drawing.Size(5, 13)
        Me.ClientSize = New System.Drawing.Size(328, 144)
        Me.ControlBox = False
+        Me.Controls.Add(Me.pnlimport)
        Me.Controls.Add(Me.Label4)
        Me.Controls.Add(Me.Label3)
        Me.Controls.Add(Me.Label2)
@@ -146,6 +182,8 @@ Public Class frmBarcodeKleber
        Me.Name = "frmBarcodeKleber"
        Me.ShowInTaskbar = False
        Me.Text = "Barcode-Dokument erstellen"
+        Me.pnlimport.ResumeLayout(False)
+        Me.pnlimport.PerformLayout()
        Me.ResumeLayout(False)
        Me.PerformLayout()

@@ -206,7 +244,7 @@ Public Class frmBarcodeKleber
            Me.TextBox1.Focus()
            Exit Sub
        End Try
-        Dim bc As New edokadb.clsBarcodeetikette()
+        Dim bc As New edokaDB.clsBarcodeetikette()
        bc.cpMainConnectionProvider = conn
        Try
            bc.iBarcodenr = New SqlInt32(CType(Me.TextBox1.Text, String))
@@ -255,6 +293,7 @@ Public Class frmBarcodeKleber
            Me.Label4.Visible = True
            Me.Button1.Visible = True
            Me.Text = "Dokument-Import"
+            Me.pnlimport.Visible = True
        Else
            Me.Label1.Visible = True
            Me.TextBox1.Visible = True
@@ -263,6 +302,7 @@ Public Class frmBarcodeKleber
            Me.Label4.Visible = False
            Me.Button1.Visible = False
            Me.Text = "Barcode-Dokument erstellen"
+            Me.pnlimport.Visible = False
        End If
    End Sub

@@ -285,4 +325,9 @@ Public Class frmBarcodeKleber
            Me.Label2.Text = Globals.Dokument_Importfilename
        End If
    End Sub
+
+    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
+        brnAbbruch_Click(sender, e)
+
+    End Sub
 End Class
--- a/EDOKA/Dokumentmanagement/frmDokumentbearbeitung.vb
+++ b/EDOKA/Dokumentmanagement/frmDokumentbearbeitung.vb
@@ -2899,7 +2899,9 @@ Public Class frmDokumentbearbeitung
            Doktyp.SelectOne()

            If Doktyp.bFunktionen_zuweisen.Value = True Then
-                Dokumentfunktionen_Aktivieren()
+                '-- Erneuerung DMS - Funktion deaktivieren
+                'Dokumentfunktionen_Aktivieren()
+                '-- Ende Erneuerung DMS - Funktion deaktivieren
            Else
                w.Save_DokumentFunktionen = Generic_Select(6)
                Me.pnlBerechtigungen.Visible = False
--- a/EDOKA/Dokumentmanagement/frmVorlagenauswahl.resx
+++ b/EDOKA/Dokumentmanagement/frmVorlagenauswahl.resx
@@ -125,7 +125,7 @@
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABK
-        CgAAAk1TRnQBSQFMAgEBBAEAAZQBAQGUAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CgAAAk1TRnQBSQFMAgEBBAEAAaQBAQGkAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
        AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -179,7 +179,7 @@
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAC2
-        DQAAAk1TRnQBSQFMAgEBCAEAAZQBAQGUAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        DQAAAk1TRnQBSQFMAgEBCAEAAaQBAQGkAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
        AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -257,7 +257,7 @@
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACE
-        SgAAAk1TRnQBSQFMAgEBUQEAAfQBAQH0AQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        SgAAAk1TRnQBSQFMAgEBUQEAAQQBAgEEAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
        AwABQAMAAVABAQIAAQEBAAEIBgABVBgAAYACAAGAAwACgAEAAYADAAGAAQABgAEAAoACAAPAAQABwAHc
        AcABAAHwAcoBpgEAATMFAAEzAQABMwEAATMBAAIzAgADFgEAAxwBAAMiAQADKQEAA1UBAANNAQADQgEA
        AzkBAAGAAXwB/wEAAlAB/wEAAZMBAAHWAQAB/wHsAcwBAAHGAdYB7wEAAdYC5wEAAZABqQGtAgAB/wEz
--- a/EDOKA/Dokumentmanagement/frmVorlagenauswahl.vb
+++ b/EDOKA/Dokumentmanagement/frmVorlagenauswahl.vb
@@ -597,9 +597,9 @@ Public Class frmVorlagenauswahl
        '
        Me.BtnHelp.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.BtnHelp.Image = CType(resources.GetObject("BtnHelp.Image"), System.Drawing.Image)
-        Me.BtnHelp.Location = New System.Drawing.Point(528, 2)
+        Me.BtnHelp.Location = New System.Drawing.Point(529, 2)
        Me.BtnHelp.Name = "BtnHelp"
-        Me.BtnHelp.Size = New System.Drawing.Size(24, 23)
+        Me.BtnHelp.Size = New System.Drawing.Size(23, 23)
        Me.BtnHelp.TabIndex = 36
        '
        'picSmiley
@@ -891,12 +891,12 @@ Public Class frmVorlagenauswahl
        On_Load = False

        '        Dim ttip As New ToolTip()
-        Dim s As String = "- CTRL+N: Neuer Ordner erstellen" + vbCrLf + _
-                          "- CTRL+UP: Aktueller Eintrag nach oben verschieben" + vbCrLf + _
-                          "- CTRL+Down: Aktueller Eintrag nach untern verschieben" + vbCrLf + _
-                          "- Enter: Ordner önnen/Schliessen bzw. Dokument/Dokumentpaket erstellen" + vbCrLf + _
-                          "- Del: Eintrag löschen" + vbCrLf + _
-                          "- Up: Selektion nach oben verschieben" + vbCrLf + _
+        Dim s As String = "- CTRL+N: Neuer Ordner erstellen" + vbCrLf +
+                          "- CTRL+UP: Aktueller Eintrag nach oben verschieben" + vbCrLf +
+                          "- CTRL+Down: Aktueller Eintrag nach untern verschieben" + vbCrLf +
+                          "- Enter: Ordner önnen/Schliessen bzw. Dokument/Dokumentpaket erstellen" + vbCrLf +
+                          "- Del: Eintrag löschen" + vbCrLf +
+                          "- Up: Selektion nach oben verschieben" + vbCrLf +
                          "- Down: Selektion nach unten Vershcieben"

        '       ttip.SetToolTip(FavoritenStruktur, s)
@@ -1000,7 +1000,7 @@ Public Class frmVorlagenauswahl
        tnnew.SelectedImageIndex = tn.SelectedImageIndex
        tnnew.Tag = "tmp"

-        Dim fs As New edokadb.clsEDEX_Favoriten()
+        Dim fs As New edokaDB.clsEDEX_Favoriten()
        fs.cpMainConnectionProvider = conn
        fs.sBezeichnung = New SqlString(CType(sNodeText, String))
        fs.bAktiv = New SqlBoolean(CType(True, Boolean))
@@ -1085,8 +1085,8 @@ Public Class frmVorlagenauswahl
    End Sub

    Private Sub MnuFavoritentfernen_Click(ByVal sender As System.Object, ByVal e As System.EventArgs)
-        Dim df As New edokadb.clsDokumentfavoriten()
-        Dim dbkey As New edokadb.clsMyKey_Tabelle()
+        Dim df As New edokaDB.clsDokumentfavoriten()
+        Dim dbkey As New edokaDB.clsMyKey_Tabelle()
        Dim key As Long
        dbkey.cpMainConnectionProvider = conn
        df.iDokumenttypnr = New SqlInt32(CType(TagValue(Me.TVStruktur.SelectedNode.Tag), Int32))
@@ -1170,7 +1170,7 @@ Public Class frmVorlagenauswahl

    Private Sub DelNode(ByVal tn As TreeNode)
        If tn.ImageIndex = 61 + DP_Imagepos Then
-            Dim dp As New edokadb.clsEdex_dokumentpaket()
+            Dim dp As New edokaDB.clsEdex_dokumentpaket()
            dp.cpMainConnectionProvider = conn
            dp.iDokumentpaketnr = New SqlInt32(CType(TagValue(tn.Tag), Int32))
            conn.OpenConnection()
@@ -1181,7 +1181,7 @@ Public Class frmVorlagenauswahl
            conn.CloseConnection(True)
            dp.Dispose()
        Else
-            Dim df As New edokadb.clsEDEX_Favoriten()
+            Dim df As New edokaDB.clsEDEX_Favoriten()
            df.cpMainConnectionProvider = conn
            df.iNreintrag = New SqlInt32(CType(TagValue(tn.Tag), Int32))
            conn.OpenConnection()
@@ -1526,7 +1526,7 @@ Public Class frmVorlagenauswahl
    Private Sub Load_Struktur(ByVal Searchstring As String, ByVal favoriten As Boolean)
        Try
            Me.Cursor = Cursors.WaitCursor
-            Dim dokart As New edokadb.clsMyDokumentart()
+            Dim dokart As New edokaDB.clsMyDokumentart()
            If favoriten Then
                Me.FavoritenStruktur.BeginUpdate()
                Me.FavoritenStruktur.Nodes.Clear()
@@ -1573,7 +1573,7 @@ Public Class frmVorlagenauswahl

    Private Sub RenameNodeFavoritenstruktur(ByVal dokumentfavoritennr As Integer, ByVal NodeText As String)
        If dokumentfavoritennr <> 0 Then
-            Dim df As New edokadb.clsEDEX_Favoriten()
+            Dim df As New edokaDB.clsEDEX_Favoriten()
            df.cpMainConnectionProvider = conn
            conn.OpenConnection()
            df.iNreintrag = New SqlInt32(CType(dokumentfavoritennr, Int32))
@@ -1806,7 +1806,7 @@ Public Class frmVorlagenauswahl
            If FavoritenStruktur.SelectedNode.ImageIndex = 61 + DP_Imagepos Then
                Me.Dokumentvorlage = TagValue(FavoritenStruktur.SelectedNode.Tag)
                'Rel. 4.1
-                Dim dp As New edokadb.clsEdex_dokumentpaket
+                Dim dp As New edokaDB.clsEdex_dokumentpaket
                dp.cpMainConnectionProvider = Globals.conn
                dp.iDokumentpaketnr = Me.Dokumentvorlage
                dp.SelectOne()
@@ -1830,7 +1830,7 @@ Public Class frmVorlagenauswahl
                iDokumentFavoritenNr = Get_dtnr_dpnr(TagValue(FavoritenStruktur.SelectedNode.Tag))
                Me.Dokumentvorlage = iDokumentFavoritenNr
                'Rel. 4.1
-                Dim dp As New edokadb.clsEdex_dokumentpaket
+                Dim dp As New edokaDB.clsEdex_dokumentpaket
                dp.cpMainConnectionProvider = Globals.conn
                dp.iDokumentpaketnr = Me.Dokumentvorlage
                dp.SelectOne()
@@ -1853,7 +1853,7 @@ Public Class frmVorlagenauswahl
            Me.Dokumentvorlage = Get_dtnr_dpnr(TagValue(FavoritenStruktur.SelectedNode.Tag))

            'Rel. 4.1 - Prüfung, ob Dokument noch erstellt werden darf
-            Dim dt As New edokadb.clsDokumenttyp
+            Dim dt As New edokaDB.clsDokumenttyp
            dt.cpMainConnectionProvider = Globals.conn
            dt.iDokumenttypnr = New SqlInt32(CType(Me.Dokumentvorlage, Int32))
            dt.SelectOne()
@@ -1890,7 +1890,7 @@ Public Class frmVorlagenauswahl
            Exit Function

        End If
-        Dim dt As New edokadb.clsDokumenttyp()
+        Dim dt As New edokaDB.clsDokumenttyp()
        dt.cpMainConnectionProvider = conn
        dt.iDokumenttypnr = New SqlInt32(CType(Me.Dokumentvorlage, Int32))
        dt.SelectOne()
@@ -1921,7 +1921,7 @@ Public Class frmVorlagenauswahl
            End If

        End If
-            If showbc Then
+        If showbc Then
            Dim f As New frmBarcodeKleber()
            f.ShowDialog()
            If f.DialogResult = DialogResult.Abort Then
@@ -1957,7 +1957,7 @@ Public Class frmVorlagenauswahl
    Private Function RootNodesFavoritenStrukturExist(Optional ByVal RootNodetext As String = "Favoriten") As Boolean
        RootNodesFavoritenStrukturExist = True
        If FavoritenStruktur.Nodes.Count < 1 Then
-            Dim dfs As New edokadb.clsDokumentfavoriten_struktur()
+            Dim dfs As New edokaDB.clsDokumentfavoriten_struktur()
            RootNodesFavoritenStrukturExist = False
            dfs.cpMainConnectionProvider = conn
            conn.OpenConnection()
@@ -2053,11 +2053,11 @@ Public Class frmVorlagenauswahl
    End Sub

    Public Sub Favoritenstruktur_DragOver(ByVal sender As System.Object, ByVal e As DragEventArgs) Handles FavoritenStruktur.DragOver
-        If e.Data.GetDataPresent("System.Windows.Forms.TreeNode", _
+        If e.Data.GetDataPresent("System.Windows.Forms.TreeNode",
              True) = False Then Exit Sub
        Dim selectedTreeview As TreeView = CType(sender, TreeView)
        Dim Originalnode As TreeNode = CType(e.Data.GetData("System.Windows.Forms.TreeNode"), TreeNode)
-        Dim pt As Point = _
+        Dim pt As Point =
            CType(sender, TreeView).PointToClient(New Point(e.X, e.Y))
        Dim targetNode As TreeNode = selectedTreeview.GetNodeAt(pt)
        If targetNode Is Nothing Then Exit Sub
@@ -2076,8 +2076,8 @@ Public Class frmVorlagenauswahl

        If Not (selectedTreeview.SelectedNode Is targetNode) Then
            selectedTreeview.SelectedNode = targetNode
-            Dim dropNode As TreeNode = _
-                CType(e.Data.GetData("System.Windows.Forms.TreeNode"),  _
+            Dim dropNode As TreeNode =
+                CType(e.Data.GetData("System.Windows.Forms.TreeNode"),
                TreeNode)
            Do Until targetNode Is Nothing
                If targetNode Is dropNode Then
@@ -2091,7 +2091,7 @@ Public Class frmVorlagenauswahl
    End Sub

    Private Sub Favoritenstruktur_DragDrop(ByVal sender As Object, ByVal e As System.Windows.Forms.DragEventArgs) Handles FavoritenStruktur.DragDrop
-        If e.Data.GetDataPresent("System.Windows.Forms.TreeNode", _
+        If e.Data.GetDataPresent("System.Windows.Forms.TreeNode",
              True) = False Then Exit Sub
        Dim selectedTreeview As TreeView = CType(sender, TreeView)
        If Me.ItemMove = False Then
@@ -2099,8 +2099,8 @@ Public Class frmVorlagenauswahl
            Exit Sub
        End If

-        Dim dropNode As TreeNode = _
-              CType(e.Data.GetData("System.Windows.Forms.TreeNode"),  _
+        Dim dropNode As TreeNode =
+              CType(e.Data.GetData("System.Windows.Forms.TreeNode"),
              TreeNode)
        Dim targetNode As TreeNode = selectedTreeview.SelectedNode
        dropNode.Remove()
@@ -2183,7 +2183,7 @@ Public Class frmVorlagenauswahl
        tnnew.ImageIndex = Originalnode.ImageIndex + DP_Imagepos
        tnnew.SelectedImageIndex = Originalnode.SelectedImageIndex + DP_Imagepos

-        Dim ps As New edokadb.clsEDEX_Favoriten()
+        Dim ps As New edokaDB.clsEDEX_Favoriten()
        ps.cpMainConnectionProvider = conn
        ps.sBezeichnung = New SqlString(CType(Originalnode.Text, String))
        ps.bAktiv = New SqlBoolean(CType(True, Boolean))
@@ -2541,5 +2541,5 @@ Public Class frmVorlagenauswahl

    End Sub

-    
+
 End Class