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

SDL/Classes/cFinanzOnlineWebService.vb

@@ -315,7 +315,7 @@ Public Class cFinanzOnlineWebService
             Call_Web_Service_MethodUID_Logout_NEU2020()
             Return returnInt
         Catch ex As Exception
-            MsgBox(ex.Message & ex.StackTrace)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
             Call_Web_Service_MethodUID_Logout_NEU2020()
         End Try
         Return "-1"

SDL/Fakturierung/cFakturierung.vb

@@ -1782,7 +1782,7 @@ Public Class cFakturierung
         Return getSignature(RECHNUNG.RechnungsLandKz, RECHNUNG.Firma_ID)
     End Function
 
-    Shared Function getSignature(Optional landKz = "", Optional firma = -1, Optional individuell = False, Optional displayFirmenmane = True, Optional special = "", Optional additionalLine = "", Optional departmentmailadress = True) As String
+    Shared Function getSignature(Optional landKz = "", Optional firma = -1, Optional individuell = False, Optional displayFirmenmane = True, Optional special = "", Optional additionalLine = "", Optional departmentmailadress = True, Optional fakturierung = False) As String
         getSignature = ""
 
         firma = getFirmaNr(firma)
@@ -1827,10 +1827,10 @@ Public Class cFakturierung
                         getSignature &= "<div style=""font-size:12px"">A 4975 Suben, Autobahngrenze 15  <br><b>T</b>  +43 7711 31630  |  <b>F</b>  +43 7711 31630-1  |  <b>@</b>  " & If(individuell, emailindividuell, "info@imex-group.at") & "  |  www.imex-group.at  |  FN 410356s</div>"
                         If additionalLine <> "" Then getSignature &= vbNewLine & additionalLine & vbNewLine
                     Case 24 'AMBAR
-                        Dim defaultMail = getDefaultMail("AMBAR", departmentmailadress)
+                        Dim defaultMail = getDefaultMail("AMBAR", departmentmailadress, fakturierung)
                         getSignature &= "<img width=""250"" height=""70"" src=""" & imgsrc & "ambar_boarder.png""/>"
                         If displayFirmenmane Then getSignature &= "<br><b>AMBAR Logistic Services GmbH</b><br>"
-                        getSignature &= "<div style=""font-size:12px"">D 83435 Bad Reichenhall, Reichenhallerstrasse 62<br><b>T</b>  +49 8651 99624911  |  <b>F</b>  +49 8651 9962493   |  <b>@</b>  " & If(individuell, emailindividuell, defaultMail) & "  |  www.ambarlog.com  |  DE309105428</div>"
+                        getSignature &= "<div style=""font-size:12px"">D 83435 Bad Reichenhall, Reichenhallerstrasse 62<br><b>T</b>  +49 8651 9962492  |  <b>F</b>  +49 8651 9962493   |  <b>@</b>  " & If(individuell, emailindividuell, defaultMail) & "  |  www.ambarlog.com  |  DE309105428</div>"
                         If additionalLine <> "" Then getSignature &= vbNewLine & additionalLine & vbNewLine
                     Case 21 'UNISPED
                         getSignature &= "<img width=""250"" height=""50"" src=""" & imgsrc & "Unisped_logo.jpg""/>"
@@ -1883,6 +1883,20 @@ Public Class cFakturierung
                     getSignature &= "<br>"
             End Select
         End If
+
+        Select Case firma
+            Case 24 'AMBAR
+
+                Select Case landKz
+                    Case "D", "A", "DE", "AT", "CH"
+                        getSignature &= "<span style=""font-size:9px"">Wir arbeiten ausschließlich auf Grundlage der Allgemeinen Deutschen Spediteurbedingungen 2017 – ADSp 2017 –.</span>"
+
+                    Case Else
+                        getSignature &= "<span style=""font-size:9px"">Wir arbeiten ausschließlich auf Grundlage der Allgemeinen Deutschen Spediteurbedingungen 2017 – ADSp 2017 –.</span>"
+
+                End Select
+
+            Case Else
                 Select Case landKz
                     Case "D", "A", "DE", "AT", "CH"
                         getSignature &= "<span style=""font-size:9px"">Wir arbeiten ausschließlich auf Grund der Allgemeinen Österreichischen Spediteurbedingungen in der jeweils geltenden Fassung. Zahlungen werden zunächst auf Frachten,<br>
@@ -1898,9 +1912,11 @@ Public Class cFakturierung
                 charged on freight, fees and interests and at last on customs duties. The place of jurisdiction is Schärding or Ried. Tax, customs and tariff information are not binding.</span>"
 
                 End Select
+        End Select
+
     End Function
 
-    Shared Function getDefaultMail(firma, Optional useDepartmentmailadress = True) As String
+    Shared Function getDefaultMail(firma, Optional useDepartmentmailadress = True, Optional fakturierung = False) As String
         Dim defaultMail = ""
         Select Case firma
             Case "AMBAR"
@@ -1909,6 +1925,8 @@ Public Class cFakturierung
                     If VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG = "BH" Then defaultMail = "buchhaltung@ambarlog.de"
                     If VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG = "EXPORT" Then defaultMail = "office@ambarlog.de"
                 End If
+                If fakturierung Then defaultMail = "buchhaltung@ambarlog.de"
+
         End Select
         Return defaultMail
     End Function

SDL/Fakturierung/frmAbrechnungsMaske.Designer.vb

@@ -30,9 +30,12 @@ Partial Class frmAbrechnungsMaske
         Me.TabPage1 = New System.Windows.Forms.TabPage()
         Me.Button4 = New System.Windows.Forms.Button()
         Me.Label12 = New System.Windows.Forms.Label()
+        Me.dgvRechnungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.Panel2 = New System.Windows.Forms.Panel()
         Me.Button11 = New System.Windows.Forms.Button()
         Me.cbxOriginalDrucken = New System.Windows.Forms.CheckBox()
+        Me.cboSort = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cboPrinter = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.Button9 = New System.Windows.Forms.Button()
         Me.Button8 = New System.Windows.Forms.Button()
         Me.Button7 = New System.Windows.Forms.Button()
@@ -48,19 +51,16 @@ Partial Class frmAbrechnungsMaske
         Me.Label2 = New System.Windows.Forms.Label()
         Me.Label10 = New System.Windows.Forms.Label()
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.PictureBox5 = New System.Windows.Forms.PictureBox()
+        Me.cbxGutschriftenAnVerag = New System.Windows.Forms.CheckBox()
+        Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.Label14 = New System.Windows.Forms.Label()
         Me.cbx = New System.Windows.Forms.CheckBox()
+        Me.MyComboBox3 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.Label5 = New System.Windows.Forms.Label()
+        Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.Label1 = New System.Windows.Forms.Label()
         Me.lblSachbearbeiter = New System.Windows.Forms.Label()
-        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.cbxGutschriftenAnVerag = New System.Windows.Forms.CheckBox()
-        Me.dgvRechnungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
-        Me.cboSort = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.cboPrinter = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.MyComboBox3 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components)
         Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -85,6 +85,7 @@ Partial Class frmAbrechnungsMaske
         Me.btnBisJahr = New System.Windows.Forms.Button()
         Me.btnVonJahr = New System.Windows.Forms.Button()
         Me.UsrCntlFaktAbrechnung1 = New SDL.usrCntlFaktAbrechnung()
+        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.pnl.SuspendLayout()
         CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SplitContainer.Panel1.SuspendLayout()
@@ -92,9 +93,10 @@ Partial Class frmAbrechnungsMaske
         Me.SplitContainer.SuspendLayout()
         Me.tbcntr.SuspendLayout()
         Me.TabPage1.SuspendLayout()
+        CType(Me.dgvRechnungen, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel2.SuspendLayout()
         Me.Panel1.SuspendLayout()
-        CType(Me.dgvRechnungen, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.MyPanel1.SuspendLayout()
         Me.SuspendLayout()
         '
@@ -174,6 +176,25 @@ Partial Class frmAbrechnungsMaske
         Me.Label12.TextAlign = System.Drawing.ContentAlignment.TopCenter
         Me.Label12.Visible = False
         '
+        'dgvRechnungen
+        '
+        Me.dgvRechnungen.AKTUALISIERUNGS_INTERVALL = -1
+        Me.dgvRechnungen.AllowUserToAddRows = False
+        Me.dgvRechnungen.AllowUserToDeleteRows = False
+        Me.dgvRechnungen.AllowUserToResizeColumns = False
+        Me.dgvRechnungen.AllowUserToResizeRows = False
+        Me.dgvRechnungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.dgvRechnungen.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.dgvRechnungen.Location = New System.Drawing.Point(3, 3)
+        Me.dgvRechnungen.Margin = New System.Windows.Forms.Padding(2)
+        Me.dgvRechnungen.Name = "dgvRechnungen"
+        Me.dgvRechnungen.ReadOnly = True
+        Me.dgvRechnungen.RowHeadersVisible = False
+        Me.dgvRechnungen.RowTemplate.Height = 28
+        Me.dgvRechnungen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
+        Me.dgvRechnungen.Size = New System.Drawing.Size(561, 316)
+        Me.dgvRechnungen.TabIndex = 1
+        '
         'Panel2
         '
         Me.Panel2.BackColor = System.Drawing.Color.White
@@ -227,6 +248,30 @@ Partial Class frmAbrechnungsMaske
         Me.cbxOriginalDrucken.Text = "Original (ohne ""Kopie"")"
         Me.cbxOriginalDrucken.UseVisualStyleBackColor = True
         '
+        'cboSort
+        '
+        Me.cboSort._allowedValuesFreiText = Nothing
+        Me.cboSort._allowFreiText = False
+        Me.cboSort._value = ""
+        Me.cboSort.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboSort.FormattingEnabled = True
+        Me.cboSort.Location = New System.Drawing.Point(8, 73)
+        Me.cboSort.Name = "cboSort"
+        Me.cboSort.Size = New System.Drawing.Size(53, 21)
+        Me.cboSort.TabIndex = 26
+        '
+        'cboPrinter
+        '
+        Me.cboPrinter._allowedValuesFreiText = Nothing
+        Me.cboPrinter._allowFreiText = False
+        Me.cboPrinter._value = ""
+        Me.cboPrinter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboPrinter.FormattingEnabled = True
+        Me.cboPrinter.Location = New System.Drawing.Point(142, 52)
+        Me.cboPrinter.Name = "cboPrinter"
+        Me.cboPrinter.Size = New System.Drawing.Size(157, 21)
+        Me.cboPrinter.TabIndex = 25
+        '
         'Button9
         '
         Me.Button9.BackgroundImage = Global.SDL.My.Resources.Resources.pdf
@@ -395,6 +440,7 @@ Partial Class frmAbrechnungsMaske
         'Panel1
         '
         Me.Panel1.BackColor = System.Drawing.Color.White
+        Me.Panel1.Controls.Add(Me.PictureBox5)
         Me.Panel1.Controls.Add(Me.cbxGutschriftenAnVerag)
         Me.Panel1.Controls.Add(Me.MyComboBox1)
         Me.Panel1.Controls.Add(Me.Label14)
@@ -413,6 +459,38 @@ Partial Class frmAbrechnungsMaske
         Me.Panel1.Size = New System.Drawing.Size(575, 170)
         Me.Panel1.TabIndex = 0
         '
+        'PictureBox5
+        '
+        Me.PictureBox5.BackgroundImage = Global.SDL.My.Resources.Resources.fragezeichen
+        Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.PictureBox5.Location = New System.Drawing.Point(543, 3)
+        Me.PictureBox5.Name = "PictureBox5"
+        Me.PictureBox5.Size = New System.Drawing.Size(28, 29)
+        Me.PictureBox5.TabIndex = 133
+        Me.PictureBox5.TabStop = False
+        '
+        'cbxGutschriftenAnVerag
+        '
+        Me.cbxGutschriftenAnVerag.AutoSize = True
+        Me.cbxGutschriftenAnVerag.Location = New System.Drawing.Point(15, 59)
+        Me.cbxGutschriftenAnVerag.Name = "cbxGutschriftenAnVerag"
+        Me.cbxGutschriftenAnVerag.Size = New System.Drawing.Size(128, 17)
+        Me.cbxGutschriftenAnVerag.TabIndex = 54
+        Me.cbxGutschriftenAnVerag.Text = "nicht an Verag abger."
+        Me.cbxGutschriftenAnVerag.UseVisualStyleBackColor = True
+        '
+        'MyComboBox1
+        '
+        Me.MyComboBox1._allowedValuesFreiText = Nothing
+        Me.MyComboBox1._allowFreiText = False
+        Me.MyComboBox1._value = ""
+        Me.MyComboBox1.FormattingEnabled = True
+        Me.MyComboBox1.Location = New System.Drawing.Point(453, 28)
+        Me.MyComboBox1.Margin = New System.Windows.Forms.Padding(2)
+        Me.MyComboBox1.Name = "MyComboBox1"
+        Me.MyComboBox1.Size = New System.Drawing.Size(83, 21)
+        Me.MyComboBox1.TabIndex = 53
+        '
         'Label14
         '
         Me.Label14.AutoSize = True
@@ -434,6 +512,18 @@ Partial Class frmAbrechnungsMaske
         Me.cbx.Text = "Gedruckte Rechnugen anzeigen"
         Me.cbx.UseVisualStyleBackColor = True
         '
+        'MyComboBox3
+        '
+        Me.MyComboBox3._allowedValuesFreiText = Nothing
+        Me.MyComboBox3._allowFreiText = False
+        Me.MyComboBox3._value = ""
+        Me.MyComboBox3.FormattingEnabled = True
+        Me.MyComboBox3.Location = New System.Drawing.Point(453, 8)
+        Me.MyComboBox3.Margin = New System.Windows.Forms.Padding(2)
+        Me.MyComboBox3.Name = "MyComboBox3"
+        Me.MyComboBox3.Size = New System.Drawing.Size(83, 21)
+        Me.MyComboBox3.TabIndex = 33
+        '
         'Label5
         '
         Me.Label5.AutoSize = True
@@ -443,6 +533,18 @@ Partial Class frmAbrechnungsMaske
         Me.Label5.TabIndex = 32
         Me.Label5.Text = "Sammel-/Einzel-Rg.:"
         '
+        'MyComboBox2
+        '
+        Me.MyComboBox2._allowedValuesFreiText = Nothing
+        Me.MyComboBox2._allowFreiText = False
+        Me.MyComboBox2._value = ""
+        Me.MyComboBox2.FormattingEnabled = True
+        Me.MyComboBox2.Location = New System.Drawing.Point(99, 33)
+        Me.MyComboBox2.Margin = New System.Windows.Forms.Padding(2)
+        Me.MyComboBox2.Name = "MyComboBox2"
+        Me.MyComboBox2.Size = New System.Drawing.Size(154, 21)
+        Me.MyComboBox2.TabIndex = 31
+        '
         'Label1
         '
         Me.Label1.AutoSize = True
@@ -461,100 +563,6 @@ Partial Class frmAbrechnungsMaske
         Me.lblSachbearbeiter.TabIndex = 30
         Me.lblSachbearbeiter.Text = "Sachbearbeiter:"
         '
-        'ContextMenuStrip1
-        '
-        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
-        Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4)
-        '
-        'cbxGutschriftenAnVerag
-        '
-        Me.cbxGutschriftenAnVerag.AutoSize = True
-        Me.cbxGutschriftenAnVerag.Location = New System.Drawing.Point(15, 59)
-        Me.cbxGutschriftenAnVerag.Name = "cbxGutschriftenAnVerag"
-        Me.cbxGutschriftenAnVerag.Size = New System.Drawing.Size(128, 17)
-        Me.cbxGutschriftenAnVerag.TabIndex = 54
-        Me.cbxGutschriftenAnVerag.Text = "nicht an Verag abger."
-        Me.cbxGutschriftenAnVerag.UseVisualStyleBackColor = True
-        '
-        'dgvRechnungen
-        '
-        Me.dgvRechnungen.AKTUALISIERUNGS_INTERVALL = -1
-        Me.dgvRechnungen.AllowUserToAddRows = False
-        Me.dgvRechnungen.AllowUserToDeleteRows = False
-        Me.dgvRechnungen.AllowUserToResizeColumns = False
-        Me.dgvRechnungen.AllowUserToResizeRows = False
-        Me.dgvRechnungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.dgvRechnungen.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.dgvRechnungen.Location = New System.Drawing.Point(3, 3)
-        Me.dgvRechnungen.Margin = New System.Windows.Forms.Padding(2)
-        Me.dgvRechnungen.Name = "dgvRechnungen"
-        Me.dgvRechnungen.ReadOnly = True
-        Me.dgvRechnungen.RowHeadersVisible = False
-        Me.dgvRechnungen.RowTemplate.Height = 28
-        Me.dgvRechnungen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvRechnungen.Size = New System.Drawing.Size(561, 316)
-        Me.dgvRechnungen.TabIndex = 1
-        '
-        'cboSort
-        '
-        Me.cboSort._allowedValuesFreiText = Nothing
-        Me.cboSort._allowFreiText = False
-        Me.cboSort._value = ""
-        Me.cboSort.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.cboSort.FormattingEnabled = True
-        Me.cboSort.Location = New System.Drawing.Point(8, 73)
-        Me.cboSort.Name = "cboSort"
-        Me.cboSort.Size = New System.Drawing.Size(53, 21)
-        Me.cboSort.TabIndex = 26
-        '
-        'cboPrinter
-        '
-        Me.cboPrinter._allowedValuesFreiText = Nothing
-        Me.cboPrinter._allowFreiText = False
-        Me.cboPrinter._value = ""
-        Me.cboPrinter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.cboPrinter.FormattingEnabled = True
-        Me.cboPrinter.Location = New System.Drawing.Point(142, 52)
-        Me.cboPrinter.Name = "cboPrinter"
-        Me.cboPrinter.Size = New System.Drawing.Size(157, 21)
-        Me.cboPrinter.TabIndex = 25
-        '
-        'MyComboBox1
-        '
-        Me.MyComboBox1._allowedValuesFreiText = Nothing
-        Me.MyComboBox1._allowFreiText = False
-        Me.MyComboBox1._value = ""
-        Me.MyComboBox1.FormattingEnabled = True
-        Me.MyComboBox1.Location = New System.Drawing.Point(453, 28)
-        Me.MyComboBox1.Margin = New System.Windows.Forms.Padding(2)
-        Me.MyComboBox1.Name = "MyComboBox1"
-        Me.MyComboBox1.Size = New System.Drawing.Size(83, 21)
-        Me.MyComboBox1.TabIndex = 53
-        '
-        'MyComboBox3
-        '
-        Me.MyComboBox3._allowedValuesFreiText = Nothing
-        Me.MyComboBox3._allowFreiText = False
-        Me.MyComboBox3._value = ""
-        Me.MyComboBox3.FormattingEnabled = True
-        Me.MyComboBox3.Location = New System.Drawing.Point(453, 8)
-        Me.MyComboBox3.Margin = New System.Windows.Forms.Padding(2)
-        Me.MyComboBox3.Name = "MyComboBox3"
-        Me.MyComboBox3.Size = New System.Drawing.Size(83, 21)
-        Me.MyComboBox3.TabIndex = 33
-        '
-        'MyComboBox2
-        '
-        Me.MyComboBox2._allowedValuesFreiText = Nothing
-        Me.MyComboBox2._allowFreiText = False
-        Me.MyComboBox2._value = ""
-        Me.MyComboBox2.FormattingEnabled = True
-        Me.MyComboBox2.Location = New System.Drawing.Point(99, 33)
-        Me.MyComboBox2.Margin = New System.Windows.Forms.Padding(2)
-        Me.MyComboBox2.Name = "MyComboBox2"
-        Me.MyComboBox2.Size = New System.Drawing.Size(154, 21)
-        Me.MyComboBox2.TabIndex = 31
-        '
         'cboFirma
         '
         Me.cboFirma._allowedValuesFreiText = Nothing
@@ -920,6 +928,11 @@ Partial Class frmAbrechnungsMaske
         Me.UsrCntlFaktAbrechnung1.Size = New System.Drawing.Size(863, 615)
         Me.UsrCntlFaktAbrechnung1.TabIndex = 0
         '
+        'ContextMenuStrip1
+        '
+        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4)
+        '
         'frmAbrechnungsMaske
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -938,11 +951,12 @@ Partial Class frmAbrechnungsMaske
         Me.SplitContainer.ResumeLayout(False)
         Me.tbcntr.ResumeLayout(False)
         Me.TabPage1.ResumeLayout(False)
+        CType(Me.dgvRechnungen, System.ComponentModel.ISupportInitialize).EndInit()
         Me.Panel2.ResumeLayout(False)
         Me.Panel2.PerformLayout()
         Me.Panel1.ResumeLayout(False)
         Me.Panel1.PerformLayout()
-        CType(Me.dgvRechnungen, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit()
         Me.MyPanel1.ResumeLayout(False)
         Me.MyPanel1.PerformLayout()
         Me.ResumeLayout(False)
@@ -1009,4 +1023,5 @@ Partial Class frmAbrechnungsMaske
     Friend WithEvents Button11 As Button
     Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
     Friend WithEvents cbxGutschriftenAnVerag As CheckBox
+    Friend WithEvents PictureBox5 As PictureBox
 End Class

SDL/Fakturierung/frmAbrechnungsMaske.vb

@@ -49,6 +49,10 @@ Public Class frmAbrechnungsMaske
             FirmaTmp = "VERAGIMEX"
         End If
 
+        If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
+            FirmaTmp = "AMBAR"
+        End If
+
         MyComboBox2.Items.Clear()
 
         Select Case FirmaTmp
@@ -785,4 +789,9 @@ Public Class frmAbrechnungsMaske
         MyPanel1.Visible = False
         initDGV()
     End Sub
+
+    Private Sub PictureBox5_Click(sender As Object, e As EventArgs) Handles PictureBox5.Click
+        Dim webAddress As String = "https://wiki.verag.ag/de/abteilungen/verrechnung/xxxx"
+        Process.Start(webAddress)
+    End Sub
 End Class

SDL/Fakturierung/frmFaktEmail.vb

@@ -306,10 +306,12 @@ Public Class frmFaktEmail
                     End If
 
                     Dim outl As New Outlook.Application
+
                     Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
                         Mail = outl.CreateItem(0)
                         Mail.Subject = txtSubject.Text
 
+                    If Firma_ID = 24 Then Mail.SentOnBehalfOfName = SDL.cFakturierung.getDefaultMail("AMBAR",, True)
 
                     'Mail-Adressen eintragen
                     '-----------------------------------------------------------------
@@ -328,7 +330,7 @@ Public Class frmFaktEmail
                         txtSubject.Text = txtSubject.Text.Replace("%RgNr%", lastAktuelle_RgNr)
 
 
-                        Dim TextHTML = "<div style=""font-family:Calibri, Arial"">" & RichTextBox.Text.Replace(ControlChars.Lf, "<br>") & cFakturierung.getSignature(AD.LandKz, Firma_ID,,,, additionalLine) & "</div>"
+                    Dim TextHTML = "<div style=""font-family:Calibri, Arial"">" & RichTextBox.Text.Replace(ControlChars.Lf, "<br>") & cFakturierung.getSignature(AD.LandKz, Firma_ID,,,, additionalLine,, IIf(Firma_ID = "24", True, False)) & "</div>"
 
                     Mail.HTMLBody = TextHTML
                         Mail.Subject = txtSubject.Text
@@ -404,6 +406,7 @@ Public Class frmFaktEmail
                     Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
                     Mail = outl.CreateItem(0)
 
+                    If Firma_ID = 24 Then Mail.SentOnBehalfOfName = SDL.cFakturierung.getDefaultMail("AMBAR",, True)
 
                     'Mail-Adressen eintragen
                     '-----------------------------------------------------------------
@@ -571,6 +574,9 @@ Public Class frmFaktEmail
                 Mail_StbFA = outl.CreateItem(0)
                 Mail_StbFA.Subject = txtSubject.Text
 
+                If Firma_ID = 24 Then Mail_StbFA.SentOnBehalfOfName = SDL.cFakturierung.getDefaultMail("AMBAR",, True)
+
+
                 Dim TextHTML = "<div style=""font-family:Calibri, Arial"">"
 
                 Select Case cboFaStb_Sprache._value

SDL/Fakturierung/frmRechnungenSuche.Designer.vb

@@ -104,6 +104,7 @@ Partial Class frmRechnungenSuche
         Me.cntxtCntxtSpeditionsbuch = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.EintragLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.pnlOpt = New System.Windows.Forms.Panel()
+        Me.lblunterschRe = New System.Windows.Forms.Label()
         Me.Label17 = New System.Windows.Forms.Label()
         Me.txtMaxSrch = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.pnlBerichte = New System.Windows.Forms.Panel()
@@ -132,7 +133,7 @@ Partial Class frmRechnungenSuche
         Me.Label4 = New System.Windows.Forms.Label()
         Me.pnlTop = New System.Windows.Forms.Panel()
         Me.TestToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.lblunterschRe = New System.Windows.Forms.Label()
+        Me.PictureBox5 = New System.Windows.Forms.PictureBox()
         CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SplitContainer.Panel1.SuspendLayout()
         Me.SplitContainer.Panel2.SuspendLayout()
@@ -152,6 +153,7 @@ Partial Class frmRechnungenSuche
         Me.pnl.SuspendLayout()
         Me.ctxtRg.SuspendLayout()
         Me.pnlTop.SuspendLayout()
+        CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'SplitContainer
@@ -1487,6 +1489,15 @@ Partial Class frmRechnungenSuche
         Me.pnlOpt.Size = New System.Drawing.Size(1327, 70)
         Me.pnlOpt.TabIndex = 1
         '
+        'lblunterschRe
+        '
+        Me.lblunterschRe.Location = New System.Drawing.Point(1164, 2)
+        Me.lblunterschRe.Name = "lblunterschRe"
+        Me.lblunterschRe.Size = New System.Drawing.Size(162, 20)
+        Me.lblunterschRe.TabIndex = 45
+        Me.lblunterschRe.Text = "Anz untersch. Belege: 0"
+        Me.lblunterschRe.TextAlign = System.Drawing.ContentAlignment.TopRight
+        '
         'Label17
         '
         Me.Label17.AutoSize = True
@@ -1785,6 +1796,7 @@ Partial Class frmRechnungenSuche
         'pnlTop
         '
         Me.pnlTop.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.pnlTop.Controls.Add(Me.PictureBox5)
         Me.pnlTop.Controls.Add(Me.Label4)
         Me.pnlTop.Controls.Add(Me.Label22)
         Me.pnlTop.Dock = System.Windows.Forms.DockStyle.Top
@@ -1799,14 +1811,15 @@ Partial Class frmRechnungenSuche
         Me.TestToolStripMenuItem.Size = New System.Drawing.Size(150, 19)
         Me.TestToolStripMenuItem.Text = "test"
         '
-        'lblunterschRe
+        'PictureBox5
         '
-        Me.lblunterschRe.Location = New System.Drawing.Point(1164, 2)
+        Me.PictureBox5.BackgroundImage = Global.SDL.My.Resources.Resources.fragezeichen
-        Me.lblunterschRe.Name = "lblunterschRe"
+        Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.lblunterschRe.Size = New System.Drawing.Size(162, 20)
+        Me.PictureBox5.Location = New System.Drawing.Point(1291, 10)
-        Me.lblunterschRe.TabIndex = 45
+        Me.PictureBox5.Name = "PictureBox5"
-        Me.lblunterschRe.Text = "Anz untersch. Belege: 0"
+        Me.PictureBox5.Size = New System.Drawing.Size(28, 29)
-        Me.lblunterschRe.TextAlign = System.Drawing.ContentAlignment.TopRight
+        Me.PictureBox5.TabIndex = 133
+        Me.PictureBox5.TabStop = False
         '
         'frmRechnungenSuche
         '
@@ -1846,6 +1859,7 @@ Partial Class frmRechnungenSuche
         Me.ctxtRg.ResumeLayout(False)
         Me.pnlTop.ResumeLayout(False)
         Me.pnlTop.PerformLayout()
+        CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
 
     End Sub
@@ -1958,4 +1972,5 @@ Partial Class frmRechnungenSuche
     Friend WithEvents ctxtRg As ContextMenuStrip
     Friend WithEvents DateiHochladenToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents lblunterschRe As Label
+    Friend WithEvents PictureBox5 As PictureBox
 End Class

SDL/Fakturierung/frmRechnungenSuche.resx

@@ -126,6 +126,9 @@
   <metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>316, 17</value>
   </metadata>
+  <metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>316, 17</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="ToolStripMenuItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

SDL/Fakturierung/frmRechnungenSuche.vb

@@ -878,4 +878,9 @@ Public Class frmRechnungenSuche
     Private Sub DataGridView_SelectionChanged(sender As Object, e As EventArgs) Handles DataGridView.SelectionChanged
         btnPDF.Enabled = (DataGridView.SelectedRows.Count > 0)
     End Sub
+
+    Private Sub PictureBox5_Click(sender As Object, e As EventArgs) Handles PictureBox5.Click
+        Dim webAddress As String = "https://wiki.verag.ag/de/abteilungen/verrechnung/xxxx"
+        Process.Start(webAddress)
+    End Sub
 End Class

SDL/Fakturierung/rptRechnungDruck.Designer.vb

@@ -403,7 +403,7 @@ Partial Public Class rptRechnungDruck
     "455"
         Me.txtBank3.Top = 0.1173228!
         Me.txtBank3.Visible = False
-        Me.txtBank3.Width = 1.788977!
+        Me.txtBank3.Width = 1.945276!
         '
         'ReportHeader1
         '

SDL/Fakturierung/rptSammelRechnungAnlagenDruck.Designer.vb

@@ -37,6 +37,7 @@ Partial Public Class rptSammelRechnungAnlagenDruck
         Me.txtBank1 = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
         Me.txtBank2 = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
         Me.txtDisclaimer = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
+        Me.txtBank3 = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
         Me.ReportHeader1 = New GrapeCity.ActiveReports.SectionReportModel.ReportHeader()
         Me.lblRgNr = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.lblRgNrUeberschrift = New GrapeCity.ActiveReports.SectionReportModel.Label()
@@ -98,7 +99,6 @@ Partial Public Class rptSammelRechnungAnlagenDruck
         Me.Line15 = New GrapeCity.ActiveReports.SectionReportModel.Line()
         Me.Line17 = New GrapeCity.ActiveReports.SectionReportModel.Line()
         Me.GroupFooter4 = New GrapeCity.ActiveReports.SectionReportModel.GroupFooter()
-        Me.txtBank3 = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
         CType(Me.lblPosNr, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblDatum, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblSteuerfrei, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -112,6 +112,7 @@ Partial Public Class rptSammelRechnungAnlagenDruck
         CType(Me.txtBank1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.txtBank2, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.txtDisclaimer, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.txtBank3, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblRgNr, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblRgNrUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.Picture1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -155,7 +156,6 @@ Partial Public Class rptSammelRechnungAnlagenDruck
         CType(Me.lblPosNrUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblSendungUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblSteuerfreiUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.txtBank3, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me, System.ComponentModel.ISupportInitialize).BeginInit()
         '
         'PageHeader
@@ -375,6 +375,22 @@ Partial Public Class rptSammelRechnungAnlagenDruck
         Me.txtDisclaimer.Top = 0.6082678!
         Me.txtDisclaimer.Width = 7.466143!
         '
+        'txtBank3
+        '
+        Me.txtBank3.DataField = ""
+        Me.txtBank3.DistinctField = ""
+        Me.txtBank3.Height = 0.4181104!
+        Me.txtBank3.Left = 4.761418!
+        Me.txtBank3.Name = "txtBank3"
+        Me.txtBank3.Style = "color: Black; font-size: 8pt; font-weight: normal; text-align: left; text-justify" &
+    ": auto; ddo-char-set: 1"
+        Me.txtBank3.SummaryGroup = ""
+        Me.txtBank3.Text = "Deutschland:" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Raiffeisenbank Suben" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "IBAN: AT54 3445 5000 0420 7791" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "BIC: RZOOAT2L" &
+    "455"
+        Me.txtBank3.Top = 0.1173228!
+        Me.txtBank3.Visible = False
+        Me.txtBank3.Width = 1.921653!
+        '
         'ReportHeader1
         '
         Me.ReportHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.lblRgNr, Me.lblRgNrUeberschrift, Me.Picture1, Me.picVERAG, Me.lblKundenNrUeberschrift, Me.lblUeberschriftRG_GS, Me.lblKundenNr, Me.Line3, Me.lblFirmaOrt, Me.lblFirmaStrasse, Me.lblFirmaTel, Me.lblFirmaFax, Me.lblFirmaEmail, Me.lblFirmaWeb, Me.lblRgDatumUeberschrift, Me.lblRgDatum, Me.lblSachbearbeiterUeberschrift, Me.lblSachbearbeiter, Me.lblFirmenbuchUeberschrift, Me.lblFirmenbuch, Me.lblUIDUeberschrift, Me.lblUID, Me.lblEORIUeberschrift, Me.lblEORI, Me.lblRechnung_UID_Ueberschrift, Me.lblRechnung_UID, Me.lblRechnung_Steuernummer_Ueberschrift, Me.lblRechnung_Steuernummer, Me.lblFirma, Me.lblRechnungAn, Me.Line13})
@@ -1098,22 +1114,6 @@ Partial Public Class rptSammelRechnungAnlagenDruck
         Me.GroupFooter4.Height = 0!
         Me.GroupFooter4.Name = "GroupFooter4"
         '
-        'txtBank3
-        '
-        Me.txtBank3.DataField = ""
-        Me.txtBank3.DistinctField = ""
-        Me.txtBank3.Height = 0.4181104!
-        Me.txtBank3.Left = 4.761418!
-        Me.txtBank3.Name = "txtBank3"
-        Me.txtBank3.Style = "color: Black; font-size: 8pt; font-weight: normal; text-align: left; text-justify" &
-    ": auto; ddo-char-set: 1"
-        Me.txtBank3.SummaryGroup = ""
-        Me.txtBank3.Text = "Deutschland:" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Raiffeisenbank Suben" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "IBAN: AT54 3445 5000 0420 7791" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "BIC: RZOOAT2L" &
-    "455"
-        Me.txtBank3.Top = 0.1173228!
-        Me.txtBank3.Visible = False
-        Me.txtBank3.Width = 1.78622!
-        '
         'rptSammelRechnungAnlagenDruck
         '
         Me.PageSettings.Margins.Bottom = 0.3937008!
@@ -1149,6 +1149,7 @@ Partial Public Class rptSammelRechnungAnlagenDruck
         CType(Me.txtBank1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.txtBank2, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.txtDisclaimer, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.txtBank3, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblRgNr, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblRgNrUeberschrift, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.Picture1, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1192,7 +1193,6 @@ Partial Public Class rptSammelRechnungAnlagenDruck
         CType(Me.lblPosNrUeberschrift, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblSendungUeberschrift, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblSteuerfreiUeberschrift, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.txtBank3, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me, System.ComponentModel.ISupportInitialize).EndInit()
 
     End Sub

SDL/Fakturierung/rptSammelRechnungDruck.Designer.vb

@@ -33,6 +33,7 @@ Partial Public Class rptSammelRechnungDruck
         Me.txtBank1 = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
         Me.txtBank2 = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
         Me.txtDisclaimer = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
+        Me.txtBank3 = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
         Me.ReportHeader1 = New GrapeCity.ActiveReports.SectionReportModel.ReportHeader()
         Me.lblRgNr = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.lblRgNrUeberschrift = New GrapeCity.ActiveReports.SectionReportModel.Label()
@@ -99,7 +100,6 @@ Partial Public Class rptSammelRechnungDruck
         Me.Line15 = New GrapeCity.ActiveReports.SectionReportModel.Line()
         Me.Line17 = New GrapeCity.ActiveReports.SectionReportModel.Line()
         Me.GroupFooter4 = New GrapeCity.ActiveReports.SectionReportModel.GroupFooter()
-        Me.txtBank3 = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
         CType(Me.lblLeistungNr, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblAnzahl, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblSteuerfrei, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -110,6 +110,7 @@ Partial Public Class rptSammelRechnungDruck
         CType(Me.txtBank1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.txtBank2, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.txtDisclaimer, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.txtBank3, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblRgNr, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblRgNrUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.Picture1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -158,7 +159,6 @@ Partial Public Class rptSammelRechnungDruck
         CType(Me.lblLeistungUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblAnzahlUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblSteuerfreiUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.txtBank3, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me, System.ComponentModel.ISupportInitialize).BeginInit()
         '
         'PageHeader
@@ -334,6 +334,22 @@ Partial Public Class rptSammelRechnungDruck
         Me.txtDisclaimer.Top = 0.6082678!
         Me.txtDisclaimer.Width = 7.466143!
         '
+        'txtBank3
+        '
+        Me.txtBank3.DataField = ""
+        Me.txtBank3.DistinctField = ""
+        Me.txtBank3.Height = 0.4181104!
+        Me.txtBank3.Left = 4.700394!
+        Me.txtBank3.Name = "txtBank3"
+        Me.txtBank3.Style = "color: Black; font-size: 8pt; font-weight: normal; text-align: left; text-justify" &
+    ": auto; ddo-char-set: 1"
+        Me.txtBank3.SummaryGroup = ""
+        Me.txtBank3.Text = "Deutschland:" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Raiffeisenbank Suben" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "IBAN: AT54 3445 5000 0420 7791" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "BIC: RZOOAT2L" &
+    "455"
+        Me.txtBank3.Top = 0.1901575!
+        Me.txtBank3.Visible = False
+        Me.txtBank3.Width = 1.941338!
+        '
         'ReportHeader1
         '
         Me.ReportHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.lblRgNr, Me.lblRgNrUeberschrift, Me.Picture1, Me.picVERAG, Me.lblKundenNrUeberschrift, Me.lblUeberschriftRG_GS, Me.lblKundenNr, Me.Line3, Me.lblFirmaOrt, Me.lblFirmaStrasse, Me.lblFirmaTel, Me.lblFirmaFax, Me.lblFirmaEmail, Me.lblFirmaWeb, Me.lblRgDatumUeberschrift, Me.lblRgDatum, Me.lblSachbearbeiterUeberschrift, Me.lblSachbearbeiter, Me.lblFirmenbuchUeberschrift, Me.lblFirmenbuch, Me.lblUIDUeberschrift, Me.lblUID, Me.lblEORIUeberschrift, Me.lblEORI, Me.lblRechnung_UID_Ueberschrift, Me.lblRechnung_UID, Me.lblRechnung_Steuernummer_Ueberschrift, Me.lblRechnung_Steuernummer, Me.Line13, Me.lblFirma, Me.lblLKWIdUebeschrift, Me.lblLKWId, Me.lblRechnungAn})
@@ -1115,22 +1131,6 @@ Partial Public Class rptSammelRechnungDruck
         Me.GroupFooter4.Height = 0!
         Me.GroupFooter4.Name = "GroupFooter4"
         '
-        'txtBank3
-        '
-        Me.txtBank3.DataField = ""
-        Me.txtBank3.DistinctField = ""
-        Me.txtBank3.Height = 0.4181104!
-        Me.txtBank3.Left = 4.700394!
-        Me.txtBank3.Name = "txtBank3"
-        Me.txtBank3.Style = "color: Black; font-size: 8pt; font-weight: normal; text-align: left; text-justify" &
-    ": auto; ddo-char-set: 1"
-        Me.txtBank3.SummaryGroup = ""
-        Me.txtBank3.Text = "Deutschland:" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Raiffeisenbank Suben" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "IBAN: AT54 3445 5000 0420 7791" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "BIC: RZOOAT2L" &
-    "455"
-        Me.txtBank3.Top = 0.1901575!
-        Me.txtBank3.Visible = False
-        Me.txtBank3.Width = 1.795669!
-        '
         'rptSammelRechnungDruck
         '
         Me.PageSettings.Margins.Bottom = 0.3937008!
@@ -1163,6 +1163,7 @@ Partial Public Class rptSammelRechnungDruck
         CType(Me.txtBank1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.txtBank2, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.txtDisclaimer, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.txtBank3, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblRgNr, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblRgNrUeberschrift, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.Picture1, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1211,7 +1212,6 @@ Partial Public Class rptSammelRechnungDruck
         CType(Me.lblLeistungUeberschrift, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblAnzahlUeberschrift, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblSteuerfreiUeberschrift, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.txtBank3, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me, System.ComponentModel.ISupportInitialize).EndInit()
 
     End Sub

SDL/Fakturierung/usrCntlFaktAbrechnung.vb

@@ -539,6 +539,10 @@ Public Class usrCntlFaktAbrechnung
             FirmaTmp = "VERAGIMEX"
         End If
 
+        If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
+            FirmaTmp = "AMBAR"
+        End If
+
         Select Case FirmaTmp
             Case "VERAG"
                 If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGAG_DE", "SDL") Then
@@ -2039,7 +2043,6 @@ Public Class usrCntlFaktAbrechnung
     Sub getValues_ANHAENGE()
         Try
 
-            If RECHNUNG.ANHAENGE.Count = 0 Then Exit Sub
             RECHNUNG.ANHAENGE.Clear()
 
             For Each r As DataGridViewRow In dgvAnhaenge.Rows

SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.vb

@@ -92,11 +92,13 @@
             Dim KUNDE As New VERAG_PROG_ALLGEMEIN.cKunde(KdNR)
             Dim ADRESSE As New VERAG_PROG_ALLGEMEIN.cAdressen(KdNR)
 
-            txtFirma.Text = If(ADRESSE.Name_1, "") & If(If(ADRESSE.Name_2, "") <> "", " " & ADRESSE.Name_2, "")
+
-            txtAdresse1.Text = If(ADRESSE.Straße, "")
+
+            txtFirma.Text = VERAG_PROG_ALLGEMEIN.cDATENSERVER.replaceInvalidCahr(If(ADRESSE.Name_1, "") & If(If(ADRESSE.Name_2, "") <> "", " " & ADRESSE.Name_2, ""))
+            txtAdresse1.Text = VERAG_PROG_ALLGEMEIN.cDATENSERVER.replaceInvalidCahr(If(ADRESSE.Straße, ""))
             txtLand.Text = If(ADRESSE.LandKz, "")
             txtPLZ.Text = If(ADRESSE.PLZ, "")
-            txtOrt.Text = If(ADRESSE.Ort, "").ToString.Trim
+            txtOrt.Text = VERAG_PROG_ALLGEMEIN.cDATENSERVER.replaceInvalidCahr(If(ADRESSE.Ort, "").ToString.Trim)
             txtUid.Text = If(ADRESSE.UstIdKz, "") & If(ADRESSE.UstIdNr, "")
             txtEori.Text = If(KUNDE.EORITIN, "")
             txtTel.Text = If(ADRESSE.Telefon, "")

SDL/My Project/Resources.resx

@@ -914,6 +914,6 @@
     <value>..\Resources\cbam_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="ambar_boarder" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ambar_boarder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\ambar_boarder.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>

SDL/SDL.vbproj

@@ -4746,6 +4746,8 @@
     <None Include="Resources\air-pollution.png" />
     <None Include="Resources\cbam_s.png" />
     <None Include="Resources\ambar_boarder.png" />
+    <None Include="Resources\ambar_boarder1.jpg" />
+    <None Include="Resources\ambar_boarder.jpg" />
     <Content Include="Resources\food.png" />
     <None Include="Resources\food1.png" />
     <None Include="Resources\food2.png" />

SDL/kunden/frmBonitaet.vb

@@ -30,6 +30,8 @@ Public Class frmBonitaet
                 cBonitaetsauskunft = New VERAG_PROG_ALLGEMEIN.cBonitaetsauskunft
             ElseIf vbYes <> MsgBox("Es wurde heute um '" & cBonitaetsauskunft.ba_Datum.ToShortTimeString & "' bereits eine Bonitätsauskunft für den Kunden eingeholt, möchten Sie diese überschreiben?", vbYesNoCancel) Then
                 Exit Sub
+            Else
+                cBonitaetsauskunft.ba_datenarchivId = Nothing
             End If
 
             cBonitaetsauskunft.ba_KundenNr = (KdNR)

SDL/kunden/usrCntlKundenuebersicht.vb

@@ -2709,6 +2709,7 @@ Public Class usrCntlKundenuebersicht
         Dim name As String = checkNullStr(ADRESSE.Name_1)
 
         Cursor = Cursors.WaitCursor
+        btnCreditsafe.Enabled = False 'doppelklick verhindern!
 
         KUNDE_ERW = New VERAG_PROG_ALLGEMEIN.cKundenErweitert(kdNr)
 
@@ -2754,7 +2755,6 @@ Public Class usrCntlKundenuebersicht
 
                     Case "A" : land = "AT"
                     Case "D" : land = "DE"
-
                     Case Else
                         land = ADRESSE.LandKz
 
@@ -2765,9 +2765,23 @@ Public Class usrCntlKundenuebersicht
 
                 If lblBonitaetsdatum._value <> Nothing Then
 
+
                     Dim lastChecked As Date = Date.ParseExact(lblBonitaetsdatum._value, "dd.MM.yyyy", System.Globalization.DateTimeFormatInfo.InvariantInfo)
                     company.lastChecked = lastChecked
 
+                    If lastChecked = Today Then
+                        Dim bonaus = VERAG_PROG_ALLGEMEIN.cBonitaetsauskunft.LOADByKdNrDate(kdNr, Today)
+                        If bonaus.ba_Pruefungstool = "creditsafe API" AndAlso bonaus.ba_datenarchivId > -1 Then
+                            MsgBox("Heute wurde bereits eine erfolgreiche Abfrage durchgeführt" & vbNewLine & "Vorgang wird abgebrochen!")
+                            Cursor = Cursors.Default
+                            btnCreditsafe.Enabled = True
+                            Exit Sub
+                        End If
+                    End If
+
+
+
+
                     If cs.checkDateOfLastRequest(company) < lastChecked Then
                         Dim a As MsgBoxResult = MsgBox("Seit der letzen Abfrage (" & lastChecked.ToShortDateString & ") wurde bei Creditsafe keine Änderung gemacht!" & vbNewLine & "Trotzdem Creditreport-Daten aktualisieren?", vbYesNo)
                         If a = vbYes Then
@@ -2797,6 +2811,7 @@ Public Class usrCntlKundenuebersicht
         initCreditsave()
         setKD(kdNr)
         Cursor = Cursors.Default
+        btnCreditsafe.Enabled = True
 
     End Sub
 

SDL/kunden/usrcntlKundeBearbeitenFull.vb

@@ -426,6 +426,8 @@ Public Class usrcntlKundeBearbeitenFull
                     Else
                         kundenkreis = "2262630-2291290" 'ausl.Kundenkreis
                     End If
+                Case "AMBAR"
+                    cbxFiBu.Checked = True
             End Select
 
             Dim s_KdNr = kundenkreis.Split("-")

VERAG_PROG_ALLGEMEIN/Classes/cAdressen.vb

@@ -228,11 +228,32 @@ Public Class cAdressen
         Return id > 0
     End Function
 
+    Public Function UpdateSpecialField(field, value) As Boolean
+        If field = "" Then Return False
+
+        Dim itemFound = False
+        For Each s In getParameterList()
+            If s.Scalarvariable = field AndAlso value IsNot Nothing Then
+                itemFound = True
+                Exit For
+            End If
+        Next
+
+        If Not itemFound Then Return False
+
+        Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM Adressen  WHERE AdressenNr= " & AdressenNr & ") " &
+                       " BEGIN UPDATE [Adressen] SET " & field & " = '" & value & "' WHERE AdressenNr=" & AdressenNr & " End " &
+                       " commit tran "
+
+        Return SQL.doSQL(sqlstr, "FMZOLL")
+
+    End Function
+
     Public Sub LOAD()
         Dim test = ""
         Try
             Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL(False)
-                Using cmd As New SqlCommand("SELECT * FROM Adressen WHERE AdressenNr=@AdressenNr  ", conn)
+                Using cmd As New SqlCommand("Select * FROM Adressen WHERE AdressenNr=@AdressenNr  ", conn)
                     cmd.Parameters.AddWithValue("@AdressenNr", AdressenNr)
 
                     Dim dr = cmd.ExecuteReader()
@@ -271,7 +292,7 @@ Public Class cAdressen
             'Return Nothing
         Catch ex As Exception
             VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
-            '   MsgBox(test & "Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+            '   MsgBox(test & "Fehler In der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
         End Try
         '  Return Nothing
     End Sub

VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb

@@ -224,7 +224,8 @@ Public Class cUIDPruefung
 
                                 counter += 1
                                 Dim errorCode = -99
-                                Dim UID_TMP = FO.Call_Web_Service_MethodUID_Abfrage_NEU2020(r("KdNr"),, SaveErgInAdressen, showErr,, errorCode)
+                                Dim errormsg = ""
+                                Dim UID_TMP = FO.Call_Web_Service_MethodUID_Abfrage_NEU2020(r("KdNr"),, SaveErgInAdressen, showErr,, errorCode, errorMsg)
                                 If UID_TMP IsNot Nothing Then
                                     If UID_TMP.uid_valid Then
                                         r("Ergebnis") = "OK"
@@ -242,7 +243,7 @@ Public Class cUIDPruefung
                                 Else
                                     r("Ergebnis") = "ERROR"
                                     r("Error-Code") = errorCode.ToString()
-                                    r("Error-Text") = FO.GetCodeText(errorCode)
+                                    r("Error-Text") = FO.GetCodeText(errorCode) & errormsg
 
                                     ' Bei ERROR soll er ebenfalls einzeln durchgehen! Besprochen mit A.Stockenhuber
                                     'For Each row As DataRow In dt.Select("UstIdnr = '" & r("UstIdnr") & "' AND UstIdKz ='" & r("UstIdKz") & "'")
@@ -365,8 +366,11 @@ Public Class cUIDPruefung
                         UID_TMP.SAVE()
                         If valid Then
                             If SaveErgInAdressen Then
-                                AD.UstIdGeprüft = Now.ToShortDateString
+
-                                AD.SAVE()
+                                AD.UpdateSpecialField("UstIdGeprüft", Now.ToShortDateString)
+
+                                'AD.UstIdGeprüft = Now.ToShortDateString
+                                'AD.SAVE()
                             End If
                         End If
                         Return UID_TMP

VERAG_PROG_ALLGEMEIN/Schnittstellen/Finanzonline/cFinanzOnlineWebService.vb

@@ -89,15 +89,13 @@ Public Class cFinanzOnlineWebService
 
 
 
-    Function Call_Web_Service_MethodUID_Abfrage_NEU2020(ba_KundenNr, Optional AskIfDouble = False, Optional SaveErgInAdressen = True, Optional showErr = True, Optional Stufe = 1, Optional ByRef errorCode = 0) As VERAG_PROG_ALLGEMEIN.cUIDPruefung
+    Function Call_Web_Service_MethodUID_Abfrage_NEU2020(ba_KundenNr, Optional AskIfDouble = False, Optional SaveErgInAdressen = True, Optional showErr = True, Optional Stufe = 1, Optional ByRef errorCode = 0, Optional ByRef errorMsg = "") As VERAG_PROG_ALLGEMEIN.cUIDPruefung
         Dim AD As New cAdressen(ba_KundenNr)
         Dim multiUID = False
         If AD IsNot Nothing Then
 
             If AD.UstIdKz IsNot Nothing AndAlso AD.UstIdNr IsNot Nothing Then
 
-
-
                 Try
                     If AskIfDouble Then
                         If IsDate(AD.UstIdGeprüft) AndAlso CDate(AD.UstIdGeprüft).ToShortDateString = Now.ToShortDateString Then
@@ -133,9 +131,11 @@ Public Class cFinanzOnlineWebService
                     Try
 
                         returnInt = CallWebService.uidAbfrage(tid, benid, SESSION_ID, uid, countryCode & vatNumber, StufeAbf, msg, name, adrz1, adrz2, adrz3, adrz4, adrz5, adrz6)
+                        If msg <> "" Then errorMsg = " " & msg
                         errorCode = returnInt
                     Catch ex As Exception
-                        MsgBox("Fehler im externen Webservice '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+
+                        VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, "Fehler im externen Webservice " & System.Reflection.MethodInfo.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
                         Exit Function
                     End Try
 
@@ -208,8 +208,10 @@ Public Class cFinanzOnlineWebService
 
                                     If (UID_TMP.uid_valid) Then 'OK
                                         If SaveErgInAdressen Then
-                                            AD_new.UstIdGeprüft = Now.ToShortDateString
+
-                                            AD_new.SAVE()
+                                            AD_new.UpdateSpecialField("UstIdGeprüft", Now.ToShortDateString)
+                                            'AD_new.UstIdGeprüft = Now.ToShortDateString
+                                            'AD_new.SAVE()
                                         End If
                                     End If
 
@@ -221,8 +223,11 @@ Public Class cFinanzOnlineWebService
 
                         If (returnInt = 0) Then 'OK
                             If SaveErgInAdressen Then
-                                AD.UstIdGeprüft = Now.ToShortDateString
+
-                                AD.SAVE()
+                                AD.UpdateSpecialField("UstIdGeprüft", Now.ToShortDateString)
+                                'AD.UstIdGeprüft = Now.ToShortDateString
+                                'AD.SAVE()
+
                             End If
 
                         End If