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

neu

Browse Source
This commit is contained in:
Andreas Luxbauer
2022-09-01 10:37:14 +02:00
parent 46c14b6500
commit 5809e9c89c
13 changed files with 291 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
DAKOSY_Worker/cZollsysteme_Aktenbeschriftung.vb
View File

@@ -201,12 +201,20 @@
For Each AD In EZA.eza_ADRESSEN
If AD.ezaAd_AdressTyp IsNot Nothing Then
Dim Anschrift = (If(AD.ezaAd_TeilnehmerEORI, "") & " " & If(AD.ezaAd_NameFirma1, "") & " " & If(AD.ezaAd_LandCode, "") & " " & If(AD.ezaAd_Ort, "")).ToString.Trim
Dim Anschrift = ""
If If(AD.ezaAd_TeilnehmerEORI, "") <> "" Then
Anschrift = (SQL.getValueTxtBySql("SELECT Ordnungsbegriff FROM [Adressen] inner join Kunden on AdressenNr=KundenNr where EORITIN='" & AD.ezaAd_TeilnehmerEORI & "'", "FMZOLL")).Trim
If Anschrift = "" Then Anschrift = AD.ezaAd_TeilnehmerEORI
Else
Anschrift = If(AD.ezaAd_NameFirma1, "") & " " & If(AD.ezaAd_LandCode, "") & " " & If(AD.ezaAd_Ort, "").ToString.Trim
End If
Select Case AD.ezaAd_AdressTyp
Case "CZ" : Absender = Anschrift
Case "CZ" : Absender = ""'Anschrift --> nicht benötigt
Case "CN" : Empfaenger = Anschrift
Case "DT" : Anmelder = Anschrift
Case "CB" : Vertreter = Anschrift
Case "CB" : Vertreter = "" ' Anschrift - -> nicht benötigt
End Select
End If
Next
@@ -228,7 +236,7 @@
Dim AUFSCHUB_List As New List(Of String)
For Each AB In EZA.eza_AUFSCHUB
Dim kto = (If(AB.ezaAfb_HZA, "") & If(AB.ezaAfb_KontoNr, "")).Trim
addIfNotExists(AUFSCHUB_List, kto & load_KdFromAKto(kto))
addIfNotExists(AUFSCHUB_List, kto & " " & load_KdFromAKto(kto))
Next
If EZA.eza_VorpapierArtCode IsNot Nothing AndAlso EZA.eza_VorpapierArtCode <> "" AndAlso EZA.eza_VorpapierArtCode <> "OHNE" Then

2
UID/Dienstplan/cFeiertage.vb
View File

@@ -202,7 +202,7 @@
Case "DE" 'BAYERN
If datum = CDate("03.10." & _Year) Then Return True ' Tag der Deutschen Einheit
' If datum = BussUndBettag Then Return True ' Buß- und Bettag '!!!!ABEWEICHEND --> kein Feiertag in BAYERN
If datum = CDate("08.08." & _Year) Then Return True ' Augsburger Friedensfest
' If datum = CDate("08.08." & _Year) Then Return True ' Augsburger Friedensfest
If datum = CDate("01.05." & _Year) Then Return True ' Maifeiertag
If datum = Karfreitag Then Return True
End Select

73
UID/Dienstplan/usrCntlDienstplan.Designer.vb generated
View File

@@ -31,6 +31,8 @@ Partial Class usrCntlDienstplan
Me.btnDienstplan = New System.Windows.Forms.Button()
Me.Panel1 = New System.Windows.Forms.Panel()
Me.Panel3 = New System.Windows.Forms.Panel()
Me.cbxAuswertungPDF = New System.Windows.Forms.CheckBox()
Me.Button5 = New System.Windows.Forms.Button()
Me.cbxInaktiv = New System.Windows.Forms.CheckBox()
Me.numJahr = New System.Windows.Forms.NumericUpDown()
Me.cboMonat = New VERAG_PROG_ALLGEMEIN.MyComboBox()
@@ -49,8 +51,7 @@ Partial Class usrCntlDienstplan
Me.tbImex = New System.Windows.Forms.TabPage()
Me.tbFrontOffice = New System.Windows.Forms.TabPage()
Me.tbAMBAR = New System.Windows.Forms.TabPage()
Me.Button5 = New System.Windows.Forms.Button()
Me.cbxAuswertungPDF = New System.Windows.Forms.CheckBox()
Me.Button6 = New System.Windows.Forms.Button()
CType(Me.dgvMA, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel1.SuspendLayout()
Me.Panel3.SuspendLayout()
@@ -142,6 +143,7 @@ Partial Class usrCntlDienstplan
'
'Panel3
'
Me.Panel3.Controls.Add(Me.Button6)
Me.Panel3.Controls.Add(Me.cbxAuswertungPDF)
Me.Panel3.Controls.Add(Me.Button5)
Me.Panel3.Controls.Add(Me.cbxInaktiv)
@@ -160,6 +162,34 @@ Partial Class usrCntlDienstplan
Me.Panel3.Size = New System.Drawing.Size(121, 771)
Me.Panel3.TabIndex = 6
'
'cbxAuswertungPDF
'
Me.cbxAuswertungPDF.AutoSize = True
Me.cbxAuswertungPDF.Checked = True
Me.cbxAuswertungPDF.CheckState = System.Windows.Forms.CheckState.Checked
Me.cbxAuswertungPDF.Location = New System.Drawing.Point(6, 541)
Me.cbxAuswertungPDF.Name = "cbxAuswertungPDF"
Me.cbxAuswertungPDF.Size = New System.Drawing.Size(92, 17)
Me.cbxAuswertungPDF.TabIndex = 14
Me.cbxAuswertungPDF.Text = "PDF Ausgabe"
Me.cbxAuswertungPDF.UseVisualStyleBackColor = True
Me.cbxAuswertungPDF.Visible = False
'
'Button5
'
Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button5.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
Me.Button5.Image = CType(resources.GetObject("Button5.Image"), System.Drawing.Image)
Me.Button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button5.Location = New System.Drawing.Point(3, 454)
Me.Button5.Name = "Button5"
Me.Button5.Size = New System.Drawing.Size(115, 35)
Me.Button5.TabIndex = 13
Me.Button5.Text = "Monatsauswert." & Global.Microsoft.VisualBasic.ChrW(13)
Me.Button5.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.Button5.UseVisualStyleBackColor = True
Me.Button5.Visible = False
'
'cbxInaktiv
'
Me.cbxInaktiv.AutoSize = True
@@ -363,33 +393,19 @@ Partial Class usrCntlDienstplan
Me.tbAMBAR.Text = "AMBAR"
Me.tbAMBAR.UseVisualStyleBackColor = True
'
'Button5
'Button6
'
Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button5.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
Me.Button5.Image = CType(resources.GetObject("Button5.Image"), System.Drawing.Image)
Me.Button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button5.Location = New System.Drawing.Point(3, 454)
Me.Button5.Name = "Button5"
Me.Button5.Size = New System.Drawing.Size(115, 35)
Me.Button5.TabIndex = 13
Me.Button5.Text = "Monatsauswert." & Global.Microsoft.VisualBasic.ChrW(13)
Me.Button5.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.Button5.UseVisualStyleBackColor = True
Me.Button5.Visible = False
'
'cbxAuswertungPDF
'
Me.cbxAuswertungPDF.AutoSize = True
Me.cbxAuswertungPDF.Checked = True
Me.cbxAuswertungPDF.CheckState = System.Windows.Forms.CheckState.Checked
Me.cbxAuswertungPDF.Location = New System.Drawing.Point(6, 541)
Me.cbxAuswertungPDF.Name = "cbxAuswertungPDF"
Me.cbxAuswertungPDF.Size = New System.Drawing.Size(92, 17)
Me.cbxAuswertungPDF.TabIndex = 14
Me.cbxAuswertungPDF.Text = "PDF Ausgabe"
Me.cbxAuswertungPDF.UseVisualStyleBackColor = True
Me.cbxAuswertungPDF.Visible = False
Me.Button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button6.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
Me.Button6.Image = Global.ADMIN.My.Resources.Resources.Excel_2013_logo_155x110
Me.Button6.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button6.Location = New System.Drawing.Point(3, 619)
Me.Button6.Name = "Button6"
Me.Button6.Size = New System.Drawing.Size(115, 50)
Me.Button6.TabIndex = 15
Me.Button6.Text = "Excel"
Me.Button6.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.Button6.UseVisualStyleBackColor = True
'
'usrCntlDienstplan
'
@@ -438,4 +454,5 @@ Partial Class usrCntlDienstplan
Friend WithEvents tbAMBAR As TabPage
Friend WithEvents Button5 As Button
Friend WithEvents cbxAuswertungPDF As CheckBox
Friend WithEvents Button6 As Button
End Class

6
UID/Dienstplan/usrCntlDienstplan.vb
View File

@@ -569,4 +569,10 @@ Public Class usrCntlDienstplan
Next
End Sub
Private Sub Button6_Click(sender As Object, e As EventArgs) Handles Button6.Click
Dim table As New DataTable()
Me.dataAdapterMA.Fill(table)
VERAG_PROG_ALLGEMEIN.cProgramFunctions.genCSVFromDT(table, True) '
End Sub
End Class

100
UID/Mitarbeiter/frmMitarbDetails.Designer.vb generated
View File

@@ -62,6 +62,8 @@ Partial Class frmMitarbDetails
Me.cboATLAS_SB = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Label4 = New System.Windows.Forms.Label()
Me.GroupBox2 = New System.Windows.Forms.GroupBox()
Me.cboFaktGrp = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Label56 = New System.Windows.Forms.Label()
Me.cboALIASDomain2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.txtALIASUser2 = New System.Windows.Forms.TextBox()
Me.Label54 = New System.Windows.Forms.Label()
@@ -171,8 +173,8 @@ Partial Class frmMitarbDetails
Me.PictureBox6 = New System.Windows.Forms.PictureBox()
Me.cboAdminBer = New System.Windows.Forms.ComboBox()
Me.Label7 = New System.Windows.Forms.Label()
Me.cboFaktGrp = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Label56 = New System.Windows.Forms.Label()
Me.txtAbweichenderAnzeigename = New System.Windows.Forms.TextBox()
Me.Label57 = New System.Windows.Forms.Label()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel1.SuspendLayout()
Me.TabControl2.SuspendLayout()
@@ -632,6 +634,8 @@ Partial Class frmMitarbDetails
'
'GroupBox2
'
Me.GroupBox2.Controls.Add(Me.txtAbweichenderAnzeigename)
Me.GroupBox2.Controls.Add(Me.Label57)
Me.GroupBox2.Controls.Add(Me.cboFaktGrp)
Me.GroupBox2.Controls.Add(Me.Label56)
Me.GroupBox2.Controls.Add(Me.cboALIASDomain2)
@@ -678,6 +682,29 @@ Partial Class frmMitarbDetails
Me.GroupBox2.TabStop = False
Me.GroupBox2.Text = "Firmendaten"
'
'cboFaktGrp
'
Me.cboFaktGrp._allowedValuesFreiText = Nothing
Me.cboFaktGrp._allowFreiText = False
Me.cboFaktGrp._value = ""
Me.cboFaktGrp.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.cboFaktGrp.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cboFaktGrp.FormattingEnabled = True
Me.cboFaktGrp.Items.AddRange(New Object() {"Buchhaltung", "EDV", "Fiskal", "Geschäftsführung", "Lager", "MDM", "quick-stop", "Verrechnung", "Zollabteilung"})
Me.cboFaktGrp.Location = New System.Drawing.Point(211, 155)
Me.cboFaktGrp.Name = "cboFaktGrp"
Me.cboFaktGrp.Size = New System.Drawing.Size(177, 21)
Me.cboFaktGrp.TabIndex = 107
'
'Label56
'
Me.Label56.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label56.Location = New System.Drawing.Point(208, 139)
Me.Label56.Name = "Label56"
Me.Label56.Size = New System.Drawing.Size(128, 13)
Me.Label56.TabIndex = 108
Me.Label56.Text = "Fakturierungs-Gruppe:"
'
'cboALIASDomain2
'
Me.cboALIASDomain2._allowedValuesFreiText = Nothing
@@ -686,7 +713,7 @@ Partial Class frmMitarbDetails
Me.cboALIASDomain2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cboALIASDomain2.FormattingEnabled = True
Me.cboALIASDomain2.Items.AddRange(New Object() {"Suben", "Salzburg", "Waidhaus", "Nickelsdorf"})
Me.cboALIASDomain2.Location = New System.Drawing.Point(409, 60)
Me.cboALIASDomain2.Location = New System.Drawing.Point(402, 60)
Me.cboALIASDomain2.Name = "cboALIASDomain2"
Me.cboALIASDomain2.Size = New System.Drawing.Size(116, 21)
Me.cboALIASDomain2.TabIndex = 106
@@ -694,7 +721,7 @@ Partial Class frmMitarbDetails
'txtALIASUser2
'
Me.txtALIASUser2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtALIASUser2.Location = New System.Drawing.Point(524, 60)
Me.txtALIASUser2.Location = New System.Drawing.Point(517, 60)
Me.txtALIASUser2.Name = "txtALIASUser2"
Me.txtALIASUser2.Size = New System.Drawing.Size(179, 20)
Me.txtALIASUser2.TabIndex = 105
@@ -729,16 +756,16 @@ Partial Class frmMitarbDetails
Me.cboTeam.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cboTeam.FormattingEnabled = True
Me.cboTeam.Items.AddRange(New Object() {"Buchhaltung", "EDV", "Fiskal", "Geschäftsführung", "Lager", "MDM", "quick-stop", "Verrechnung", "Zollabteilung"})
Me.cboTeam.Location = New System.Drawing.Point(406, 116)
Me.cboTeam.Location = New System.Drawing.Point(399, 116)
Me.cboTeam.Name = "cboTeam"
Me.cboTeam.Size = New System.Drawing.Size(136, 21)
Me.cboTeam.Size = New System.Drawing.Size(148, 21)
Me.cboTeam.TabIndex = 101
'
'Label53
'
Me.Label53.AutoSize = True
Me.Label53.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label53.Location = New System.Drawing.Point(403, 100)
Me.Label53.Location = New System.Drawing.Point(396, 100)
Me.Label53.Name = "Label53"
Me.Label53.Size = New System.Drawing.Size(37, 13)
Me.Label53.TabIndex = 102
@@ -752,7 +779,7 @@ Partial Class frmMitarbDetails
Me.cboALIASDomain.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cboALIASDomain.FormattingEnabled = True
Me.cboALIASDomain.Items.AddRange(New Object() {"Suben", "Salzburg", "Waidhaus", "Nickelsdorf"})
Me.cboALIASDomain.Location = New System.Drawing.Point(409, 37)
Me.cboALIASDomain.Location = New System.Drawing.Point(402, 37)
Me.cboALIASDomain.Name = "cboALIASDomain"
Me.cboALIASDomain.Size = New System.Drawing.Size(116, 21)
Me.cboALIASDomain.TabIndex = 100
@@ -760,7 +787,7 @@ Partial Class frmMitarbDetails
'txtALIASUser
'
Me.txtALIASUser.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtALIASUser.Location = New System.Drawing.Point(524, 37)
Me.txtALIASUser.Location = New System.Drawing.Point(517, 37)
Me.txtALIASUser.Name = "txtALIASUser"
Me.txtALIASUser.Size = New System.Drawing.Size(179, 20)
Me.txtALIASUser.TabIndex = 99
@@ -769,7 +796,7 @@ Partial Class frmMitarbDetails
'
Me.Label52.AutoSize = True
Me.Label52.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label52.Location = New System.Drawing.Point(406, 21)
Me.Label52.Location = New System.Drawing.Point(399, 21)
Me.Label52.Name = "Label52"
Me.Label52.Size = New System.Drawing.Size(167, 13)
Me.Label52.TabIndex = 98
@@ -779,7 +806,7 @@ Partial Class frmMitarbDetails
'
Me.lkl.AutoSize = True
Me.lkl.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.lkl.Location = New System.Drawing.Point(357, 21)
Me.lkl.Location = New System.Drawing.Point(353, 21)
Me.lkl.Name = "lkl"
Me.lkl.Size = New System.Drawing.Size(35, 13)
Me.lkl.TabIndex = 97
@@ -816,7 +843,7 @@ Partial Class frmMitarbDetails
Me.cboFirmaFMZOLL.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.cboFirmaFMZOLL.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cboFirmaFMZOLL.FormattingEnabled = True
Me.cboFirmaFMZOLL.Location = New System.Drawing.Point(214, 76)
Me.cboFirmaFMZOLL.Location = New System.Drawing.Point(210, 76)
Me.cboFirmaFMZOLL.Name = "cboFirmaFMZOLL"
Me.cboFirmaFMZOLL.Size = New System.Drawing.Size(178, 21)
Me.cboFirmaFMZOLL.TabIndex = 95
@@ -825,7 +852,7 @@ Partial Class frmMitarbDetails
'
Me.Label39.AutoSize = True
Me.Label39.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label39.Location = New System.Drawing.Point(212, 60)
Me.Label39.Location = New System.Drawing.Point(208, 60)
Me.Label39.Name = "Label39"
Me.Label39.Size = New System.Drawing.Size(88, 13)
Me.Label39.TabIndex = 93
@@ -926,7 +953,7 @@ Partial Class frmMitarbDetails
Me.txtEmail.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtEmail.Location = New System.Drawing.Point(304, 204)
Me.txtEmail.Name = "txtEmail"
Me.txtEmail.Size = New System.Drawing.Size(241, 20)
Me.txtEmail.Size = New System.Drawing.Size(243, 20)
Me.txtEmail.TabIndex = 7
'
'Label20
@@ -961,7 +988,7 @@ Partial Class frmMitarbDetails
'
Me.Label8.AutoSize = True
Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label8.Location = New System.Drawing.Point(216, 40)
Me.Label8.Location = New System.Drawing.Point(212, 40)
Me.Label8.Name = "Label8"
Me.Label8.Size = New System.Drawing.Size(146, 13)
Me.Label8.TabIndex = 1
@@ -976,7 +1003,7 @@ Partial Class frmMitarbDetails
Me.cboAbteilung.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cboAbteilung.FormattingEnabled = True
Me.cboAbteilung.Items.AddRange(New Object() {"Buchhaltung", "EDV", "Fiskal", "Geschäftsführung", "Lager", "MDM", "quick-stop", "Verrechnung", "Zollabteilung"})
Me.cboAbteilung.Location = New System.Drawing.Point(215, 116)
Me.cboAbteilung.Location = New System.Drawing.Point(211, 116)
Me.cboAbteilung.Name = "cboAbteilung"
Me.cboAbteilung.Size = New System.Drawing.Size(177, 21)
Me.cboAbteilung.TabIndex = 4
@@ -984,7 +1011,7 @@ Partial Class frmMitarbDetails
'txtPwd
'
Me.txtPwd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtPwd.Location = New System.Drawing.Point(214, 37)
Me.txtPwd.Location = New System.Drawing.Point(210, 37)
Me.txtPwd.Name = "txtPwd"
Me.txtPwd.Size = New System.Drawing.Size(178, 20)
Me.txtPwd.TabIndex = 55
@@ -993,7 +1020,7 @@ Partial Class frmMitarbDetails
'
Me.Label11.AutoSize = True
Me.Label11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label11.Location = New System.Drawing.Point(212, 100)
Me.Label11.Location = New System.Drawing.Point(208, 100)
Me.Label11.Name = "Label11"
Me.Label11.Size = New System.Drawing.Size(54, 13)
Me.Label11.TabIndex = 55
@@ -1003,7 +1030,7 @@ Partial Class frmMitarbDetails
'
Me.Label6.AutoSize = True
Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label6.Location = New System.Drawing.Point(212, 21)
Me.Label6.Location = New System.Drawing.Point(208, 21)
Me.Label6.Name = "Label6"
Me.Label6.Size = New System.Drawing.Size(53, 13)
Me.Label6.TabIndex = 57
@@ -1866,28 +1893,23 @@ Partial Class frmMitarbDetails
Me.Label7.TabIndex = 78
Me.Label7.Text = "Berechtigung:"
'
'cboFaktGrp
'txtAbweichenderAnzeigename
'
Me.cboFaktGrp._allowedValuesFreiText = Nothing
Me.cboFaktGrp._allowFreiText = False
Me.cboFaktGrp._value = ""
Me.cboFaktGrp.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.cboFaktGrp.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cboFaktGrp.FormattingEnabled = True
Me.cboFaktGrp.Items.AddRange(New Object() {"Buchhaltung", "EDV", "Fiskal", "Geschäftsführung", "Lager", "MDM", "quick-stop", "Verrechnung", "Zollabteilung"})
Me.cboFaktGrp.Location = New System.Drawing.Point(215, 155)
Me.cboFaktGrp.Name = "cboFaktGrp"
Me.cboFaktGrp.Size = New System.Drawing.Size(177, 21)
Me.cboFaktGrp.TabIndex = 107
Me.txtAbweichenderAnzeigename.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtAbweichenderAnzeigename.Location = New System.Drawing.Point(399, 156)
Me.txtAbweichenderAnzeigename.Name = "txtAbweichenderAnzeigename"
Me.txtAbweichenderAnzeigename.Size = New System.Drawing.Size(148, 20)
Me.txtAbweichenderAnzeigename.TabIndex = 109
'
'Label56
'Label57
'
Me.Label56.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label56.Location = New System.Drawing.Point(212, 139)
Me.Label56.Name = "Label56"
Me.Label56.Size = New System.Drawing.Size(128, 13)
Me.Label56.TabIndex = 108
Me.Label56.Text = "Fakturierungs-Gruppe:"
Me.Label57.AutoSize = True
Me.Label57.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label57.Location = New System.Drawing.Point(396, 140)
Me.Label57.Name = "Label57"
Me.Label57.Size = New System.Drawing.Size(151, 13)
Me.Label57.TabIndex = 110
Me.Label57.Text = "And. Anzeigename (Aviso,TV):"
'
'frmMitarbDetails
'
@@ -2081,4 +2103,6 @@ Partial Class frmMitarbDetails
Friend WithEvents Label55 As Label
Friend WithEvents cboFaktGrp As VERAG_PROG_ALLGEMEIN.MyComboBox
Friend WithEvents Label56 As Label
Friend WithEvents txtAbweichenderAnzeigename As TextBox
Friend WithEvents Label57 As Label
End Class

2
UID/Mitarbeiter/frmMitarbDetails.resx
View File

@@ -121,7 +121,7 @@
<data name="PictureBox6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAAhBJREFUWEftlbFKA1EQRQP5FyG1fyBp/ANT2KYxWNkm+AExtYipLASDlYVpRBSC
wQAADsEBuJFr7QAAAhBJREFUWEftlbFKA1EQRQP5FyG1fyBp/ANT2KYxWNkm+AExtYipLASDlYVpRBSC
RRoDQbBYEItAFLQwksJi9Qy5j8ljG5vdZgdmd959M3fuzEaspAVbKaAUUApYE/CzWJjH9h/cn+M46y4I
eBuN0ptq1XzcaKzQ1GLhD/V6OhsODectnFoI72u1UM85jpWrWvAgYNrphCSIMBXS+LnXMxwHT/r9kP86
GKyd4dJAPtaZXA1pApbzuV1Crolp8pUkFj+2WpaMCM4QkocwzhKnM4LwOOZePRCCmQCp50ICPieTsCru

2
UID/Mitarbeiter/frmMitarbDetails.vb
View File

@@ -222,6 +222,7 @@
' mit_id.Text = mitarbeiter.mit_id
Label48.Text = mitarbeiter.mit_id
txtUsername.Text = mitarbeiter.mit_username
txtAbweichenderAnzeigename.Text = mitarbeiter.mit_abweichenderAnzeigename
txtPwd.Text = mitarbeiter.mit_pwd
If mitarbeiter.mit_geschlecht = "m" Then rbtnGeschlechtM.Checked = True
If mitarbeiter.mit_geschlecht = "w" Then rbtnGeschlechtW.Checked = True
@@ -492,6 +493,7 @@
Private Sub getMitarbeiter()
mitarbeiter.mit_username = txtUsername.Text
mitarbeiter.mit_abweichenderAnzeigename = txtAbweichenderAnzeigename.Text
mitarbeiter.mit_pwd = txtPwd.Text
mitarbeiter.mit_affix = txtTitel.Text
If rbtnGeschlechtM.Checked Then mitarbeiter.mit_geschlecht = "m"

11
UID/My Project/Resources.Designer.vb generated
View File

@@ -110,15 +110,6 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die ähnelt.
'''</summary>
Friend ReadOnly Property asda2sdas1das() As String
Get
Return ResourceManager.GetString("asda2sdas1das", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Byte[].
'''</summary>
@@ -664,7 +655,7 @@ Namespace My.Resources
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die 2.0.6 ähnelt.
''' Sucht eine lokalisierte Zeichenfolge, die 2.0.7 ähnelt.
'''</summary>
Friend ReadOnly Property Version() As String
Get

5
UID/My Project/Resources.resx
View File

@@ -188,7 +188,7 @@
<value>Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;</value>
</data>
<data name="Version" xml:space="preserve">
<value>2.0.6</value>
<value>2.0.7</value>
</data>
<data name="del" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -301,9 +301,6 @@
<data name="personGray_w" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\personGray_w.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="asda2sdas1das" xml:space="preserve">
<value />
</data>
<data name="bbvn6" xml:space="preserve">
<value />
</data>

11
UID/cSqlDb.vb
View File

@@ -1197,7 +1197,7 @@ Public Class cOptionenDAL
Public Function getDataMitarb() As IList(Of VERAG_PROG_ALLGEMEIN.cMitarbeiter)
'falls ID mitgegeben, dann diese laden, ansonsten den anderen Wert suchen
Dim sql As String = "SELECT mit_id,mit_username,mit_vname, mit_nname ,mit_niederlassung,mit_abteilung,mit_email,mit_durchwahl,mit_gekuendigt FROM tblUser "
Dim sql As String = "SELECT mit_id,mit_username,mit_abweichenderAnzeigename,mit_vname, mit_nname ,mit_niederlassung,mit_abteilung,mit_email,mit_durchwahl,mit_gekuendigt FROM tblUser "
Dim daten As New List(Of VERAG_PROG_ALLGEMEIN.cMitarbeiter)
Try
Using conn As SqlConnection = cSqlDb.GetNewOpenConnection()
@@ -1212,6 +1212,7 @@ Public Class cOptionenDAL
d.mit_id = dr.Item("mit_id")
d.mit_username = dr.Item("mit_username")
d.mit_abweichenderAnzeigename = dr.Item("mit_abweichenderAnzeigename")
' d.mit_pwd = dr.Item("mit_pwd")
' d.mit_affix = dr.Item("mit_affix")
d.mit_vname = dr.Item("mit_vname")
@@ -1549,8 +1550,8 @@ Public Class cMitarbeiter
'Änderung
Dim sql = "INSERT INTO tblMitarbeiter " &
"(mit_username, mit_pwd, mit_geschlecht, mit_affix, mit_vname, mit_nname, mit_gebdat, mit_strasse,mit_hausnr,mit_land,mit_plz,mit_ort,mit_niederlassung, mit_abteilung, mit_position, mit_durchwahl, mit_email, mit_mobiltel, mit_allowAnruf,mit_info, mit_einstiegsdatum, mit_gekuendigt, mit_kuendigungsdatum, mit_foto,mit_firma,mit_firmaFMZoll,mit_FMZollPersID,mit_FMZollPersIDKasseIsnotSpedBuch,mit_FMZollPersIDSpedBuch,mit_standartFiliale,mit_DpUserStandardDP,mit_EZOLL_SB,mit_ATLAS_SB,mit_FirmenDatenAnzeige,mit_DAKOSY_SB,mit_DAKOSY_SBFull,mit_DpUserStandardFirma,mit_DpUserStandardFirma2,mit_TESTonly,mit_PasswortChanged,mit_TELOTEC_SB,mit_AliasAD_Domain,mit_AliasAD_Username,mit_AliasAD_Domain2,mit_AliasAD_Username2,mit_teamId,mit_ChatBenutzer,mit_FirmaHaupt,mit_ChatEasteregg,mit_MAVerzeichnis_SettingsTstmp,mit_MAVerzeichnis_allowGebDat,mit_MAVerzeichnis_allowWohnadresse,mit_MAVerzeichnis_allowGebDatOhneJahr,mit_MAVerzeichnis_Spitzname,mit_foto_DocId,mit_MAVerzeichnis_Motto,mit_sprache,mit_fakturierungsgruppe ) VALUES " &
"(@mit_username,@mit_pwd,@mit_geschlecht,@mit_affix,@mit_vname,@mit_nname,@mit_gebdat,@mit_strasse,@mit_hausnr,@mit_land,@mit_plz,@mit_ort,@mit_niederlassung,@mit_abteilung,@mit_position,@mit_durchwahl,@mit_email,@mit_mobiltel,@mit_allowAnruf,@mit_info,@mit_einstiegsdatum,@mit_gekuendigt,@mit_kuendigungsdatum,@mit_foto,@mit_firma,@mit_firmaFMZoll,@mit_FMZollPersID,@mit_FMZollPersIDKasseIsnotSpedBuch,@mit_FMZollPersIDSpedBuch,@mit_standartFiliale,@mit_DpUserStandardDP,@mit_EZOLL_SB,@mit_ATLAS_SB,@mit_FirmenDatenAnzeige,@mit_DAKOSY_SB,@mit_DAKOSY_SBFull,@mit_DpUserStandardFirma,@mit_DpUserStandardFirma2,@mit_TESTonly,@mit_PasswortChanged,@mit_TELOTEC_SB,@mit_AliasAD_Domain,@mit_AliasAD_Username,@mit_AliasAD_Domain2,@mit_AliasAD_Username2,@mit_teamId,@mit_ChatBenutzer,@mit_FirmaHaupt,@mit_ChatEasteregg,@mit_MAVerzeichnis_SettingsTstmp,@mit_MAVerzeichnis_allowGebDat,@mit_MAVerzeichnis_allowWohnadresse,@mit_MAVerzeichnis_allowGebDatOhneJahr,@mit_MAVerzeichnis_Spitzname,@mit_foto_DocId,@mit_MAVerzeichnis_Motto ,@mit_sprache,@mit_fakturierungsgruppe )"
"(mit_username,mit_abweichenderAnzeigename, mit_pwd, mit_geschlecht, mit_affix, mit_vname, mit_nname, mit_gebdat, mit_strasse,mit_hausnr,mit_land,mit_plz,mit_ort,mit_niederlassung, mit_abteilung, mit_position, mit_durchwahl, mit_email, mit_mobiltel, mit_allowAnruf,mit_info, mit_einstiegsdatum, mit_gekuendigt, mit_kuendigungsdatum, mit_foto,mit_firma,mit_firmaFMZoll,mit_FMZollPersID,mit_FMZollPersIDKasseIsnotSpedBuch,mit_FMZollPersIDSpedBuch,mit_standartFiliale,mit_DpUserStandardDP,mit_EZOLL_SB,mit_ATLAS_SB,mit_FirmenDatenAnzeige,mit_DAKOSY_SB,mit_DAKOSY_SBFull,mit_DpUserStandardFirma,mit_DpUserStandardFirma2,mit_TESTonly,mit_PasswortChanged,mit_TELOTEC_SB,mit_AliasAD_Domain,mit_AliasAD_Username,mit_AliasAD_Domain2,mit_AliasAD_Username2,mit_teamId,mit_ChatBenutzer,mit_FirmaHaupt,mit_ChatEasteregg,mit_MAVerzeichnis_SettingsTstmp,mit_MAVerzeichnis_allowGebDat,mit_MAVerzeichnis_allowWohnadresse,mit_MAVerzeichnis_allowGebDatOhneJahr,mit_MAVerzeichnis_Spitzname,mit_foto_DocId,mit_MAVerzeichnis_Motto,mit_sprache,mit_fakturierungsgruppe ) VALUES " &
"(@mit_username,@mit_abweichenderAnzeigename,@mit_pwd,@mit_geschlecht,@mit_affix,@mit_vname,@mit_nname,@mit_gebdat,@mit_strasse,@mit_hausnr,@mit_land,@mit_plz,@mit_ort,@mit_niederlassung,@mit_abteilung,@mit_position,@mit_durchwahl,@mit_email,@mit_mobiltel,@mit_allowAnruf,@mit_info,@mit_einstiegsdatum,@mit_gekuendigt,@mit_kuendigungsdatum,@mit_foto,@mit_firma,@mit_firmaFMZoll,@mit_FMZollPersID,@mit_FMZollPersIDKasseIsnotSpedBuch,@mit_FMZollPersIDSpedBuch,@mit_standartFiliale,@mit_DpUserStandardDP,@mit_EZOLL_SB,@mit_ATLAS_SB,@mit_FirmenDatenAnzeige,@mit_DAKOSY_SB,@mit_DAKOSY_SBFull,@mit_DpUserStandardFirma,@mit_DpUserStandardFirma2,@mit_TESTonly,@mit_PasswortChanged,@mit_TELOTEC_SB,@mit_AliasAD_Domain,@mit_AliasAD_Username,@mit_AliasAD_Domain2,@mit_AliasAD_Username2,@mit_teamId,@mit_ChatBenutzer,@mit_FirmaHaupt,@mit_ChatEasteregg,@mit_MAVerzeichnis_SettingsTstmp,@mit_MAVerzeichnis_allowGebDat,@mit_MAVerzeichnis_allowWohnadresse,@mit_MAVerzeichnis_allowGebDatOhneJahr,@mit_MAVerzeichnis_Spitzname,@mit_foto_DocId,@mit_MAVerzeichnis_Motto ,@mit_sprache,@mit_fakturierungsgruppe )"
@@ -1560,6 +1561,7 @@ Public Class cMitarbeiter
Using cmd As New SqlCommand(sql, conn)
cmd.Parameters.AddWithValue("@mit_username", m.mit_username)
cmd.Parameters.AddWithValue("@mit_abweichenderAnzeigename", m.mit_abweichenderAnzeigename)
cmd.Parameters.AddWithValue("@mit_pwd", m.mit_pwd)
cmd.Parameters.AddWithValue("@mit_geschlecht", m.mit_geschlecht)
cmd.Parameters.AddWithValue("@mit_affix", m.mit_affix)
@@ -1637,7 +1639,7 @@ Public Class cMitarbeiter
Dim hAuswahl As String = ""
Dim sql = "UPDATE tblMitarbeiter " &
"SET mit_username=@mit_username, mit_pwd=@mit_pwd, mit_geschlecht=@mit_geschlecht, mit_affix=@mit_affix, mit_vname=@mit_vname, mit_nname=@mit_nname, mit_gebdat=@mit_gebdat, mit_strasse=@mit_strasse, mit_hausnr=@mit_hausnr, mit_land=@mit_land, mit_plz=@mit_plz, mit_ort=@mit_ort, mit_niederlassung=@mit_niederlassung, mit_abteilung=@mit_abteilung, mit_position=@mit_position, mit_durchwahl=@mit_durchwahl, mit_email=@mit_email, mit_mobiltel=@mit_mobiltel, mit_allowAnruf=@mit_allowAnruf, mit_info=@mit_info, mit_einstiegsdatum=@mit_einstiegsdatum, mit_gekuendigt=@mit_gekuendigt, mit_kuendigungsdatum=@mit_kuendigungsdatum, mit_foto=@mit_foto, mit_firma=@mit_firma,mit_firmaFMZoll=@mit_firmaFMZoll,mit_FMZollPersID=@mit_FMZollPersID, mit_FMZollPersIDKasseIsnotSpedBuch=@mit_FMZollPersIDKasseIsnotSpedBuch,mit_FMZollPersIDSpedBuch=@mit_FMZollPersIDSpedBuch,mit_standartFiliale=@mit_standartFiliale,mit_standardPreisliste=@mit_standardPreisliste,mit_DpUserStandardDP=@mit_DpUserStandardDP, mit_EZOLL_SB=@mit_EZOLL_SB, mit_ATLAS_SB=@mit_ATLAS_SB,mit_FirmenDatenAnzeige=@mit_FirmenDatenAnzeige,mit_DAKOSY_SB=@mit_DAKOSY_SB, mit_DAKOSY_SBFull=@mit_DAKOSY_SBFull ,mit_DpUserStandardFirma=@mit_DpUserStandardFirma,mit_DpUserStandardFirma2=@mit_DpUserStandardFirma2, mit_TESTonly=@mit_TESTonly,mit_PasswortChanged=@mit_PasswortChanged,mit_TELOTEC_SB=@mit_TELOTEC_SB,mit_AliasAD_Domain=@mit_AliasAD_Domain,mit_AliasAD_Username=@mit_AliasAD_Username,mit_AliasAD_Domain2=@mit_AliasAD_Domain2,mit_AliasAD_Username2=@mit_AliasAD_Username2,mit_teamId=@mit_teamId,mit_ChatBenutzer=@mit_ChatBenutzer,mit_FirmaHaupt=@mit_FirmaHaupt " &
"SET mit_username=@mit_username, mit_abweichenderAnzeigename=@mit_abweichenderAnzeigename,mit_pwd=@mit_pwd, mit_geschlecht=@mit_geschlecht, mit_affix=@mit_affix, mit_vname=@mit_vname, mit_nname=@mit_nname, mit_gebdat=@mit_gebdat, mit_strasse=@mit_strasse, mit_hausnr=@mit_hausnr, mit_land=@mit_land, mit_plz=@mit_plz, mit_ort=@mit_ort, mit_niederlassung=@mit_niederlassung, mit_abteilung=@mit_abteilung, mit_position=@mit_position, mit_durchwahl=@mit_durchwahl, mit_email=@mit_email, mit_mobiltel=@mit_mobiltel, mit_allowAnruf=@mit_allowAnruf, mit_info=@mit_info, mit_einstiegsdatum=@mit_einstiegsdatum, mit_gekuendigt=@mit_gekuendigt, mit_kuendigungsdatum=@mit_kuendigungsdatum, mit_foto=@mit_foto, mit_firma=@mit_firma,mit_firmaFMZoll=@mit_firmaFMZoll,mit_FMZollPersID=@mit_FMZollPersID, mit_FMZollPersIDKasseIsnotSpedBuch=@mit_FMZollPersIDKasseIsnotSpedBuch,mit_FMZollPersIDSpedBuch=@mit_FMZollPersIDSpedBuch,mit_standartFiliale=@mit_standartFiliale,mit_standardPreisliste=@mit_standardPreisliste,mit_DpUserStandardDP=@mit_DpUserStandardDP, mit_EZOLL_SB=@mit_EZOLL_SB, mit_ATLAS_SB=@mit_ATLAS_SB,mit_FirmenDatenAnzeige=@mit_FirmenDatenAnzeige,mit_DAKOSY_SB=@mit_DAKOSY_SB, mit_DAKOSY_SBFull=@mit_DAKOSY_SBFull ,mit_DpUserStandardFirma=@mit_DpUserStandardFirma,mit_DpUserStandardFirma2=@mit_DpUserStandardFirma2, mit_TESTonly=@mit_TESTonly,mit_PasswortChanged=@mit_PasswortChanged,mit_TELOTEC_SB=@mit_TELOTEC_SB,mit_AliasAD_Domain=@mit_AliasAD_Domain,mit_AliasAD_Username=@mit_AliasAD_Username,mit_AliasAD_Domain2=@mit_AliasAD_Domain2,mit_AliasAD_Username2=@mit_AliasAD_Username2,mit_teamId=@mit_teamId,mit_ChatBenutzer=@mit_ChatBenutzer,mit_FirmaHaupt=@mit_FirmaHaupt " &
" ,mit_ChatEasteregg=@mit_ChatEasteregg,mit_MAVerzeichnis_SettingsTstmp=@mit_MAVerzeichnis_SettingsTstmp,mit_MAVerzeichnis_allowGebDat=@mit_MAVerzeichnis_allowGebDat,mit_MAVerzeichnis_allowWohnadresse=@mit_MAVerzeichnis_allowWohnadresse,mit_MAVerzeichnis_allowGebDatOhneJahr=@mit_MAVerzeichnis_allowGebDatOhneJahr,mit_MAVerzeichnis_Spitzname=@mit_MAVerzeichnis_Spitzname,mit_foto_DocId=@mit_foto_DocId,mit_MAVerzeichnis_Motto=@mit_MAVerzeichnis_Motto,mit_sprache=@mit_sprache,mit_fakturierungsgruppe=@mit_fakturierungsgruppe " &
" WHERE mit_id=@mit_id "
@@ -1646,6 +1648,7 @@ Public Class cMitarbeiter
Using conn As SqlConnection = cSqlDb.GetNewOpenConnection()
Using cmd As New SqlCommand(sql, conn)
cmd.Parameters.AddWithValue("@mit_username", m.mit_username)
cmd.Parameters.AddWithValue("@mit_abweichenderAnzeigename", m.mit_abweichenderAnzeigename)
cmd.Parameters.AddWithValue("@mit_pwd", m.mit_pwd)
cmd.Parameters.AddWithValue("@mit_geschlecht", m.mit_geschlecht)
cmd.Parameters.AddWithValue("@mit_affix", m.mit_affix)

29
initATLASAufschubkonten/cWorker_NCTS.vb
View File

@@ -966,28 +966,6 @@ Public Class cWorker_NCTS
If DETBAE.AuthorisedConsignee.ContactPerson.MailAddress IsNot Nothing Then
AnsprechpTMP_Email = DETBAE.AuthorisedConsignee.ContactPerson.MailAddress
'If AnsprechpTMP_Email.Contains("@imex") Then
' NCTS.ncts_firma = "IMEX"
' NCTS.ncts_niederlassung = "IMEX"
' 'GLOBAL--> EORI
'ElseIf AnsprechpTMP_Email.Contains("@ambar") Then
' NCTS.ncts_firma = "AMBAR"
' NCTS.ncts_niederlassung = "AMBAR"
'ElseIf AnsprechpTMP_Email.Contains("atilla@verag.ag") Or AnsprechpTMP_Email.Contains("@atilla") Then
' NCTS.ncts_firma = "ATILLA"
' NCTS.ncts_niederlassung = "SUB"
'ElseIf AnsprechpTMP_Email.Contains("@durmaz") Then
' NCTS.ncts_firma = "DURMAZ"
' NCTS.ncts_niederlassung = "SBG"
' 'GLOBAL--> EORI
'ElseIf AnsprechpTMP_Email.Contains("@verag") Then
' NCTS.ncts_firma = "VERAG"
' ' EZA.eza_niederlassung = "IMEX"
'ElseIf AnsprechpTMP_Email.Contains("@unisped") Then
' NCTS.ncts_firma = "UNISPED"
' NCTS.ncts_niederlassung = "ATSP"
' 'GLOBAL--> EORIAnsprechpTMP_Email
'End If
End If
frmDYNachrichtenVerarbeitung.tryGetFirmaNiederlassung(NCTS.ncts_firma, NCTS.ncts_niederlassung, If(AnsprechpTMP_Email, "").ToString, "")
@@ -1271,8 +1249,11 @@ Public Class cWorker_NCTS
If (NCTS_TMP.ncts_firma Is Nothing OrElse NCTS_TMP.ncts_firma = "") Or (NCTS_TMP.ncts_niederlassung Is Nothing OrElse NCTS_TMP.ncts_niederlassung = "") Then
Select Case division
Case "SUW"
NCTS_TMP.ncts_firma = "ATILLA"
NCTS_TMP.ncts_niederlassung = "SUB"
'VERIMEX!!!! --> Arbeitet bim T1 Vorschreiben mit ATILLA Benutzer
frmDYNachrichtenVerarbeitung.tryGetFirmaNiederlassung(NCTS_TMP.ncts_firma, NCTS_TMP.ncts_niederlassung, "", NCTS_TMP.ncts_ObjectName)
If If(NCTS_TMP.ncts_firma, "") = "" Then NCTS_TMP.ncts_firma = "ATILLA"
If If(NCTS_TMP.ncts_niederlassung, "") = "" Then NCTS_TMP.ncts_niederlassung = "SUB"
Case "SUB"
NCTS_TMP.ncts_firma = "VERAG"
NCTS_TMP.ncts_niederlassung = "SUB"

23
initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb
View File

@@ -4354,8 +4354,27 @@ Public Class frmDYNachrichtenVerarbeitung
firma = "AMBAR"
niederlassung = "AMBAR"
ElseIf Mail.Contains("atilla@verag.ag") Or Mail.Contains("@atilla") Then
firma = "ATILLA"
niederlassung = "SUB"
If BezugsNr <> "" Then ' VERIMEX --> wenn keine Bezugsnummer, dann bei anderem Satus..
'----------------------------------------------------------------------------
'VERIMEX!!!! --> Arbeitet bim T1 Vorschreiben mit ATILLA Benutzer
Dim verimex = False
If firma = "" Then
If BezugsNr <> "" And BezugsNr.Length > 4 Then
Select Case BezugsNr.Substring(0, 4)
Case "5501", "4803", "5003", "5103", "5303", "4805", "4811", "7001", "5601"
verimex = True
End Select
End If
End If
'----------------------------------------------------------------------------
If Not verimex Then
firma = "ATILLA"
niederlassung = "SUB"
End If
End If
ElseIf Mail.Contains("@durmaz") Then
firma = "DURMAZ"
niederlassung = "SBG"

228
initATLASAufschubkonten/frmStartOptions.vb
View File

@@ -561,7 +561,7 @@ Public Class frmStartOptions
Dim AVISO = VERAG_PROG_ALLGEMEIN.cAviso.getAvisoById(SND.tblSnd_AvisoID)
'Wenn Freigabe-Mail aktiv und Steuerbescheid oder VBD gewählt, soll bei Fremdgrenzen die BelegMail gesendet werden.
Dim sendMailFremdgrenze = False
If KD_ERW.EmailFreigabe_Art = "FG" Then
If KD_ERW.EmailFreigabe_Art = "FG" Or KD_ERW.EmailFreigabe_Export_Art = "FG" Then
If KD_ERW.EmailFreigabe_SteuerbescheidPDF Or KD_ERW.EmailFreigabe_VBDPDF Then
If AVISO IsNot Nothing Then
@@ -1128,6 +1128,13 @@ Public Class frmStartOptions
If outletGroug.Contains("4486") Then Return 0.042
Return 0.048
End Function
Function getPlattsAufschlag_SONDER(outletGroug As String) As Double
If outletGroug.Contains("4473") Then Return 0.032
If outletGroug.Contains("4474") Then Return 0.032
If outletGroug.Contains("4486") Then Return 0.042
Return 0.048
End Function
Sub doIDSPlatts()
Try
@@ -1135,23 +1142,25 @@ Public Class frmStartOptions
Dim DS As VERAG_PROG_ALLGEMEIN.cDATENSERVER = Nothing
Dim ZIEL_PFAD = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "IDS\IDS_XLS\Platts_Price_Report\NEW\"
Dim DT_PLATTS As New DataTable()
If IO.Directory.Exists(ZIEL_PFAD) Then
DT_PLATTS.Columns.Add("IsoCode")
DT_PLATTS.Columns.Add("Outlet")
DT_PLATTS.Columns.Add("Group Description")
DT_PLATTS.Columns.Add("Product")
DT_PLATTS.Columns.Add("Price Period Start")
DT_PLATTS.Columns.Add("Price Period End")
DT_PLATTS.Columns.Add("Excise")
DT_PLATTS.Columns.Add("Netprice")
DT_PLATTS.Columns.Add("Currency")
DT_PLATTS.Columns.Add("NetpriceNEW")
For Each IDS_FILE In IO.Directory.GetFiles(ZIEL_PFAD)
Dim DT_PLATTS As New DataTable()
DT_PLATTS.Columns.Add("IsoCode")
DT_PLATTS.Columns.Add("Outlet")
DT_PLATTS.Columns.Add("Group Description")
DT_PLATTS.Columns.Add("Product")
DT_PLATTS.Columns.Add("Price Period Start")
DT_PLATTS.Columns.Add("Price Period End")
DT_PLATTS.Columns.Add("Excise")
DT_PLATTS.Columns.Add("Netprice")
DT_PLATTS.Columns.Add("Currency")
DT_PLATTS.Columns.Add("NetpriceNEW")
Dim DT_PLATTS_SONDER = DT_PLATTS.Clone
':::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
' EXCEL AUSLESEN:::::::
@@ -1195,11 +1204,20 @@ Public Class frmStartOptions
While zeile <= 10000 AndAlso Blatt.Range("A" & zeile) IsNot Nothing AndAlso Blatt.Range("A" & zeile).Value <> ""
If Blatt.Range("A" & zeile).Value.ToString.Contains("Austria") Then
'ALLGEMEIN
Dim NetpriceNEW As Double = getPlattsAufschlag(Blatt.Range("B" & zeile).Value)
If NetpriceNEW > 0 Then
NetpriceNEW += CDbl(Blatt.Range("I" & zeile).Value) ' Aufschalg + NETTO
DT_PLATTS.Rows.Add({Blatt.Range("A" & zeile).Value, Blatt.Range("B" & zeile).Value, Blatt.Range("C" & zeile).Value, Blatt.Range("D" & zeile).Value, Blatt.Range("E" & zeile).Value, Blatt.Range("F" & zeile).Value, Blatt.Range("H" & zeile).Value, Blatt.Range("I" & zeile).Value, Blatt.Range("J" & zeile).Value, NetpriceNEW})
End If
'SONDERKONDITION
Dim NetpriceNEW_SOND As Double = getPlattsAufschlag_SONDER(Blatt.Range("B" & zeile).Value)
If NetpriceNEW_SOND > 0 Then
NetpriceNEW_SOND += CDbl(Blatt.Range("I" & zeile).Value) ' Aufschalg + NETTO
DT_PLATTS_SONDER.Rows.Add({Blatt.Range("A" & zeile).Value, Blatt.Range("B" & zeile).Value, Blatt.Range("C" & zeile).Value, Blatt.Range("D" & zeile).Value, Blatt.Range("E" & zeile).Value, Blatt.Range("F" & zeile).Value, Blatt.Range("H" & zeile).Value, Blatt.Range("I" & zeile).Value, Blatt.Range("J" & zeile).Value, NetpriceNEW_SOND})
End If
End If
zeile += 1
@@ -1251,96 +1269,11 @@ Public Class frmStartOptions
End Try
End Try
'ALLGEMEIN
genXLS_NewPrice(DT_PLATTS, FILE_NEW) '--> Send XLS Mail
':::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
'NEUES EXCEL ERSTELLEN:::::::
':::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
If DT_PLATTS.Rows.Count > 0 Then
Dim Excel2 As Object 'New Microsoft.Office.Interop.Excel.Application
Dim Blatt2 As Object 'Microsoft.Office.Interop.Excel.Worksheet 'As Object 'as Worksheet
Excel2 = CreateObject("Excel.Application")
Dim Datei2 As Object 'as WorkBook
' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(destFull, "00", System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
Try
With Excel2
Try
Datei2 = .Workbooks.Open(System.AppDomain.CurrentDomain.BaseDirectory & "\Resources\Muster_IDS_PLATTSPR.xls",, True) 'Anpassen
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
MsgBox(ex.Message & ex.StackTrace)
End Try
Blatt2 = Datei2.Worksheets(1)
Dim zeile = 12
'Blatt2.Range("G:G").NumberFormat = "0.000"
For Each ROW In DT_PLATTS.Rows
Blatt2.Range("A" & zeile).Value = ROW("IsoCode")
Blatt2.Range("B" & zeile).Value = ROW("Outlet")
Blatt2.Range("C" & zeile).Value = ROW("Group Description")
Blatt2.Range("D" & zeile).Value = ROW("Product")
Blatt2.Range("E" & zeile).Value = ROW("Price Period Start").ToString
Blatt2.Range("F" & zeile).Value = ROW("Price Period End").ToString
Blatt2.Range("G" & zeile).Value = CDbl(ROW("NetpriceNEW")) '.ToString("N3")
Blatt2.Range("H" & zeile).Value = ROW("Currency")
zeile += 1
Next
End With
Dim FIN_FILE = FILE_NEW.Replace("_ORIG.xls", ".xls")
While IO.File.Exists(FIN_FILE)
FIN_FILE = FILE_NEW.Replace("_ORIG.xls", Now.ToString("_ddMMyy.HHmmss") & ".xls")
End While
Datei2.SaveAs(FIN_FILE)
Excel2.Workbooks.Close
System.Runtime.InteropServices.Marshal.FinalReleaseComObject(Excel2)
System.Runtime.InteropServices.Marshal.FinalReleaseComObject(Blatt2)
Excel2 = Nothing
Blatt2 = Nothing
GC.Collect()
':::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
'NEUES EXCEL PER MAIL SCHICKEN:::::::
':::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
Dim MAIL_attach As New List(Of String)
MAIL_attach.Add(FIN_FILE)
VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("z.batinic@verag.ag;n.ljubas@verag.ag;s.vidovic@verag.ag;ma@verag.ag;alex@verag.ag;ft@verag.ag", "IDSPRD: Platts Price Report", "*AUTO*",,,, "sales@verag.ag;al@verag.ag",, MAIL_attach)
':::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
Try
Excel2.Workbooks.Close
System.Runtime.InteropServices.Marshal.FinalReleaseComObject(Excel2)
System.Runtime.InteropServices.Marshal.FinalReleaseComObject(Blatt2)
Excel2 = Nothing
Blatt2 = Nothing
GC.Collect()
Catch ex2 As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex2.Message, ex2.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
End Try
End Try
End If
'SONDERKONDITION
' genXLS_NewPrice(DT_PLATTS_SONDER, FILE_NEW.Replace("_ORIG.xls", "_special_ORIG.xls")) '--> Send XLS Mail
Next
End If
@@ -1349,6 +1282,99 @@ Public Class frmStartOptions
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
End Try
End Sub
Sub genXLS_NewPrice(DT_PLATTS As DataTable, FILE_NEW As String)
':::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
'NEUES EXCEL ERSTELLEN:::::::
':::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
If DT_PLATTS.Rows.Count > 0 Then
Dim Excel2 As Object 'New Microsoft.Office.Interop.Excel.Application
Dim Blatt2 As Object 'Microsoft.Office.Interop.Excel.Worksheet 'As Object 'as Worksheet
Excel2 = CreateObject("Excel.Application")
Dim Datei2 As Object 'as WorkBook
' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(destFull, "00", System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
Try
With Excel2
Try
Datei2 = .Workbooks.Open(System.AppDomain.CurrentDomain.BaseDirectory & "\Resources\Muster_IDS_PLATTSPR.xls",, True) 'Anpassen
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
MsgBox(ex.Message & ex.StackTrace)
End Try
Blatt2 = Datei2.Worksheets(1)
Dim zeile = 12
'Blatt2.Range("G:G").NumberFormat = "0.000"
For Each ROW In DT_PLATTS.Rows
Blatt2.Range("A" & zeile).Value = ROW("IsoCode")
Blatt2.Range("B" & zeile).Value = ROW("Outlet")
Blatt2.Range("C" & zeile).Value = ROW("Group Description")
Blatt2.Range("D" & zeile).Value = ROW("Product")
Blatt2.Range("E" & zeile).Value = ROW("Price Period Start").ToString
Blatt2.Range("F" & zeile).Value = ROW("Price Period End").ToString
Blatt2.Range("G" & zeile).Value = CDbl(ROW("NetpriceNEW")) '.ToString("N3")
Blatt2.Range("H" & zeile).Value = ROW("Currency")
zeile += 1
Next
End With
Dim FIN_FILE = FILE_NEW.Replace("_ORIG.xls", ".xls")
While IO.File.Exists(FIN_FILE)
FIN_FILE = FILE_NEW.Replace("_ORIG.xls", Now.ToString("_ddMMyy.HHmmss") & ".xls")
End While
Datei2.SaveAs(FIN_FILE)
Excel2.Workbooks.Close
System.Runtime.InteropServices.Marshal.FinalReleaseComObject(Excel2)
System.Runtime.InteropServices.Marshal.FinalReleaseComObject(Blatt2)
Excel2 = Nothing
Blatt2 = Nothing
GC.Collect()
':::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
'NEUES EXCEL PER MAIL SCHICKEN:::::::
':::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
Dim MAIL_attach As New List(Of String)
MAIL_attach.Add(FIN_FILE)
VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("z.batinic@verag.ag;n.ljubas@verag.ag;s.vidovic@verag.ag;ma@verag.ag;alex@verag.ag;ft@verag.ag", "IDSPRD: Platts Price Report", "*AUTO*",,,, "sales@verag.ag;al@verag.ag",, MAIL_attach)
':::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
Try
Excel2.Workbooks.Close
System.Runtime.InteropServices.Marshal.FinalReleaseComObject(Excel2)
System.Runtime.InteropServices.Marshal.FinalReleaseComObject(Blatt2)
Excel2 = Nothing
Blatt2 = Nothing
GC.Collect()
Catch ex2 As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex2.Message, ex2.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
End Try
End Try
End If
End Sub
Public Function FileInUse(ByVal sFile As String) As Boolean
If System.IO.File.Exists(sFile) Then