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

SDL/Checkliste/frmCheckliste.Designer.vb

@@ -75,8 +75,8 @@ Partial Class frmCheckliste
         Me.btnInfo = New System.Windows.Forms.Button()
         Me.Label1 = New System.Windows.Forms.Label()
         Me.cboPrinter = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.Button1 = New System.Windows.Forms.Button()
         Me.lkl = New System.Windows.Forms.LinkLabel()
+        Me.Button1 = New System.Windows.Forms.Button()
         Me.GroupBox1.SuspendLayout()
         Me.GroupBox2.SuspendLayout()
         Me.GroupBox3.SuspendLayout()
@@ -468,7 +468,7 @@ Partial Class frmCheckliste
         'btnPrint
         '
         Me.btnPrint.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnPrint.Image = Global.SDL.My.Resources.printer2
+        Me.btnPrint.Image = Global.SDL.My.Resources.Resources.printer2
         Me.btnPrint.ImageAlign = System.Drawing.ContentAlignment.TopCenter
         Me.btnPrint.Location = New System.Drawing.Point(426, 707)
         Me.btnPrint.Name = "btnPrint"
@@ -635,16 +635,6 @@ Partial Class frmCheckliste
         Me.cboPrinter.Size = New System.Drawing.Size(176, 21)
         Me.cboPrinter.TabIndex = 39
         '
-        'Button1
-        '
-        Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button1.Location = New System.Drawing.Point(352, 29)
-        Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(75, 23)
-        Me.Button1.TabIndex = 40
-        Me.Button1.Text = "prüfen DE"
-        Me.Button1.UseVisualStyleBackColor = True
-        '
         'lkl
         '
         Me.lkl.AutoSize = True
@@ -655,6 +645,16 @@ Partial Class frmCheckliste
         Me.lkl.TabStop = True
         Me.lkl.Text = "Link"
         '
+        'Button1
+        '
+        Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button1.Location = New System.Drawing.Point(352, 29)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(75, 23)
+        Me.Button1.TabIndex = 40
+        Me.Button1.Text = "prüfen DE"
+        Me.Button1.UseVisualStyleBackColor = True
+        '
         'frmCheckliste
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -771,6 +771,6 @@ Partial Class frmCheckliste
     Friend WithEvents cboPrinter As VERAG_PROG_ALLGEMEIN.MyComboBox
     Friend WithEvents dgvVollmachten As DataGridView
     Friend WithEvents lblVMErr As Label
-    Friend WithEvents Button1 As Button
     Friend WithEvents lkl As LinkLabel
+    Friend WithEvents Button1 As Button
 End Class

SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.vb

@@ -215,6 +215,7 @@
 
             txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("0%", "0"))
             txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("7%", "0,07"))
+            txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("10%", "0,10"))
             txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("19%", "0,19"))
             txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("20%", "0,20"))
             txtEustProzent.changeItem("0,19")
@@ -708,7 +709,8 @@
             Case "AMBAR"
                 txtVerzollungskosten._value = 93
                 txtATLAS._value = 8
-                txtClearing._value = 40
+                '  txtClearing._value = 40
+                txtClearing._value = 0
                 txtAviso._value = 20
                 txtSonstigeKosten._value = 40
                 txtSonstigeKostenText.Text = "Sonstige Kosten"

SDL/kassenbuch/frmBelegNeu.vb

@@ -35,7 +35,7 @@ Public Class frmBelegNeu
 
     Private EasyZVT_Worker As System.ComponentModel.BackgroundWorker = New System.ComponentModel.BackgroundWorker()
     Private Funktion As Integer
-    Private Betrag As Integer = 0
+    Private Betrag As Double = 0
     Private posTerminal As cRKSV_POS
     Private dt As DataTable
     Private setBreak As Boolean = True
@@ -950,10 +950,10 @@ Public Class frmBelegNeu
         End If
 
         '  If EA = "E" Then
-        lblBetrag_Netto.Text = sum.ToString("C")
-        lblBetrag_Steuern.Text = (sum * txtSteuersatz._value).ToString("C")
+        lblBetrag_Netto.Text = sum.ToString("C2")
+        lblBetrag_Steuern.Text = (sum * txtSteuersatz._value).ToString("C2")
         Betrag = (sum + sum * txtSteuersatz._value)
-        lblBetrag_Brutto.Text = (Betrag).ToString("C")
+        lblBetrag_Brutto.Text = (Betrag).ToString("C2")
         '  Else
         '  lblBetrag_Netto.Text = (-1 * sum).ToString("C")
         '   lblBetrag_Steuern.Text = (-1 * (sum * txtSteuersatz._value)).ToString("C")

SDL/kunden/usrCntlKundenuebersicht.vb

@@ -1886,11 +1886,11 @@ Public Class usrCntlKundenuebersicht
 
                 Dim sGetValue As EORI.eoriValidationResult = CallWebService.validateEORI(arrEori)
                 Dim f As EORI.eoriResponse
-                MsgBox(sGetValue.requestDate)
-                MsgBox(sGetValue.errorDescription.ToString)
+                'MsgBox(sGetValue.requestDate)
+                'MsgBox(sGetValue.errorDescription.ToString)
 
-                MsgBox("OK")
-                MsgBox(sGetValue.result)
+                'MsgBox("OK")
+                'MsgBox(sGetValue.result)
 
 
                 If f.status = 100 Then