From faec94f9e3b5a5182b1b5cec5323dca42ff4436a Mon Sep 17 00:00:00 2001
From: "d.breimaier" <d.breimaier@verag.ag>
Date: Wed, 12 Oct 2022 14:23:58 +0200
Subject: [PATCH] Bugfix

---
 Aviso/frmFrachtkostenBerechnen.Designer.vb | 14 ++++++++------
 Aviso/frmFrachtkostenBerechnen.vb          | 11 ++++++-----
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/Aviso/frmFrachtkostenBerechnen.Designer.vb b/Aviso/frmFrachtkostenBerechnen.Designer.vb
index 353e30e..9c4a0c2 100644
--- a/Aviso/frmFrachtkostenBerechnen.Designer.vb
+++ b/Aviso/frmFrachtkostenBerechnen.Designer.vb
@@ -287,10 +287,11 @@ Partial Class frmFrachtkostenBerechnen
         Me.cbxLandNach._allowFreiText = False
         Me.cbxLandNach._value = ""
         Me.cbxLandNach.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append
+        Me.cbxLandNach.DropDownWidth = 250
         Me.cbxLandNach.FormattingEnabled = True
         Me.cbxLandNach.Location = New System.Drawing.Point(255, 23)
         Me.cbxLandNach.Name = "cbxLandNach"
-        Me.cbxLandNach.Size = New System.Drawing.Size(50, 21)
+        Me.cbxLandNach.Size = New System.Drawing.Size(35, 21)
         Me.cbxLandNach.TabIndex = 6
         '
         'cbxLandVon
@@ -299,10 +300,11 @@ Partial Class frmFrachtkostenBerechnen
         Me.cbxLandVon._allowFreiText = False
         Me.cbxLandVon._value = ""
         Me.cbxLandVon.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest
+        Me.cbxLandVon.DropDownWidth = 250
         Me.cbxLandVon.FormattingEnabled = True
         Me.cbxLandVon.Location = New System.Drawing.Point(75, 22)
         Me.cbxLandVon.Name = "cbxLandVon"
-        Me.cbxLandVon.Size = New System.Drawing.Size(50, 21)
+        Me.cbxLandVon.Size = New System.Drawing.Size(35, 21)
         Me.cbxLandVon.TabIndex = 3
         '
         'txbCalcDistanceNichtEU
@@ -532,12 +534,12 @@ Partial Class frmFrachtkostenBerechnen
         Me.txbNachPLZ._Waehrung = False
         Me.txbNachPLZ._WaehrungZeichen = True
         Me.txbNachPLZ.ForeColor = System.Drawing.Color.Black
-        Me.txbNachPLZ.Location = New System.Drawing.Point(311, 23)
+        Me.txbNachPLZ.Location = New System.Drawing.Point(301, 23)
         Me.txbNachPLZ.MaxLineLength = -1
         Me.txbNachPLZ.MaxLines_Warning = ""
         Me.txbNachPLZ.MaxLines_Warning_Label = Nothing
         Me.txbNachPLZ.Name = "txbNachPLZ"
-        Me.txbNachPLZ.Size = New System.Drawing.Size(50, 20)
+        Me.txbNachPLZ.Size = New System.Drawing.Size(60, 20)
         Me.txbNachPLZ.TabIndex = 7
         '
         'txbVonPLZ
@@ -555,12 +557,12 @@ Partial Class frmFrachtkostenBerechnen
         Me.txbVonPLZ._Waehrung = False
         Me.txbVonPLZ._WaehrungZeichen = True
         Me.txbVonPLZ.ForeColor = System.Drawing.Color.Black
-        Me.txbVonPLZ.Location = New System.Drawing.Point(130, 23)
+        Me.txbVonPLZ.Location = New System.Drawing.Point(116, 23)
         Me.txbVonPLZ.MaxLineLength = -1
         Me.txbVonPLZ.MaxLines_Warning = ""
         Me.txbVonPLZ.MaxLines_Warning_Label = Nothing
         Me.txbVonPLZ.Name = "txbVonPLZ"
-        Me.txbVonPLZ.Size = New System.Drawing.Size(50, 20)
+        Me.txbVonPLZ.Size = New System.Drawing.Size(64, 20)
         Me.txbVonPLZ.TabIndex = 4
         '
         'tbNichtEUAnteil
diff --git a/Aviso/frmFrachtkostenBerechnen.vb b/Aviso/frmFrachtkostenBerechnen.vb
index d894e86..1a51f1c 100644
--- a/Aviso/frmFrachtkostenBerechnen.vb
+++ b/Aviso/frmFrachtkostenBerechnen.vb
@@ -50,16 +50,17 @@ Public Class frmFrachtkostenBerechnen
 
 
 
-        cbxLandVon.fillWithSQL("SELECT Distinct(ISNULL([LandKz],'')) as LandKZ FROM [VERAG].[dbo].[Adressen] order by LandKz asc", False, "FMZOLL", True, True)
+        'cbxLandVon.fillWithSQL("SELECT Distinct(ISNULL([LandKz],'')) as LandKZ FROM [Adressen] order by LandKz asc", False, "FMZOLL", True, True)
+        cbxLandVon.fillWithSQL(" select distinct landkz, Währungstabelle.Land  from   Währungstabelle  where landkz is not null  order by LandKz", True, "FMZOLL", True)
 
         cbxLandVon.changeItem(sql.DLookup("[LandKz]", "[Adressen]", "[AdressenNr]='" & absenderID & "'", "FMZOLL", ""))
-        txbVonPLZ.fillWithSQL("SELECT ISNULL([PLZ],'')  FROM [VERAG].[dbo].[Adressen] where AdressenNr = '" & absenderID & "'")
-        txbVonOrt.fillWithSQL("SELECT ISNULL([Ort],'') FROM [VERAG].[dbo].[Adressen] where AdressenNr = '" & absenderID & "'")
+        txbVonPLZ.fillWithSQL("SELECT ISNULL([PLZ],'')  FROM [Adressen] where AdressenNr = '" & absenderID & "'", "FMZOLL")
+        txbVonOrt.fillWithSQL("SELECT ISNULL([Ort],'') FROM [Adressen] where AdressenNr = '" & absenderID & "'", "FMZOLL")
 
         cbxLandNach.Items.AddRange(cbxLandVon.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray())
         cbxLandNach.changeItem(sql.DLookup("[LandKz]", "[Adressen]", "[AdressenNr]='" & empfaengerID & "'", "FMZOLL", ""))
-        txbNachPLZ.fillWithSQL("SELECT ISNULL([PLZ],'-') FROM [VERAG].[dbo].[Adressen] where AdressenNr = '" & empfaengerID & "'")
-        txbNachOrt.fillWithSQL("SELECT ISNULL([Ort],'') FROM [VERAG].[dbo].[Adressen] where AdressenNr = '" & empfaengerID & "'")
+        txbNachPLZ.fillWithSQL("SELECT ISNULL([PLZ],'-') FROM [Adressen] where AdressenNr = '" & empfaengerID & "'", "FMZOLL")
+        txbNachOrt.fillWithSQL("SELECT ISNULL([Ort],'') FROM [Adressen] where AdressenNr = '" & empfaengerID & "'", "FMZOLL")
 
         ckbManAnteilsermittlung.Checked = True