Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO

2023-01-17 21:29:47 +01:00
parent 51e7771e76 8b6ca3762f
commit cbd79cf2f7
8 changed files with 707 additions and 563 deletions
--- a/Aviso/UsrCntlEssensbestellungen.Designer.vb
+++ b/Aviso/UsrCntlEssensbestellungen.Designer.vb
@@ -146,7 +146,7 @@ Partial Class UsrCntlessensbestellungen
        '
        'txtMenu_dienstag
        '
-        Me.txtMenu_dienstag.Location = New System.Drawing.Point(0, 39)
+        Me.txtMenu_dienstag.Location = New System.Drawing.Point(3, 39)
        Me.txtMenu_dienstag.Name = "txtMenu_dienstag"
        Me.txtMenu_dienstag.Size = New System.Drawing.Size(188, 32)
        Me.txtMenu_dienstag.TabIndex = 30
@@ -177,7 +177,7 @@ Partial Class UsrCntlessensbestellungen
        Me.txtAlt_dienstag._Waehrung = False
        Me.txtAlt_dienstag._WaehrungZeichen = True
        Me.txtAlt_dienstag.ForeColor = System.Drawing.Color.Black
-        Me.txtAlt_dienstag.Location = New System.Drawing.Point(0, 93)
+        Me.txtAlt_dienstag.Location = New System.Drawing.Point(3, 93)
        Me.txtAlt_dienstag.MaxLineLength = -1
        Me.txtAlt_dienstag.MaxLines_Warning = ""
        Me.txtAlt_dienstag.MaxLines_Warning_Label = Nothing
@@ -235,7 +235,7 @@ Partial Class UsrCntlessensbestellungen
        '
        'txtMenu_montag
        '
-        Me.txtMenu_montag.Location = New System.Drawing.Point(6, 39)
+        Me.txtMenu_montag.Location = New System.Drawing.Point(3, 39)
        Me.txtMenu_montag.Name = "txtMenu_montag"
        Me.txtMenu_montag.Size = New System.Drawing.Size(188, 32)
        Me.txtMenu_montag.TabIndex = 29
@@ -279,7 +279,7 @@ Partial Class UsrCntlessensbestellungen
        '
        Me.rbMenuAlt_montag.AutoSize = True
        Me.rbMenuAlt_montag.GroupName = "GroupBox1"
-        Me.rbMenuAlt_montag.Location = New System.Drawing.Point(6, 74)
+        Me.rbMenuAlt_montag.Location = New System.Drawing.Point(3, 74)
        Me.rbMenuAlt_montag.Name = "rbMenuAlt_montag"
        Me.rbMenuAlt_montag.Size = New System.Drawing.Size(70, 17)
        Me.rbMenuAlt_montag.TabIndex = 1
@@ -346,7 +346,7 @@ Partial Class UsrCntlessensbestellungen
        Me.txtAlt_freitag._Waehrung = False
        Me.txtAlt_freitag._WaehrungZeichen = True
        Me.txtAlt_freitag.ForeColor = System.Drawing.Color.Black
-        Me.txtAlt_freitag.Location = New System.Drawing.Point(-3, 97)
+        Me.txtAlt_freitag.Location = New System.Drawing.Point(3, 97)
        Me.txtAlt_freitag.MaxLineLength = -1
        Me.txtAlt_freitag.MaxLines_Warning = ""
        Me.txtAlt_freitag.MaxLines_Warning_Label = Nothing
@@ -359,7 +359,7 @@ Partial Class UsrCntlessensbestellungen
        '
        Me.rbMenuAlt_freitag.AutoSize = True
        Me.rbMenuAlt_freitag.GroupName = "Freitag"
-        Me.rbMenuAlt_freitag.Location = New System.Drawing.Point(0, 78)
+        Me.rbMenuAlt_freitag.Location = New System.Drawing.Point(3, 78)
        Me.rbMenuAlt_freitag.Name = "rbMenuAlt_freitag"
        Me.rbMenuAlt_freitag.Size = New System.Drawing.Size(70, 17)
        Me.rbMenuAlt_freitag.TabIndex = 1
@@ -413,7 +413,7 @@ Partial Class UsrCntlessensbestellungen
        '
        'txtMenu_mittwoch
        '
-        Me.txtMenu_mittwoch.Location = New System.Drawing.Point(0, 39)
+        Me.txtMenu_mittwoch.Location = New System.Drawing.Point(3, 39)
        Me.txtMenu_mittwoch.Name = "txtMenu_mittwoch"
        Me.txtMenu_mittwoch.Size = New System.Drawing.Size(188, 32)
        Me.txtMenu_mittwoch.TabIndex = 31
@@ -444,7 +444,7 @@ Partial Class UsrCntlessensbestellungen
        Me.txtAlt_mittwoch._Waehrung = False
        Me.txtAlt_mittwoch._WaehrungZeichen = True
        Me.txtAlt_mittwoch.ForeColor = System.Drawing.Color.Black
-        Me.txtAlt_mittwoch.Location = New System.Drawing.Point(0, 93)
+        Me.txtAlt_mittwoch.Location = New System.Drawing.Point(3, 93)
        Me.txtAlt_mittwoch.MaxLineLength = -1
        Me.txtAlt_mittwoch.MaxLines_Warning = ""
        Me.txtAlt_mittwoch.MaxLines_Warning_Label = Nothing
@@ -524,7 +524,7 @@ Partial Class UsrCntlessensbestellungen
        Me.txtAlt_donnerstag._Waehrung = False
        Me.txtAlt_donnerstag._WaehrungZeichen = True
        Me.txtAlt_donnerstag.ForeColor = System.Drawing.Color.Black
-        Me.txtAlt_donnerstag.Location = New System.Drawing.Point(1, 97)
+        Me.txtAlt_donnerstag.Location = New System.Drawing.Point(3, 97)
        Me.txtAlt_donnerstag.MaxLineLength = -1
        Me.txtAlt_donnerstag.MaxLines_Warning = ""
        Me.txtAlt_donnerstag.MaxLines_Warning_Label = Nothing
@@ -537,7 +537,7 @@ Partial Class UsrCntlessensbestellungen
        '
        Me.rbMenuAlt_donnerstag.AutoSize = True
        Me.rbMenuAlt_donnerstag.GroupName = "Donnerstag"
-        Me.rbMenuAlt_donnerstag.Location = New System.Drawing.Point(4, 78)
+        Me.rbMenuAlt_donnerstag.Location = New System.Drawing.Point(3, 78)
        Me.rbMenuAlt_donnerstag.Name = "rbMenuAlt_donnerstag"
        Me.rbMenuAlt_donnerstag.Size = New System.Drawing.Size(70, 17)
        Me.rbMenuAlt_donnerstag.TabIndex = 1
--- a/Aviso/UsrCntlEssensbestellungen.vb
+++ b/Aviso/UsrCntlEssensbestellungen.vb
@@ -9,8 +9,8 @@ Public Class UsrCntlessensbestellungen
    'Dim arrayWeekdays() As String = {"montag", "dienstag", "mittwoch", "donerstag", "freitag"}
    Private ToolTipFont As New Font("Courier New", 12)
    Dim preisProMahlzeit As Double = 3
-    Dim menu As String = "Menu"
-    Dim aLaCarte As String = "a La Carte"
+    Dim menu As String = "Menü"
+    Dim alacarte As String = "A La Carte"



@@ -208,12 +208,12 @@ Public Class UsrCntlessensbestellungen
            If TypeOf gb Is GroupBox Then
                For Each c As Control In gb.Controls

-                    If c.Text.ToLower.StartsWith("menu") AndAlso TypeOf c Is VERAG_PROG_ALLGEMEIN.MyRadioButton Then
+                    If c.Text.ToLower.StartsWith(menu.ToLower) AndAlso TypeOf c Is VERAG_PROG_ALLGEMEIN.MyRadioButton Then
                        Dim rb As VERAG_PROG_ALLGEMEIN.MyRadioButton = c
                        If rb.Checked Then countMenus = countMenus + 1
                    End If

-                    If c.Text.ToLower.StartsWith("a la carte") AndAlso TypeOf c Is VERAG_PROG_ALLGEMEIN.MyRadioButton Then
+                    If c.Text.ToLower.StartsWith(alacarte.ToLower) AndAlso TypeOf c Is VERAG_PROG_ALLGEMEIN.MyRadioButton Then
                        Dim rb As VERAG_PROG_ALLGEMEIN.MyRadioButton = c
                        If rb.Checked Then countlaCarte = countlaCarte + 1
                    End If
@@ -567,7 +567,7 @@ Public Class UsrCntlessensbestellungen
                rbMenu__freitag.Checked = True
            Else
                rbMenuAlt_freitag.Checked = True
-                If essen.eb_freitag IsNot Nothing Then txtAlt_donnerstag.Text = essen.eb_freitag.ToString
+                If essen.eb_freitag IsNot Nothing Then txtAlt_freitag.Text = essen.eb_freitag.ToString
            End If
        Else
            cb_freitag.Checked = False
--- a/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb
+++ b/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb
@@ -419,6 +419,7 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.cbxWarenort._allowedValuesFreiText = Nothing
        Me.cbxWarenort._allowFreiText = False
        Me.cbxWarenort._value = ""
+        Me.cbxWarenort.DropDownWidth = 500
        Me.cbxWarenort.FormattingEnabled = True
        Me.cbxWarenort.Location = New System.Drawing.Point(132, 69)
        Me.cbxWarenort.Name = "cbxWarenort"
@@ -441,6 +442,7 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.cbxStandort._allowedValuesFreiText = Nothing
        Me.cbxStandort._allowFreiText = False
        Me.cbxStandort._value = ""
+        Me.cbxStandort.DropDownWidth = 200
        Me.cbxStandort.FormattingEnabled = True
        Me.cbxStandort.Location = New System.Drawing.Point(32, 69)
        Me.cbxStandort.Name = "cbxStandort"
--- a/Aviso/frmGesamtsicherheitenMenuNEU.vb
+++ b/Aviso/frmGesamtsicherheitenMenuNEU.vb
@@ -8,12 +8,23 @@ Public Class frmGesamtsicherheitenMenuNEU
    Dim GesSichRef As VERAG_PROG_ALLGEMEIN.cAufschubKonten
    Public dataTable As DataTable
    Public Property Standort As String = ""
+    Public firmaId As Integer


    Private Sub frmGesamtsicherheitenNEU_Menu_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+
+
+        Select Case Standort
+            Case "Verag GmbH" : firmaId = 2
+            Case "VERAG AG" : firmaId = 1
+            Case "IMEX" : firmaId = 20
+            Case "Verag CS" : firmaId = 11
+        End Select
+
+
        cbxStandort.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)
        'cbxWarenort.fillWithSQL("SELECT [grz_Grenzstelle], [grz_Bezeichnung] FROM [tblGrenzstelle] WHERE [grz_Aktiv] ='1' AND [grz_Warenort] ='1' ORDER BY [grz_Reihenfolge] ", True, "AVISO", True)
-        cbxWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_knnr],' - ' ,[wo_bezeichnung]) FROM [tblWarenorte] WHERE [wo_aktiv] ='1' ORDER BY [wo_reihenfolge]  ", True, "AVISO", True)
+        cbxWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_bezeichnung],' - ' ,[wo_knnr]) FROM [tblWarenorte] WHERE [wo_aktiv] ='1' AND [wo_firma] = '" & firmaId & "' ORDER BY [wo_reihenfolge]  ", True, "AVISO", True)
        cbxWarenort.DropDownWidth = 150
        Me.Text = "Gesamtsicherheiten " & Standort
        frmHauptfenster.EnableDoubleBuffered(dgvListe)
@@ -150,6 +161,7 @@ Public Class frmGesamtsicherheitenMenuNEU
            .warenortID = dgvListe.CurrentRow.Cells("gs_warenort").Value
            .avisoID = dgvListe.CurrentRow.Cells("gs_avisoId").Value
            .dataTable = Me.dataTable
+            .firmaId = Me.firmaId
        End With

        AddHandler frm.FormClosing, Function()
@@ -169,6 +181,7 @@ Public Class frmGesamtsicherheitenMenuNEU
            .datum = Date.Now
            .Neu = True
            .dataTable = Me.dataTable
+            .firmaId = Me.firmaId
        End With
        AddHandler frm.FormClosing, Function()
                                        GesSichRef.CalcSaldo()
--- a/Aviso/frmGesamtsicherheitenNEU.Designer.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.Designer.vb
--- a/Aviso/frmGesamtsicherheitenNEU.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.vb
@@ -44,6 +44,9 @@ Public Class frmGesamtsicherheitenNEU

    Public dtSicherheiten As New DataTable()

+    Public firmaId As Integer
+
+

    Private Sub frmGesamtsicherheitNEU_Load(sender As Object, e As EventArgs) Handles MyBase.Load

@@ -63,7 +66,7 @@ Public Class frmGesamtsicherheitenNEU
            panOverlay.Visible = True

            cboFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)
-            cboWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_knnr],' - ' ,[wo_bezeichnung]) FROM [tblWarenorte] WHERE [wo_aktiv] ='1' ORDER BY [wo_reihenfolge]  ", True, "AVISO", True)
+            cboWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_bezeichnung],' - ' ,[wo_knnr]) FROM [tblWarenorte] WHERE [wo_aktiv] ='1' AND [wo_firma] = '" & firmaId & "' ORDER BY [wo_reihenfolge]  ", True, "AVISO", True)

            If datum = Nothing Then datum = Date.Now
            nextGessicherheitID = -1
--- a/Aviso/frmWarenorte.Designer.vb
+++ b/Aviso/frmWarenorte.Designer.vb
@@ -1,9 +1,9 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmWarenorte
    Inherits System.Windows.Forms.Form

    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
        Try
            If disposing AndAlso components IsNot Nothing Then
@@ -20,7 +20,7 @@ Partial Class frmWarenorte
    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmWarenorte))
@@ -44,6 +44,11 @@ Partial Class frmWarenorte
        Me.Label8 = New System.Windows.Forms.Label()
        Me.txtCluster = New System.Windows.Forms.TextBox()
        Me.mainPanel = New System.Windows.Forms.Panel()
+        Me.GroupBoxFK = New System.Windows.Forms.GroupBox()
+        Me.cxIM = New System.Windows.Forms.CheckBox()
+        Me.cxEX = New System.Windows.Forms.CheckBox()
+        Me.cxZE = New System.Windows.Forms.CheckBox()
+        Me.cxZV = New System.Windows.Forms.CheckBox()
        Me.txtStrasse = New System.Windows.Forms.TextBox()
        Me.Label10 = New System.Windows.Forms.Label()
        Me.cbxFirmaChange = New VERAG_PROG_ALLGEMEIN.MyComboBox()
@@ -53,8 +58,10 @@ Partial Class frmWarenorte
        Me.btnSave = New System.Windows.Forms.Button()
        Me.cbxGrenzstelle = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.dgvWarenorteNew = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.UsrcntlPDFScanList1 = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
        Me.pnlTop.SuspendLayout()
        Me.mainPanel.SuspendLayout()
+        Me.GroupBoxFK.SuspendLayout()
        CType(Me.dgvWarenorteNew, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
@@ -68,7 +75,7 @@ Partial Class frmWarenorte
        Me.pnlTop.Dock = System.Windows.Forms.DockStyle.Top
        Me.pnlTop.Location = New System.Drawing.Point(0, 0)
        Me.pnlTop.Name = "pnlTop"
-        Me.pnlTop.Size = New System.Drawing.Size(620, 48)
+        Me.pnlTop.Size = New System.Drawing.Size(690, 48)
        Me.pnlTop.TabIndex = 2
        '
        'lblWarning
@@ -96,7 +103,7 @@ Partial Class frmWarenorte
        '
        Me.Label3.AutoSize = True
        Me.Label3.ForeColor = System.Drawing.Color.White
-        Me.Label3.Location = New System.Drawing.Point(483, 3)
+        Me.Label3.Location = New System.Drawing.Point(555, 8)
        Me.Label3.Name = "Label3"
        Me.Label3.Size = New System.Drawing.Size(32, 13)
        Me.Label3.TabIndex = 5
@@ -109,9 +116,9 @@ Partial Class frmWarenorte
        Me.cbxFirma._value = ""
        Me.cbxFirma.DropDownWidth = 150
        Me.cbxFirma.FormattingEnabled = True
-        Me.cbxFirma.Location = New System.Drawing.Point(486, 18)
+        Me.cbxFirma.Location = New System.Drawing.Point(558, 24)
        Me.cbxFirma.Name = "cbxFirma"
-        Me.cbxFirma.Size = New System.Drawing.Size(122, 21)
+        Me.cbxFirma.Size = New System.Drawing.Size(128, 21)
        Me.cbxFirma.TabIndex = 13
        '
        'btnAdd
@@ -119,7 +126,7 @@ Partial Class frmWarenorte
        Me.btnAdd.BackgroundImage = Global.AVISO.My.Resources.Resources.plus
        Me.btnAdd.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
        Me.btnAdd.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnAdd.Location = New System.Drawing.Point(196, 283)
+        Me.btnAdd.Location = New System.Drawing.Point(267, 360)
        Me.btnAdd.Name = "btnAdd"
        Me.btnAdd.Size = New System.Drawing.Size(24, 20)
        Me.btnAdd.TabIndex = 97
@@ -130,7 +137,7 @@ Partial Class frmWarenorte
        Me.btnDelete.BackgroundImage = Global.AVISO.My.Resources.Resources.del
        Me.btnDelete.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
        Me.btnDelete.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnDelete.Location = New System.Drawing.Point(219, 283)
+        Me.btnDelete.Location = New System.Drawing.Point(290, 360)
        Me.btnDelete.Name = "btnDelete"
        Me.btnDelete.Size = New System.Drawing.Size(24, 20)
        Me.btnDelete.TabIndex = 96
@@ -237,6 +244,7 @@ Partial Class frmWarenorte
        '
        'mainPanel
        '
+        Me.mainPanel.Controls.Add(Me.GroupBoxFK)
        Me.mainPanel.Controls.Add(Me.txtStrasse)
        Me.mainPanel.Controls.Add(Me.Label10)
        Me.mainPanel.Controls.Add(Me.cbxFirmaChange)
@@ -257,11 +265,64 @@ Partial Class frmWarenorte
        Me.mainPanel.Controls.Add(Me.Label5)
        Me.mainPanel.Controls.Add(Me.txtKennr)
        Me.mainPanel.Controls.Add(Me.Label6)
-        Me.mainPanel.Location = New System.Drawing.Point(249, 54)
+        Me.mainPanel.Location = New System.Drawing.Point(320, 55)
        Me.mainPanel.Name = "mainPanel"
-        Me.mainPanel.Size = New System.Drawing.Size(359, 248)
+        Me.mainPanel.Size = New System.Drawing.Size(366, 241)
        Me.mainPanel.TabIndex = 17
        '
+        'GroupBoxFK
+        '
+        Me.GroupBoxFK.Controls.Add(Me.cxIM)
+        Me.GroupBoxFK.Controls.Add(Me.cxEX)
+        Me.GroupBoxFK.Controls.Add(Me.cxZE)
+        Me.GroupBoxFK.Controls.Add(Me.cxZV)
+        Me.GroupBoxFK.Location = New System.Drawing.Point(12, 159)
+        Me.GroupBoxFK.Name = "GroupBoxFK"
+        Me.GroupBoxFK.Size = New System.Drawing.Size(183, 74)
+        Me.GroupBoxFK.TabIndex = 25
+        Me.GroupBoxFK.TabStop = False
+        Me.GroupBoxFK.Text = "Förmlichkeiten"
+        '
+        'cxIM
+        '
+        Me.cxIM.AutoSize = True
+        Me.cxIM.Location = New System.Drawing.Point(117, 41)
+        Me.cxIM.Name = "cxIM"
+        Me.cxIM.Size = New System.Drawing.Size(55, 17)
+        Me.cxIM.TabIndex = 7
+        Me.cxIM.Text = "Import"
+        Me.cxIM.UseVisualStyleBackColor = True
+        '
+        'cxEX
+        '
+        Me.cxEX.AutoSize = True
+        Me.cxEX.Location = New System.Drawing.Point(117, 16)
+        Me.cxEX.Name = "cxEX"
+        Me.cxEX.Size = New System.Drawing.Size(56, 17)
+        Me.cxEX.TabIndex = 6
+        Me.cxEX.Text = "Export"
+        Me.cxEX.UseVisualStyleBackColor = True
+        '
+        'cxZE
+        '
+        Me.cxZE.AutoSize = True
+        Me.cxZE.Location = New System.Drawing.Point(3, 41)
+        Me.cxZE.Name = "cxZE"
+        Me.cxZE.Size = New System.Drawing.Size(100, 17)
+        Me.cxZE.TabIndex = 5
+        Me.cxZE.Text = "zug. Empfänger"
+        Me.cxZE.UseVisualStyleBackColor = True
+        '
+        'cxZV
+        '
+        Me.cxZV.AutoSize = True
+        Me.cxZV.Location = New System.Drawing.Point(3, 18)
+        Me.cxZV.Name = "cxZV"
+        Me.cxZV.Size = New System.Drawing.Size(97, 17)
+        Me.cxZV.TabIndex = 4
+        Me.cxZV.Text = "zug. Versender"
+        Me.cxZV.UseVisualStyleBackColor = True
+        '
        'txtStrasse
        '
        Me.txtStrasse.Location = New System.Drawing.Point(12, 75)
@@ -286,7 +347,7 @@ Partial Class frmWarenorte
        Me.cbxFirmaChange.DropDownWidth = 120
        Me.cbxFirmaChange.Enabled = False
        Me.cbxFirmaChange.FormattingEnabled = True
-        Me.cbxFirmaChange.Location = New System.Drawing.Point(12, 175)
+        Me.cbxFirmaChange.Location = New System.Drawing.Point(252, 175)
        Me.cbxFirmaChange.Name = "cbxFirmaChange"
        Me.cbxFirmaChange.Size = New System.Drawing.Size(100, 21)
        Me.cbxFirmaChange.TabIndex = 21
@@ -295,7 +356,7 @@ Partial Class frmWarenorte
        'Label
        '
        Me.Label.AutoSize = True
-        Me.Label.Location = New System.Drawing.Point(9, 159)
+        Me.Label.Location = New System.Drawing.Point(249, 159)
        Me.Label.Name = "Label"
        Me.Label.Size = New System.Drawing.Size(32, 13)
        Me.Label.TabIndex = 20
@@ -320,7 +381,7 @@ Partial Class frmWarenorte
        '
        'btnSave
        '
-        Me.btnSave.Location = New System.Drawing.Point(281, 219)
+        Me.btnSave.Location = New System.Drawing.Point(277, 210)
        Me.btnSave.Name = "btnSave"
        Me.btnSave.Size = New System.Drawing.Size(75, 23)
        Me.btnSave.TabIndex = 10
@@ -348,14 +409,34 @@ Partial Class frmWarenorte
        Me.dgvWarenorteNew.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvWarenorteNew.Location = New System.Drawing.Point(0, 49)
        Me.dgvWarenorteNew.Name = "dgvWarenorteNew"
-        Me.dgvWarenorteNew.Size = New System.Drawing.Size(243, 254)
+        Me.dgvWarenorteNew.Size = New System.Drawing.Size(314, 331)
        Me.dgvWarenorteNew.TabIndex = 98
        '
+        'UsrcntlPDFScanList1
+        '
+        Me.UsrcntlPDFScanList1._DATENSERVER_KATEGORIE = "DOKUMENTE"
+        Me.UsrcntlPDFScanList1._DATENSERVER_ORDNER = ""
+        Me.UsrcntlPDFScanList1._DATENSERVER_UOrdner1 = ""
+        Me.UsrcntlPDFScanList1._DATENSERVER_UOrdner2 = ""
+        Me.UsrcntlPDFScanList1._DATENSERVER_UOrdner3 = ""
+        Me.UsrcntlPDFScanList1._OPEN_ORIGINAL = False
+        Me.UsrcntlPDFScanList1._TYPE = "PDF"
+        Me.UsrcntlPDFScanList1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+        Me.UsrcntlPDFScanList1.BackColor = System.Drawing.Color.White
+        Me.UsrcntlPDFScanList1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.UsrcntlPDFScanList1.Cursor = System.Windows.Forms.Cursors.Default
+        Me.UsrcntlPDFScanList1.Location = New System.Drawing.Point(320, 299)
+        Me.UsrcntlPDFScanList1.Margin = New System.Windows.Forms.Padding(0)
+        Me.UsrcntlPDFScanList1.Name = "UsrcntlPDFScanList1"
+        Me.UsrcntlPDFScanList1.Size = New System.Drawing.Size(366, 81)
+        Me.UsrcntlPDFScanList1.TabIndex = 99
+        '
        'frmWarenorte
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(620, 309)
+        Me.ClientSize = New System.Drawing.Size(690, 382)
+        Me.Controls.Add(Me.UsrcntlPDFScanList1)
        Me.Controls.Add(Me.mainPanel)
        Me.Controls.Add(Me.btnAdd)
        Me.Controls.Add(Me.btnDelete)
@@ -369,6 +450,8 @@ Partial Class frmWarenorte
        Me.pnlTop.PerformLayout()
        Me.mainPanel.ResumeLayout(False)
        Me.mainPanel.PerformLayout()
+        Me.GroupBoxFK.ResumeLayout(False)
+        Me.GroupBoxFK.PerformLayout()
        CType(Me.dgvWarenorteNew, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)

@@ -403,4 +486,11 @@ Partial Class frmWarenorte
    Friend WithEvents Label As Label
    Friend WithEvents txtStrasse As TextBox
    Friend WithEvents Label10 As Label
+    Friend WithEvents Label11 As Label
+    Friend WithEvents GroupBoxFK As GroupBox
+    Friend WithEvents cxIM As CheckBox
+    Friend WithEvents cxEX As CheckBox
+    Friend WithEvents cxZE As CheckBox
+    Friend WithEvents cxZV As CheckBox
+    Friend WithEvents UsrcntlPDFScanList1 As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList
 End Class
--- a/Aviso/frmWarenorte.vb
+++ b/Aviso/frmWarenorte.vb
@@ -1,5 +1,5 @@
-Imports DocumentFormat.OpenXml.Drawing.Diagrams
-Imports Org.BouncyCastle.Crypto.Modes
+
+Imports com
 Imports VERAG_PROG_ALLGEMEIN

 Public Class frmWarenorte
@@ -11,7 +11,6 @@ Public Class frmWarenorte
        cbxGrenzstelle.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM tblGrenzstelle where grz_Aktiv=1 order by grz_Reihenfolge, grz_Grenzstelle", False, "AVISO", True)
        cbxGrenzstelle.changeItem("")
        cbxFirma.fillWithSQL("SELECT [Firma_id],[Firma_Bez]  FROM  [tblFirma] WHERE ISNULL(Firma_Warenort,0) = 1 ", False, "FMZOLL", True)
-        'cbxFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG", "VERAG"))
        cbxFirmaChange.Items.AddRange(cbxFirma.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray())

    End Sub
@@ -62,11 +61,13 @@ Public Class frmWarenorte
                End If
            End If

+
            If Not IsDBNull(row.Cells("wo_aktiv").Value) Then
-                    If Not row.Cells("wo_aktiv").Value Then
-                        row.DefaultCellStyle.BackColor = Color.IndianRed
-                    End If
+                If Not row.Cells("wo_aktiv").Value Then
+                    row.DefaultCellStyle.BackColor = Color.IndianRed
                End If
+            End If
+

        Next

@@ -142,6 +143,8 @@ Public Class frmWarenorte

        If dgvWarenorteNew.SelectedRows.Count < 1 Then
            mainPanel.Enabled = False
+            If cbxFirma._value <> "" Then UsrcntlPDFScanList1.INIT(-1, "WARENORTE", New VERAG_PROG_ALLGEMEIN.cFirmen(cbxFirma._value).Firma_Bez.ToString)
+
            Exit Sub
        Else
            mainPanel.Enabled = True
@@ -160,6 +163,26 @@ Public Class frmWarenorte
        txtKennr.Text = Warenort.wo_knnr
        txtReihenfolge.Text = Warenort.wo_reihenfolge
        txtStrasse.Text = Warenort.wo_strasse
+        cxEX.Checked = IIf(IsDBNull(Warenort.wo_ex), False, Warenort.wo_ex)
+        cxIM.Checked = IIf(IsDBNull(Warenort.wo_im), False, Warenort.wo_im)
+        cxZE.Checked = IIf(IsDBNull(Warenort.wo_ze), False, Warenort.wo_ze)
+        cxZV.Checked = IIf(IsDBNull(Warenort.wo_zv), False, Warenort.wo_zv)
+
+        If checkIfFirmaIsFilled(False, False) = False Then
+
+            UsrcntlPDFScanList1.Enabled = False
+            UsrcntlPDFScanList1.INIT(-1, "WARENORTE", "")
+
+        Else
+            UsrcntlPDFScanList1.Enabled = True
+            If cbxFirma._value = "" Then
+
+                UsrcntlPDFScanList1.INIT(-1, "WARENORTE", New VERAG_PROG_ALLGEMEIN.cFirmen(Warenort.wo_firma).Firma_Bez.ToString)
+
+            End If
+
+        End If
+

    End Sub

@@ -180,6 +203,11 @@ Public Class frmWarenorte
        WarenortNew.wo_reihenfolge = txtReihenfolge.Text
        WarenortNew.wo_strasse = txtStrasse.Text

+        WarenortNew.wo_ex = cxEX.Checked
+        WarenortNew.wo_im = cxIM.Checked
+        WarenortNew.wo_ze = cxZE.Checked
+        WarenortNew.wo_zv = cxZV.Checked
+
        If cbxGrenzstelle._value = "" Then
            lblWarning.Text = "Grenzstelle muss ausgewählt werden!"
            Exit Sub
@@ -200,16 +228,23 @@ Public Class frmWarenorte
        dgvWarenorteNew.GetOrder()
        initDGVWarenort(cbxFirma._value)
        dgvWarenorteNew.SetOrder()
+
+
    End Sub

-    Private Function checkIfFirmaIsFilled(initialSave As Boolean)
+    Private Function checkIfFirmaIsFilled(initialSave As Boolean, Optional setWarning As Boolean = True)



        If cbxFirma._value = "" Then
-            If (dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value Is DBNull.Value Or dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value Is Nothing) Or initialSave Then
+            If ((dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value Is DBNull.Value Or dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value Is Nothing Or dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value = "") And initialSave = False) Then
+
+                If setWarning Then
+                    lblWarning.Text = "Bitte Firma auswählen!"
+                Else
+                    lblWarning.Text = ""
+                End If

-                lblWarning.Text = "Bitte Firma auswählen!"
                Return False
            End If
            lblWarning.Text = ""
@@ -226,4 +261,5 @@ Public Class frmWarenorte
        Return False

    End Function
+
 End Class