MDM, Essensbestellungen, MIC, MSE-API

SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_EU.Designer.vb

@@ -465,7 +465,7 @@ Partial Class usrcntlVollmacht_MDM_EU
         Me.txt_GF_Adresse._WaehrungZeichen = False
         Me.txt_GF_Adresse.ForeColor = System.Drawing.Color.Black
         Me.txt_GF_Adresse.Location = New System.Drawing.Point(254, 254)
-        Me.txt_GF_Adresse.MaxLength = 10
+        Me.txt_GF_Adresse.MaxLength = 255
         Me.txt_GF_Adresse.MaxLineLength = -1
         Me.txt_GF_Adresse.MaxLines_Warning = ""
         Me.txt_GF_Adresse.MaxLines_Warning_Label = Nothing

SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_NICHT_EU.Designer.vb

@@ -455,7 +455,7 @@ Partial Class usrcntlVollmacht_MDM_NICHT_EU
         Me.txt_GF_Adresse._WaehrungZeichen = False
         Me.txt_GF_Adresse.ForeColor = System.Drawing.Color.Black
         Me.txt_GF_Adresse.Location = New System.Drawing.Point(254, 240)
-        Me.txt_GF_Adresse.MaxLength = 10
+        Me.txt_GF_Adresse.MaxLength = 255
         Me.txt_GF_Adresse.MaxLineLength = -1
         Me.txt_GF_Adresse.MaxLines_Warning = ""
         Me.txt_GF_Adresse.MaxLines_Warning_Label = Nothing

SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_NICHT_EU.vb

@@ -10,6 +10,8 @@ Public Class usrcntlVollmacht_MDM_NICHT_EU
     Public Event MOVE_DOWN(c As Control)
 
     Public KdNR As Integer = -1
+    Dim anzahlKopienWord As Integer = 1
+    Dim anzahlKopienPDF As Integer = 1
     Public Sub ChangeKDNr(kdnr As Integer) Implements FormualrInterface.ChangeKDNr
         initKdNR(kdnr)
     End Sub
@@ -114,6 +116,9 @@ Public Class usrcntlVollmacht_MDM_NICHT_EU
 
     Private Sub usrcntlVollmacht_DE_Load(sender As Object, e As EventArgs) Handles Me.Load
         initControlsHandler()
+
+
+
         cboLand.Items.Clear()
         cboLand.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
         cboLand.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Austria", "AT"))
@@ -168,12 +173,35 @@ Public Class usrcntlVollmacht_MDM_NICHT_EU
     End Sub
 
     Private Sub cboLand_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboLand.SelectedIndexChanged
-        If cboLand._value = "NL" Or cboLand._value = "HR" Then
+        Dim privatfirma As Boolean = False
-            cbxPrivatfirma.Visible = True
+        Select Case cboLand._value
 
-        Else
+            Case "NL"
+                privatfirma = True
+
+            Case "HR"
+                privatfirma = True
+                anzahlKopienPDF = 10
+            Case "LU"
+                anzahlKopienPDF = 5
+            Case "AT"
+                anzahlKopienPDF = 10
+
+
+
+            Case Else
+                privatfirma = False
+
+        End Select
+
+        If Not privatfirma Then
             cbxPrivatfirma.Visible = False
             cbxPrivatfirma.Checked = False
+        Else
+            cbxPrivatfirma.Visible = True
         End If
+
+
+
     End Sub
 End Class

SDL/Formulare/KDFormulare/frmFormulare.vb

@@ -1772,7 +1772,7 @@ Public Class FormularManagerNEU
 
                         Case "ceo_birthdate" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txt_GF_Geb.Text))
                         Case "ceo" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txt_GF_nachname.Text & usrCntl.txt_GF_vorname.Text))
-                        Case "ceo_address" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(usrCntl.txt_GF_Adresse.Text <> "", usrCntl.txt_GF_Adresse.Text & ", ", "") & usrCntl.cbx_GF_Land._value & "-" & usrCntl.txt_GF_PLZ.Text & IIf(usrCntl.txt_GF_Ort.Text <> "", ", " & usrCntl.txt_GF_Ort.Text, "")))
+                        Case "ceo_address" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(usrCntl.txt_GF_Adresse.Text <> "", usrCntl.txt_GF_Adresse.Text & ", ", "") & usrCntl.cbx_GF_Land._value & "-" & usrCntl.txt_GF_PLZ.Text & " " & usrCntl.txt_GF_Ort.Text))
                         Case "ceo_birthplace" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txt_GF_Geburtsort.Text))
                         Case "ceo_birthcountry" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.cbx_GF_Geburtsland.Text))
                         Case "ceo_passportvaliduntil" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txt_GF_Passgueltigbis.Text))
@@ -1813,7 +1813,7 @@ Public Class FormularManagerNEU
                 Else
 
                     Select Case item.Text.ToLower().Trim()
-                        Case "Tagesdatum" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(IsDate(usrCntl.datDatum.Text) AndAlso usrCntl.cbxPrintDate.Checked, usrCntl.datDatum.Text, "")))
+                        Case "tagesdatum" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(IsDate(usrCntl.datDatum.Text) AndAlso usrCntl.cbxPrintDate.Checked, usrCntl.datDatum.Text, "")))
                     End Select
 
                 End If
@@ -1858,21 +1858,30 @@ Public Class FormularManagerNEU
                         Case "name4" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtFirma.Text
                         Case "name5" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtFirma.Text
 
-                        Case "address" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse1.Text & " " & usrCntl.cbxLandKz._value & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text
+
+
+                        Case "address" : odoc.FormFields(fieldName).Range.Text = IIf(usrCntl.txtAdresse1.Text <> "", usrCntl.txtAdresse1.Text & ", ", "") & usrCntl.cbxLandKz._value & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text '
+                        Case "address1" : odoc.FormFields(fieldName).Range.Text = IIf(usrCntl.txtAdresse1.Text <> "", usrCntl.txtAdresse1.Text & ", ", "") & usrCntl.cbxLandKz._value & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text '
+                        Case "address2" : odoc.FormFields(fieldName).Range.Text = IIf(usrCntl.txtAdresse1.Text <> "", usrCntl.txtAdresse1.Text & ", ", "") & usrCntl.cbxLandKz._value & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text '
 
                         Case "zipcode" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse2.Text
                         Case "zipcode1" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse2.Text
+                        Case "zipcode2" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse2.Text
 
                         Case "lpo" : odoc.FormFields(fieldName).Range.Text = usrCntl.cbxLandKz._value & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text
 
                         Case "country" : odoc.FormFields(fieldName).Range.Text = usrCntl.cbxLandKz._value
                         Case "country1" : odoc.FormFields(fieldName).Range.Text = usrCntl.cbxLandKz._value
+                        Case "country2" : odoc.FormFields(fieldName).Range.Text = usrCntl.cbxLandKz._value
 
                         Case "place" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse3.Text
                         Case "place1" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse3.Text
+                        Case "place2" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse3.Text
 
                         Case "street" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse1.Text
                         Case "street1" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse1.Text
+                        Case "street2" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse1.Text
+
                         Case "strasse" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse1.Text
                         Case "surname_firstname" : odoc.FormFields(fieldName).Range.Text = IIf(usrCntl.txt_GF_vorname.Text <> "", usrCntl.txt_GF_vorname.Text & " ", " ") & IIf(usrCntl.txt_GF_nachname.Text <> "", usrCntl.txt_GF_nachname.Text, "")
                         Case "firstname_surname" : odoc.FormFields(fieldName).Range.Text = IIf(usrCntl.txt_GF_vorname.Text <> "", usrCntl.txt_GF_vorname.Text & " ", " ") & IIf(usrCntl.txt_GF_nachname.Text <> "", usrCntl.txt_GF_nachname.Text, "")
@@ -1884,6 +1893,7 @@ Public Class FormularManagerNEU
 
                         Case "taxno" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtSteuerNr.Text
                         Case "taxno1" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtSteuerNr.Text
+                        Case "taxno2" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtSteuerNr.Text
 
                         Case "function" : odoc.FormFields(fieldName).Range.Text = IIf(usrCntl.txt_GF_nachname.Text <> "", functionCEO, "")
 
@@ -1913,15 +1923,19 @@ Public Class FormularManagerNEU
 
                         Case "c_street" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Straße
                         Case "c_street1" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Straße
+                        Case "c_street2" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Straße
 
                         Case "c_zipcode" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Ort
                         Case "c_zipcode1" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Ort
+                        Case "c_zipcode2" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Ort
 
                         Case "c_vatno" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_UID
                         Case "c_vatno1" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_UID
+                        Case "c_vatno2" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_UID
 
                         Case "c_phone" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Telefon & " " & FIRMA.Firma_Telefax
                         Case "c_phone1" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Telefon & " " & FIRMA.Firma_Telefax
+                        Case "c_phone2" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Telefon & " " & FIRMA.Firma_Telefax
 
                         Case "c_mailcontact" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtEmailzurueck.Text
                         Case "c_bank" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bankverbindung1
@@ -2026,7 +2040,7 @@ Public Class FormularManagerNEU
                     Case "name" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtFirma.Text
                     Case "name_1" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtFirma.Text
                     Case "name_2" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtFirma.Text
-                    Case "address" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse1.Text & " " & usrCntl.cbxLandKz._value & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text
+                    Case "address" : odoc.FormFields(fieldName).Range.Text = IIf(usrCntl.txtAdresse1.Text <> "", usrCntl.txtAdresse1.Text & ", ", "") & usrCntl.cbxLandKz._value & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text
                     Case "zipcode" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse2.Text
                     Case "country" : odoc.FormFields(fieldName).Range.Text = usrCntl.cbxLandKz._value
                     Case "place" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse3.Text
@@ -2045,7 +2059,7 @@ Public Class FormularManagerNEU
                     Case "ceo_zipcode" : odoc.FormFields(fieldName).Range.Text = usrCntl.txt_GF_PLZ.Text
                     Case "ceo_birthdate" : odoc.FormFields(fieldName).Range.Text = usrCntl.txt_GF_Geb.Text
                     Case "ceo_street" : odoc.FormFields(fieldName).Range.Text = usrCntl.txt_GF_Adresse.Text
-                    Case "ceo_address" : odoc.FormFields(fieldName).Range.Text = usrCntl.txt_GF_Adresse.Text & " " & usrCntl.cbx_GF_Land._value & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text
+                    Case "ceo_address" : odoc.FormFields(fieldName).Range.Text = IIf(usrCntl.txt_GF_Adresse.Text <> "", usrCntl.txt_GF_Adresse.Text & ", ", "") & " " & usrCntl.cbx_GF_Land._value & "-" & usrCntl.txt_GF_PLZ.Text & " " & usrCntl.txt_GF_Ort.Text
                     Case "ceo_birthplace" : odoc.FormFields(fieldName).Range.Text = usrCntl.txt_GF_Geburtsort.Text
                     Case "ceo_birthcountry" : odoc.FormFields(fieldName).Range.Text = usrCntl.cbx_GF_Geburtsland._value
                     Case "ceo_passportvaliduntil" : odoc.FormFields(fieldName).Range.Text = usrCntl.txt_GF_Passgueltigbis.Text

SDL/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.3.1.5")>
+<Assembly: AssemblyVersion("1.3.1.6")>
-<Assembly: AssemblyFileVersion("1.3.1.5")>
+<Assembly: AssemblyFileVersion("1.3.1.6")>

SDL/frmEssensbestellungen.vb

@@ -631,7 +631,7 @@ Public Class frmEssensbestellungen
         End If
 
 
-        cbxGebauede.Text = currentEssen.eb_gebaeude
+        cbxGebauede._value = currentEssen.eb_gebaeude
         txtAnmerkung.Text = currentEssen.eb_anmerkung
 
 

SDL/mdm/frmMDMDatenverarbetiung.vb

@@ -1227,10 +1227,10 @@ Public Class frmMDMDatenverarbetiung
                 For Each f In Directory.GetFiles(dirAnhang)
                     File.Delete(f)
                 Next
+            Else
+                Directory.CreateDirectory(dirAnhang)
             End If
 
-            If Not Directory.Exists(dirAnhang) Then Directory.CreateDirectory(dirAnhang)
-
             For Each f In Directory.GetFiles(dir)
                 File.Copy(f, dirAnhang & (New FileInfo(f)).Name)
             Next
@@ -1238,7 +1238,6 @@ Public Class frmMDMDatenverarbetiung
             'IN FMZOLL / DB MautD einfügen --> Mautbericht
             'genPLOSEInsertMautD(dat_Sum_Von.Value.ToShortDateString, dat_Sum_Bis.Value.ToShortDateString)
 
-
             pbPloseAnh_Proz.Value = 100
             txtPloseAnh_Einarbeitung.Text = dt_Main.Rows.Count & " / " & dt_Main.Rows.Count
             lblPloseAnh_Proz.Text = "100.00 %"

VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb

@@ -1557,7 +1557,6 @@ Public Class cFormularManager
                 End If
             End If
 
-
             'If Not VERAG_PROG_ALLGEMEIN.cProgramFunctions.spireLoadLicense() Then MsgBox("Fehler beim Laden der SPIRE-Lizenz")
 
             Using webClient As New Net.WebClient()

VERAG_PROG_ALLGEMEIN/Schnittstellen/MIC/cMICInterface.vb

@@ -33,8 +33,6 @@ Public Class cMICInterface
 
             Return False 'TEST!
 
-
-
             Return True
         Catch ex As Exception
             MsgBox(ex.Message & ex.StackTrace)

VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb

@@ -1014,18 +1014,17 @@ Public Class cMSEAPI
 
                     If r("url") <> "" AndAlso r("name") <> "" AndAlso r("name").contains("VAT") Then 'only VAT-Invoices
                         Dim inv As New cMSEInvoices(r("name"), r("invoice_id"))
-                        If Not inv.imported Then 'verhindert unnötige Downloads
+                        If IsDBNull(inv.daId) Then 'verhindert unnötige Downloads
                             Dim filepath = VERAG_PROG_ALLGEMEIN.cFormularManager.getPDFViaSpirePDF_FromURLStream(r("url"), r("name"), PDFRECHNUNGENPFAD, False)
                             If filepath <> "" AndAlso uploadToDs Then
                                 Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "MSE", Now.Year, Now.ToString("yyyyMMdd"), r("name"))
                                 DS.uploadDataToDATENSERVER(filepath & "\" & r("name"),,,,,, True)
-                                SQL.doSQL("Update [tblMSEInvoices] SET [daId]='" & DS.da_id & "', imported = 1 where [name] = '" & r("name") & "'", "FMZOLL")
+                                SQL.doSQL("Update [tblMSEInvoices] SET [daId]='" & DS.da_id & "' where [name] = '" & r("name") & "'", "FMZOLL")
                             End If
 
                         End If
                     End If
 
-
                 Next
 
                 dt = dt.DefaultView.ToTable()
@@ -1038,7 +1037,6 @@ Public Class cMSEAPI
     End Function
 
 
-
     Public Sub saveTransactions(num As Integer, dt As DataTable, transactions As Chilkat.JsonArray, receiver As Integer, Optional ignorePurchaseDate As Boolean = False, Optional onlyBilledTransactions As Boolean = True)
 
         Dim j As Integer = 0