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

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

Browse Source
This commit is contained in:
d.breimaier
2023-11-13 16:07:36 +01:00
parent e5f1d2ef4a 8f8b4a22ad
commit a394965552
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SDL/My Project/AssemblyInfo.vb
View File

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

14
VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb generated
View File

@@ -257,7 +257,7 @@ Partial Class frmMitarbeitersuche
Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button2.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.parcel_small1 Me.Button2.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.parcel_small1
Me.Button2.ImageAlign = System.Drawing.ContentAlignment.TopLeft Me.Button2.ImageAlign = System.Drawing.ContentAlignment.TopLeft
Me.Button2.Location = New System.Drawing.Point(257, 16) Me.Button2.Location = New System.Drawing.Point(495, 15)
Me.Button2.Name = "Button2" Me.Button2.Name = "Button2"
Me.Button2.Size = New System.Drawing.Size(90, 46) Me.Button2.Size = New System.Drawing.Size(90, 46)
Me.Button2.TabIndex = 128 Me.Button2.TabIndex = 128
@@ -271,7 +271,7 @@ Partial Class frmMitarbeitersuche
Me.Label12.AutoSize = True Me.Label12.AutoSize = True
Me.Label12.BackColor = System.Drawing.Color.Transparent Me.Label12.BackColor = System.Drawing.Color.Transparent
Me.Label12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Underline) Me.Label12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Underline)
Me.Label12.Location = New System.Drawing.Point(145, 2) Me.Label12.Location = New System.Drawing.Point(138, 2)
Me.Label12.Name = "Label12" Me.Label12.Name = "Label12"
Me.Label12.Size = New System.Drawing.Size(117, 13) Me.Label12.Size = New System.Drawing.Size(117, 13)
Me.Label12.TabIndex = 127 Me.Label12.TabIndex = 127
@@ -312,7 +312,7 @@ Partial Class frmMitarbeitersuche
Me.btnZEGehen.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnZEGehen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnZEGehen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_gehen Me.btnZEGehen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_gehen
Me.btnZEGehen.ImageAlign = System.Drawing.ContentAlignment.TopRight Me.btnZEGehen.ImageAlign = System.Drawing.ContentAlignment.TopRight
Me.btnZEGehen.Location = New System.Drawing.Point(463, 16) Me.btnZEGehen.Location = New System.Drawing.Point(382, 16)
Me.btnZEGehen.Name = "btnZEGehen" Me.btnZEGehen.Name = "btnZEGehen"
Me.btnZEGehen.Size = New System.Drawing.Size(107, 45) Me.btnZEGehen.Size = New System.Drawing.Size(107, 45)
Me.btnZEGehen.TabIndex = 124 Me.btnZEGehen.TabIndex = 124
@@ -327,7 +327,7 @@ Partial Class frmMitarbeitersuche
Me.btnZEKommen.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnZEKommen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnZEKommen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_kommen Me.btnZEKommen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_kommen
Me.btnZEKommen.ImageAlign = System.Drawing.ContentAlignment.TopLeft Me.btnZEKommen.ImageAlign = System.Drawing.ContentAlignment.TopLeft
Me.btnZEKommen.Location = New System.Drawing.Point(351, 16) Me.btnZEKommen.Location = New System.Drawing.Point(270, 16)
Me.btnZEKommen.Name = "btnZEKommen" Me.btnZEKommen.Name = "btnZEKommen"
Me.btnZEKommen.Size = New System.Drawing.Size(106, 45) Me.btnZEKommen.Size = New System.Drawing.Size(106, 45)
Me.btnZEKommen.TabIndex = 123 Me.btnZEKommen.TabIndex = 123
@@ -338,16 +338,16 @@ Partial Class frmMitarbeitersuche
'lblTimasSaldo 'lblTimasSaldo
' '
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.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.Location = New System.Drawing.Point(138, 21)
Me.lblTimasSaldo.Name = "lblTimasSaldo" Me.lblTimasSaldo.Name = "lblTimasSaldo"
Me.lblTimasSaldo.Size = New System.Drawing.Size(103, 24) Me.lblTimasSaldo.Size = New System.Drawing.Size(103, 43)
Me.lblTimasSaldo.TabIndex = 30 Me.lblTimasSaldo.TabIndex = 30
' '
'cbxHomeoffice 'cbxHomeoffice
' '
Me.cbxHomeoffice.AutoSize = True Me.cbxHomeoffice.AutoSize = True
Me.cbxHomeoffice.ForeColor = System.Drawing.Color.Black Me.cbxHomeoffice.ForeColor = System.Drawing.Color.Black
Me.cbxHomeoffice.Location = New System.Drawing.Point(351, 1) Me.cbxHomeoffice.Location = New System.Drawing.Point(270, 1)
Me.cbxHomeoffice.Name = "cbxHomeoffice" Me.cbxHomeoffice.Name = "cbxHomeoffice"
Me.cbxHomeoffice.Size = New System.Drawing.Size(80, 17) Me.cbxHomeoffice.Size = New System.Drawing.Size(80, 17)
Me.cbxHomeoffice.TabIndex = 125 Me.cbxHomeoffice.TabIndex = 125

2
VERAG_PROG_ALLGEMEIN/frmErrorMeldung.vb
View File

@@ -39,7 +39,7 @@ Public Class frmErrorMeldung
End If End If
Dim Mail_To = "al@verag.ag" Dim Mail_To = "support@verag.ag"
Dim Mail_Text = "" Dim Mail_Text = ""
Mail_Text &= "User: " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & " (" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & ")" & "<br>" Mail_Text &= "User: " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & " (" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & ")" & "<br>"