edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDM, Essensbestellungen, MIC, MSE-API

Browse Source
This commit is contained in:
d.breimaier
2024-10-08 09:23:12 +02:00
parent c77070ec50
commit 82be7a58d3
10 changed files with 59 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_EU.Designer.vb generated
View File

@@ -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

2
SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_NICHT_EU.Designer.vb generated
View File

@@ -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

34
SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_NICHT_EU.vb
View File

@@ -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
cbxPrivatfirma.Visible = True
Dim privatfirma As Boolean = False
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

24
SDL/Formulare/KDFormulare/frmFormulare.vb
View File

@@ -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

4
SDL/My Project/AssemblyInfo.vb
View File

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

2
SDL/frmEssensbestellungen.vb
View File

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

5
SDL/mdm/frmMDMDatenverarbetiung.vb
View File

@@ -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 %"