Timas Bugfix, EMail Function für AMBAR korrigiert, Essensbestellungen für Verag360

SDL/frmEssensbestellungenAdministration.Designer.vb

@@ -67,6 +67,8 @@ Partial Class frmEssensbestellungenAdministration
         Me.AbgerechnetToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.BearbeitenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.AnHigway118SchickenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ExportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ExcelToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.txtAnzahlDS = New System.Windows.Forms.TextBox()
         Me.Label27 = New System.Windows.Forms.Label()
         Me.Label5 = New System.Windows.Forms.Label()
@@ -80,8 +82,6 @@ Partial Class frmEssensbestellungenAdministration
         Me.lblWarning = New System.Windows.Forms.Label()
         Me.Button2 = New System.Windows.Forms.Button()
         Me.Label9 = New System.Windows.Forms.Label()
-        Me.ExportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ExcelToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.pnlTop.SuspendLayout()
         Me.Panel1.SuspendLayout()
         Me.ContextMenuStrip1.SuspendLayout()
@@ -262,11 +262,11 @@ Partial Class frmEssensbestellungenAdministration
         'btnNew
         '
         Me.btnNew.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        'Me.btnNew.BackgroundImage = Global.AVISO.My.Resources.Resources.plus
+        Me.btnNew.BackgroundImage = Global.SDL.My.Resources.Resources.plus
         Me.btnNew.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.btnNew.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnNew.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnNew.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnNew.ForeColor = System.Drawing.Color.Black
         Me.btnNew.Location = New System.Drawing.Point(1180, 46)
         Me.btnNew.Name = "btnNew"
         Me.btnNew.Size = New System.Drawing.Size(50, 29)
@@ -329,11 +329,11 @@ Partial Class frmEssensbestellungenAdministration
         'FlatButton7
         '
         Me.FlatButton7.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.FlatButton7.BackgroundImage = Global.SDL.My.Resources.Resources.refresh
         Me.FlatButton7.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.FlatButton7.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.FlatButton7.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.FlatButton7.ForeColor = System.Drawing.Color.Black
-        'Me.FlatButton7.Image = Global.AVISO.My.Resources.Resources.refresh
         Me.FlatButton7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.FlatButton7.Location = New System.Drawing.Point(1035, 7)
         Me.FlatButton7.Name = "FlatButton7"
@@ -626,7 +626,7 @@ Partial Class frmEssensbestellungenAdministration
         '
         Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.StornierenToolStripMenuItem, Me.AbgerechnetToolStripMenuItem, Me.BearbeitenToolStripMenuItem, Me.AnHigway118SchickenToolStripMenuItem, Me.ExportToolStripMenuItem})
         Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
-        Me.ContextMenuStrip1.Size = New System.Drawing.Size(283, 136)
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(283, 114)
         '
         'StornierenToolStripMenuItem
         '
@@ -652,6 +652,19 @@ Partial Class frmEssensbestellungenAdministration
         Me.AnHigway118SchickenToolStripMenuItem.Size = New System.Drawing.Size(282, 22)
         Me.AnHigway118SchickenToolStripMenuItem.Text = "markierte Bestellungen per Mail senden"
         '
+        'ExportToolStripMenuItem
+        '
+        Me.ExportToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExcelToolStripMenuItem})
+        Me.ExportToolStripMenuItem.Name = "ExportToolStripMenuItem"
+        Me.ExportToolStripMenuItem.Size = New System.Drawing.Size(282, 22)
+        Me.ExportToolStripMenuItem.Text = "Export"
+        '
+        'ExcelToolStripMenuItem
+        '
+        Me.ExcelToolStripMenuItem.Name = "ExcelToolStripMenuItem"
+        Me.ExcelToolStripMenuItem.Size = New System.Drawing.Size(101, 22)
+        Me.ExcelToolStripMenuItem.Text = "Excel"
+        '
         'txtAnzahlDS
         '
         Me.txtAnzahlDS.Location = New System.Drawing.Point(1032, 745)
@@ -810,19 +823,6 @@ Partial Class frmEssensbestellungenAdministration
         Me.Label9.Text = "Gesamtbetrag"
         Me.Label9.TextAlign = System.Drawing.ContentAlignment.TopRight
         '
-        'ExportToolStripMenuItem
-        '
-        Me.ExportToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExcelToolStripMenuItem})
-        Me.ExportToolStripMenuItem.Name = "ExportToolStripMenuItem"
-        Me.ExportToolStripMenuItem.Size = New System.Drawing.Size(282, 22)
-        Me.ExportToolStripMenuItem.Text = "Export"
-        '
-        'ExcelToolStripMenuItem
-        '
-        Me.ExcelToolStripMenuItem.Name = "ExcelToolStripMenuItem"
-        Me.ExcelToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
-        Me.ExcelToolStripMenuItem.Text = "Excel"
-        '
         'frmEssensbestellungenAdministration
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

SDL/frmMain.Designer.vb

@@ -111,9 +111,6 @@ Partial Class frmMain
         Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
         Me.AuswertungenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
         Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components)
-        Me.cntxEssen = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.AdministrationToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.EssensbestellungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.pnlLeft.SuspendLayout()
         Me.MenuStripSDL.SuspendLayout()
         Me.Panel1.SuspendLayout()
@@ -127,7 +124,6 @@ Partial Class frmMain
         Me.Panel2.SuspendLayout()
         Me.pnlJumpKunde.SuspendLayout()
         Me.cntxtZOLL.SuspendLayout()
-        Me.cntxEssen.SuspendLayout()
         Me.SuspendLayout()
         '
         'pnlLeft
@@ -1024,24 +1020,6 @@ Partial Class frmMain
         Me.Timer_REFRESH.Enabled = True
         Me.Timer_REFRESH.Interval = 5000
         '
-        'cntxEssen
-        '
-        Me.cntxEssen.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AdministrationToolStripMenuItem, Me.EssensbestellungToolStripMenuItem})
-        Me.cntxEssen.Name = "cntxEssen"
-        Me.cntxEssen.Size = New System.Drawing.Size(164, 48)
-        '
-        'AdministrationToolStripMenuItem
-        '
-        Me.AdministrationToolStripMenuItem.Name = "AdministrationToolStripMenuItem"
-        Me.AdministrationToolStripMenuItem.Size = New System.Drawing.Size(163, 22)
-        Me.AdministrationToolStripMenuItem.Text = "Administration"
-        '
-        'EssensbestellungToolStripMenuItem
-        '
-        Me.EssensbestellungToolStripMenuItem.Name = "EssensbestellungToolStripMenuItem"
-        Me.EssensbestellungToolStripMenuItem.Size = New System.Drawing.Size(163, 22)
-        Me.EssensbestellungToolStripMenuItem.Text = "Essensbestellung"
-        '
         'frmMain
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!)
@@ -1074,7 +1052,6 @@ Partial Class frmMain
         Me.pnlJumpKunde.ResumeLayout(False)
         Me.pnlJumpKunde.PerformLayout()
         Me.cntxtZOLL.ResumeLayout(False)
-        Me.cntxEssen.ResumeLayout(False)
         Me.ResumeLayout(False)
 
     End Sub
@@ -1163,9 +1140,6 @@ Partial Class frmMain
     Friend WithEvents mneFakturierung As ToolStripMenuItem
     Friend WithEvents FakturierungToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents RechnungsdatenToolStripMenuItem As ToolStripMenuItem
-    Friend WithEvents cntxEssen As ContextMenuStrip
-    Friend WithEvents AdministrationToolStripMenuItem As ToolStripMenuItem
-    Friend WithEvents EssensbestellungToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents AdministrationToolStripMenuItem1 As ToolStripMenuItem
     Friend WithEvents EssensbestellungToolStripMenuItem1 As ToolStripMenuItem
 End Class

SDL/frmMain.resx

@@ -164,9 +164,6 @@
   <metadata name="Timer_REFRESH.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1557, 17</value>
   </metadata>
-  <metadata name="cntxEssen.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>514, 14</value>
-  </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAEAgIAAAAEAGAAoyAAAFgAAACgAAACAAAAAAAEAAAEAGAAAAAAAAMgAAMQOAADEDgAAAAAAAAAA

VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb

@@ -28,7 +28,6 @@ Partial Class frmMitarbeitersuche
         Me.Button4 = New System.Windows.Forms.Button()
         Me.btnClose = New System.Windows.Forms.Button()
         Me.PictureBox2 = New System.Windows.Forms.PictureBox()
-        Me.sbMitarbeiter = New VERAG_PROG_ALLGEMEIN.MySearchBox()
         Me.pnlMain = New System.Windows.Forms.Panel()
         Me.pnl = New System.Windows.Forms.Panel()
         Me.Panel2 = New System.Windows.Forms.Panel()
@@ -80,6 +79,7 @@ Partial Class frmMitarbeitersuche
         Me.lblFirma = New System.Windows.Forms.Label()
         Me.Label4 = New System.Windows.Forms.Label()
         Me.Label3 = New System.Windows.Forms.Label()
+        Me.sbMitarbeiter = New VERAG_PROG_ALLGEMEIN.MySearchBox()
         Me.pnlSrch.SuspendLayout()
         CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.pnlMain.SuspendLayout()
@@ -151,32 +151,6 @@ Partial Class frmMitarbeitersuche
         Me.PictureBox2.TabIndex = 18
         Me.PictureBox2.TabStop = False
         '
-        'sbMitarbeiter
-        '
-        Me.sbMitarbeiter._allowFreitext = False
-        Me.sbMitarbeiter._AllowSetValue = False
-        Me.sbMitarbeiter._allowSpaceAsSplitter = True
-        Me.sbMitarbeiter._autoSizeGross = False
-        Me.sbMitarbeiter._hideIfListEmpty = True
-        Me.sbMitarbeiter._value = Nothing
-        Me.sbMitarbeiter.conn_art = "FMZOLL"
-        Me.sbMitarbeiter.dgvpos = "LEFT"
-        Me.sbMitarbeiter.DISPLAY_PARAM = Nothing
-        Me.sbMitarbeiter.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!)
-        Me.sbMitarbeiter.INVISIBLE_COLUMNS = Nothing
-        Me.sbMitarbeiter.key_visible = False
-        Me.sbMitarbeiter.KEYPARAM = Nothing
-        Me.sbMitarbeiter.Location = New System.Drawing.Point(45, 11)
-        Me.sbMitarbeiter.Name = "sbMitarbeiter"
-        Me.sbMitarbeiter.searchActive = True
-        Me.sbMitarbeiter.Size = New System.Drawing.Size(582, 29)
-        Me.sbMitarbeiter.SQL_ORDER_BY = Nothing
-        Me.sbMitarbeiter.SQL_SELECT = Nothing
-        Me.sbMitarbeiter.SQL_WHERE = Nothing
-        Me.sbMitarbeiter.SQL_WhereParamList = Nothing
-        Me.sbMitarbeiter.TabIndex = 0
-        Me.sbMitarbeiter.usrcntl = Nothing
-        '
         'pnlMain
         '
         Me.pnlMain.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
@@ -363,7 +337,7 @@ Partial Class frmMitarbeitersuche
         '
         'lblTimasSaldo
         '
-        Me.lblTimasSaldo.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold)
+        Me.lblTimasSaldo.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblTimasSaldo.Location = New System.Drawing.Point(148, 21)
         Me.lblTimasSaldo.Name = "lblTimasSaldo"
         Me.lblTimasSaldo.Size = New System.Drawing.Size(103, 24)
@@ -767,6 +741,32 @@ Partial Class frmMitarbeitersuche
         Me.Label3.Text = "Niederlassung:"
         Me.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         '
+        'sbMitarbeiter
+        '
+        Me.sbMitarbeiter._allowFreitext = False
+        Me.sbMitarbeiter._AllowSetValue = False
+        Me.sbMitarbeiter._allowSpaceAsSplitter = True
+        Me.sbMitarbeiter._autoSizeGross = False
+        Me.sbMitarbeiter._hideIfListEmpty = True
+        Me.sbMitarbeiter._value = Nothing
+        Me.sbMitarbeiter.conn_art = "FMZOLL"
+        Me.sbMitarbeiter.dgvpos = "LEFT"
+        Me.sbMitarbeiter.DISPLAY_PARAM = Nothing
+        Me.sbMitarbeiter.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!)
+        Me.sbMitarbeiter.INVISIBLE_COLUMNS = Nothing
+        Me.sbMitarbeiter.key_visible = False
+        Me.sbMitarbeiter.KEYPARAM = Nothing
+        Me.sbMitarbeiter.Location = New System.Drawing.Point(45, 11)
+        Me.sbMitarbeiter.Name = "sbMitarbeiter"
+        Me.sbMitarbeiter.searchActive = True
+        Me.sbMitarbeiter.Size = New System.Drawing.Size(582, 29)
+        Me.sbMitarbeiter.SQL_ORDER_BY = Nothing
+        Me.sbMitarbeiter.SQL_SELECT = Nothing
+        Me.sbMitarbeiter.SQL_WHERE = Nothing
+        Me.sbMitarbeiter.SQL_WhereParamList = Nothing
+        Me.sbMitarbeiter.TabIndex = 0
+        Me.sbMitarbeiter.usrcntl = Nothing
+        '
         'frmMitarbeitersuche
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb

@@ -50,7 +50,7 @@ Public Class frmMitarbeitersuche
                 Me.Close()
             End If
             VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.LOAD(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_id)
-            initMA()
+            initMA(False)
         End If
 
 
@@ -61,10 +61,10 @@ Public Class frmMitarbeitersuche
 
 
     Private Sub sbMitarbeiter_PropertyChanged() Handles sbMitarbeiter.VALUE_CHANGED
-        initMA()
+        initMA(False)
     End Sub
 
-    Sub initMA()
+    Sub initMA(Optional callTimasSaldo As Boolean = True)
         btn.Visible = False
         pnl.Visible = False
         'lblTimasZeiten.Visible = False
@@ -168,8 +168,8 @@ Public Class frmMitarbeitersuche
                 btnSettings.Visible = True
             End If
 
-            requestDone = False
+            requestDone = Not callTimasSaldo
-            initTimasSaldo()
+            initTimasData()
 
             If VERAG_PROG_ALLGEMEIN.cAllgemein.USRID = MA.mit_id AndAlso VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasId IsNot Nothing Then
                 pnlZeiten.Visible = True
@@ -331,7 +331,7 @@ Public Class frmMitarbeitersuche
                     MsgBox(info)
                     Thread.Sleep(2000) 'warten bis Eintrag in Timas-DB
                     requestDone = False
-                    initTimasSaldo()
+                    initTimasData()
                 End If
 
 
@@ -345,7 +345,7 @@ Public Class frmMitarbeitersuche
                     MsgBox(info)
                     Thread.Sleep(2000) 'warten bis Eintrag in Timas-DB
                     requestDone = False
-                initTimasSaldo()
+                    initTimasData()
                 End If
             End If
 
@@ -355,7 +355,7 @@ Public Class frmMitarbeitersuche
 
 
 
-    Private Sub initTimasSaldo()
+    Private Sub initTimasData()
 
         lblStatusZE.Visible = False
 
@@ -369,7 +369,7 @@ Public Class frmMitarbeitersuche
             If timas IsNot Nothing Then
                 timas.getTimeSaldo(MA.mit_timasId, lblTimasSaldo.Text)
                 lblStatusZE.Visible = True
-                Dim checkEntry As Boolean = timas.getTimeEntries(MA.mit_timasId, dtZeiten, requestDone)
+                Dim checkEntry As Boolean = timas.getTimeEntries(MA.mit_timasId, dtZeiten,, requestDone)
 
                 If requestDone Then
                     If checkEntry Then

VERAG_PROG_ALLGEMEIN/My Project/Resources.resx

@@ -2003,6 +2003,7 @@
   </data>
   <data name="zeiterfassung_s" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\zeiterfassung_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="search" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -2068,6 +2069,7 @@
   </data>
   <data name="parcel_small1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\parcel_small1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="err" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\err.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>

VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb

@@ -1,6 +1,7 @@
 Imports System.Diagnostics.Tracing
 Imports System.Net
 Imports System.Runtime.Remoting
+Imports System.Text
 Imports System.Threading
 Imports System.Windows.Forms
 
@@ -48,7 +49,7 @@ Public Class cTimasAPI
 
     End Function
 
-    Public Sub getTimeSaldo(ByVal maid As Integer, ByRef info As String, Optional ByRef requestDone As Boolean = False)
+    Public Sub getTimeSaldo(maid As Integer, ByRef info As String, Optional ByRef requestDone As Boolean = False)
         Try
             Dim returnText As String = ""
             Dim failureText As String = ""
@@ -100,7 +101,11 @@ Public Class cTimasAPI
             If saldo IsNot Nothing Then
                 Dim saldoAsDouble = CDbl(saldo)
                 saldoAsDouble = Math.Round(saldoAsDouble / 3600, 2)
-                info = "Vortag: " & saldoAsDouble & " h"
+                Dim infoBuilder As New StringBuilder
+                infoBuilder.Append("Vortag ")
+                infoBuilder.Append(saldoAsDouble)
+                infoBuilder.Append(" h")
+                info = infoBuilder.ToString()
             End If
 
 

VERAG_PROG_ALLGEMEIN/Schnittstellen/cDatev_Interface.vb

@@ -3,15 +3,16 @@
     Shared datevVersion As Integer = 700
     Shared Datenkategorie As Integer = 16
     Shared StapelbuchungsNr As Integer = 21
-    Shared BeraterNr As Integer = 3050
+    Shared BeraterNr As Integer = 261677 '3050 Steuerberaterwechsel
-    Shared MandantenNr As Integer = 12533
+    Shared MandantenNr As Integer = 12138 '12533 Steuerberaterwechsel
-    Shared Kontenlänge As Integer = 6
+    Shared KontenlängePersonKto As Integer = 5
+    Shared KontenlängeSachKto As Integer = 4
     Shared Formatversion As Integer = 4
     Shared SQL As New VERAG_PROG_ALLGEMEIN.SQL
 
     'STAMMDATEN
     Shared Function getStammdaten(filialNr As Integer) As DataTable
-        Dim sqlStr = "Select TOP (1000) KundenNrZentrale As [Kontonummer], isnull([Ordnungsbegriff],'') as Ordnungsbegriff, isnull([Name 1],'') as Name, isnull([Name 2],'') as Name2, LTRIM([Ort]) as Ort,KundenNr As [Kundennummer],isnull(UstIdKz,'') As [EU-Land] ,isnull(UstIdNr,'') As [EU-UstID], isnull(Anrede,'') as Anrede,isnull(KTO,'') as Bankkonto, isnull(BLZ,'') as [BLZ], '' as [Bankname], '' as [Länderkennzeichen Bank], '' as [IBAN], '' as [BIC], '' as [Anrede], '' as [Adresszusatz], ISNULL([Strasse],'') as Strasse, ISNULL(PLZ,'') as PLZ,  isnull(UstIdNr,'') as [Steuernummer], isnull(Ansprechpartner,'') as [Ansprechpartner], isnull(Telefon,'') as [Telefonnummer], isnull([E-Mail],'') as [E-Mail], isnull([Telefax],'') as [Faxnummer], '' as [Internetadresse],  isnull(Adressen.landkz,'') as [Länderkennzeichen]"
+        Dim sqlStr = "Select top (200) right([KundenNrZentrale],5) As [Kontonummer], isnull([Ordnungsbegriff],'') as Ordnungsbegriff, isnull([Name 1],'') as Name, isnull([Name 2],'') as Name2, LTRIM([Ort]) as Ort,KundenNr As [Kundennummer],isnull(UstIdKz,'') As [EU-Land] ,isnull(UstIdNr,'') As [EU-UstID], isnull(Anrede,'') as Anrede,isnull(KTO,'') as Bankkonto, isnull(BLZ,'') as [BLZ], '' as [Bankname], '' as [Länderkennzeichen Bank], '' as [IBAN], '' as [BIC], '' as [Anrede], '' as [Adresszusatz], ISNULL([Strasse],'') as Strasse, ISNULL(PLZ,'') as PLZ,  isnull(UstIdNr,'') as [Steuernummer], isnull(Ansprechpartner,'') as [Ansprechpartner], isnull(Telefon,'') as [Telefonnummer], isnull([E-Mail],'') as [E-Mail], isnull([Telefax],'') as [Faxnummer], '' as [Internetadresse],  isnull(Adressen.landkz,'') as [Länderkennzeichen]"
         sqlStr &= " FROM Adressen INNER JOIN Kunden ON Kundennr=AdressenNr  "
         sqlStr &= " LEFT JOIN tblKundenErweitert ON KundenNr=kde_KundenNr "
         sqlStr &= " LEFT JOIN [Länderverzeichnis für die Außenhandelsstatistik] as St ON St.LandKz=Adressen.LandKz "
@@ -288,7 +289,8 @@
                        WHERE Firma_ID ='" & Firma_ID & "'  AND TrdinDateiname Is Null
                        group by IVO.Rechnungsnummer,IVO.rechnungsdatum,Leistungsnummer,Leistungsbezeichnung,Steuerpflichtig
                        ORDER BY Rechnungsdatum, Rechnungsnummer "
-        ' --and IVO.Rechnungsnummer='21400139'
+
+        '  and IVO.Rechnungsnummer='21400139'
         Return SQL.loadDgvBySql(sqlStr, "FMZOLL", 9800)
 
         'WHERE Firma_ID ='" & Firma_ID & "'  AND TrdinDateiname Is Null
@@ -313,7 +315,7 @@
         headerString &= BeraterNr.ToString & ";" 'Beraternummer
         headerString &= MandantenNr.ToString & ";" 'Mandantennummer
         headerString &= Geschäftsjahr.ToString & "0101" & ";" 'WJ-Beginn
-        headerString &= Kontenlänge.ToString & ";"
+        headerString &= KontenlängePersonKto.ToString & ";"
         headerString &= Geschäftsjahr.ToString & "0101" & ";" 'DatumVon
         headerString &= Geschäftsjahr.ToString & "1231" & ";" 'DatumBis
         headerString &= "IMPORT AUS AVISO;" 'Bezeichnung
@@ -332,7 +334,7 @@
         headerString &= BeraterNr.ToString & ";"
         headerString &= MandantenNr.ToString & ";"
         headerString &= Geschäftsjahr.ToString & "0101" & ";" 'WJ-Beginn
-        headerString &= Kontenlänge.ToString & ";"
+        headerString &= KontenlängeSachKto.ToString & ";"
         headerString &= Geschäftsjahr.ToString & "0101" & ";" 'DatumVon
         headerString &= Geschäftsjahr.ToString & "1231" & ";" 'DatumBis
         headerString &= "IMPORT AUS AVISO;" 'Bezeichnung

VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj

@@ -375,8 +375,8 @@
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="My Project\Resources.Designer.vb">
-      <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     <Compile Include="Schnittstellen\Digicast\cDigicustAPI.vb" />

VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb

@@ -280,16 +280,17 @@ Public Class cProgramFunctions
             Case "AMBAR"
                 Select Case art
                     Case "3", "4" 'Export
-                        myCredentials.UserName = "office@ambarlog.com"
+                        myCredentials.UserName = "office@ambarlog.de"
                         ' myCredentials.Password = "Naq30716"
                         '   myCredentials.UserName = "import@ambarlog.com"
                         myCredentials.Password = "Naq30716"
                         mySmtpsvr.Host = "owa.verag.ag" '"smtp.office365.com" -> office365 deaktiviert!
                         mySmtpsvr.Port = 587
                         'mySmtpsvr.EnableSsl = True
-                        text = text.replace("import@ambarlog.com", "office@ambarlog.com")
+
-                        text = text.replace("import@ambarlog.de", "office@ambarlog.com")
+                        'text = text.replace("import@ambarlog.com", "office@ambarlog.com")
-                        eMailfrom = "office@ambarlog.com"
+                        'text = text.replace("import@ambarlog.de", "office@ambarlog.com")
+                        eMailfrom = "office@ambarlog.de"
                     Case Else
 
                         '   myCredentials.UserName = "import@ambarlog.com"