diff --git a/Aviso/Anhänge/frmSendungAnhangImport.vb b/Aviso/Anhänge/frmSendungAnhangImport.vb index 7fe418b..ca189a2 100644 --- a/Aviso/Anhänge/frmSendungAnhangImport.vb +++ b/Aviso/Anhänge/frmSendungAnhangImport.vb @@ -160,6 +160,7 @@ Public Class frmSendungAnhangImport Function getPDFSplitName(FILE_NAME) getPDFSplitName = FILE_NAME If txtBezeichnung.Text <> "" Then + txtBezeichnung.Text = txtBezeichnung.Text.Replace("/", "-").Replace("\", "-").Replace(":", "-").Replace("*", "-").Replace("?", "-").Replace("|", "-").Replace("<", "-").Replace(">", "-") getPDFSplitName = txtBezeichnung.Text End If @@ -168,6 +169,7 @@ Public Class frmSendungAnhangImport End If End Function + Dim tmpPageMove = 0 Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnAnfuegen.Click If txtSeiten.Text = "" Then Exit Sub diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index d9c76d8..8a37aa9 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -1064,6 +1064,8 @@ + + Always diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 17d1b73..ed7015e 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/My Project/Resources.Designer.vb b/Aviso/My Project/Resources.Designer.vb index 85feae1..82648dd 100644 --- a/Aviso/My Project/Resources.Designer.vb +++ b/Aviso/My Project/Resources.Designer.vb @@ -199,6 +199,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die ähnelt. + ''' + Friend ReadOnly Property asdasd3dsasdasdasd() As String + Get + Return ResourceManager.GetString("asdasd3dsasdasdasd", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -489,6 +498,26 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property fakturiertAktiv() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("fakturiertAktiv", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property fakturiertInaktiv() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("fakturiertInaktiv", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -1319,7 +1348,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die 3.4.5.4 ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die 3.4.6.3 ähnelt. ''' Friend ReadOnly Property Version() As String Get diff --git a/Aviso/My Project/Resources.resx b/Aviso/My Project/Resources.resx index f2608aa..07588a8 100644 --- a/Aviso/My Project/Resources.resx +++ b/Aviso/My Project/Resources.resx @@ -344,7 +344,7 @@ ..\Resources\akt_ATILLA.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - 3.4.5.4 + 3.4.6.3 ..\Resources\Verag-AG-Logopng.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -553,4 +553,13 @@ ..\Resources\weiterleiten_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\fakturiertAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\fakturiertInaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + + \ No newline at end of file diff --git a/Aviso/Resources/fakturiertAktiv.jpg b/Aviso/Resources/fakturiertAktiv.jpg new file mode 100644 index 0000000..5d62165 Binary files /dev/null and b/Aviso/Resources/fakturiertAktiv.jpg differ diff --git a/Aviso/Resources/fakturiertInaktiv.jpg b/Aviso/Resources/fakturiertInaktiv.jpg new file mode 100644 index 0000000..7b3d562 Binary files /dev/null and b/Aviso/Resources/fakturiertInaktiv.jpg differ diff --git a/Aviso/frmAvisoWeiterleiten.vb b/Aviso/frmAvisoWeiterleiten.vb index 3e2b665..bdb69df 100644 --- a/Aviso/frmAvisoWeiterleiten.vb +++ b/Aviso/frmAvisoWeiterleiten.vb @@ -95,12 +95,12 @@ Public Class frmAvisoWeiterleiten End Sub - Sub btnWeiterleitung_Clicked(WLart As String, id As String, bezeichnung As String) + Sub btnWeiterleitung_Clicked(WLart As String, id As String, bezeichnung As String, Optional bezeichnungFirma As String = "") Dim text = "" Dim code = 3 Select Case WLart Case "T" - text = "Ins Team '" & bezeichnung & "' gegeben." + text = "Ins Team '" & bezeichnung & "' [" & bezeichnungFirma & "] gegeben." Case "A" text = "An '" & bezeichnung & "' gegeben." Case "N" @@ -159,7 +159,7 @@ Public Class frmAvisoWeiterleiten ' initButtons(sender) 'End Sub - Sub addBtn(flpFirma As FlowLayoutPanel, WLart As String, id As String, bezeichnung As String, Optional enabled As Boolean = True) + Sub addBtn(flpFirma As FlowLayoutPanel, WLart As String, id As String, bezeichnung As String, Optional enabled As Boolean = True, Optional bezeichnungFirma As String = "") Dim btn As New Button btn.FlatStyle = FlatStyle.Flat btn.Size = New Size(180, 40) @@ -169,7 +169,7 @@ Public Class frmAvisoWeiterleiten btn.Enabled = enabled AddHandler btn.Click, Sub() - btnWeiterleitung_Clicked(WLart, (btn.Tag), bezeichnung) + btnWeiterleitung_Clicked(WLart, (btn.Tag), bezeichnung, bezeichnungFirma) initButtons(flpFirma, btn) End Sub @@ -216,7 +216,7 @@ Public Class frmAvisoWeiterleiten Dim dt As DataTable = SQL.loadDgvBySql("SELECT team_id, team_bezeichnung FROM tblTeams WHERE team_firma='VERAG' order by team_id", "ADMIN") If dt IsNot Nothing Then For Each t In dt.Rows - addBtn(flpTeams, "T", t("team_id"), t("team_bezeichnung")) + addBtn(flpTeams, "T", t("team_id"), t("team_bezeichnung"),, "VERAG") Next End If ElseIf sender Is btnIMEX Then @@ -225,7 +225,7 @@ Public Class frmAvisoWeiterleiten Dim dt As DataTable = SQL.loadDgvBySql("SELECT team_id, team_bezeichnung FROM tblTeams WHERE team_firma='IMEX' order by team_id", "ADMIN") If dt IsNot Nothing Then For Each t In dt.Rows - addBtn(flpTeams, "T", t("team_id"), t("team_bezeichnung")) + addBtn(flpTeams, "T", t("team_id"), t("team_bezeichnung"),, "IMEX") Next End If ElseIf sender Is btnUNIPED Then @@ -288,7 +288,7 @@ Public Class frmAvisoWeiterleiten Private Sub btnTeam_Click(sender As Object, e As EventArgs) Handles btnTeam.Click If dgvMitarbeiter.SelectedRows.Count > 0 Then If dgvMitarbeiter.SelectedRows(0).Cells("mit_teamId").Value IsNot DBNull.Value AndAlso dgvMitarbeiter.SelectedRows(0).Cells("mit_teamId").Value > 0 Then - btnWeiterleitung_Clicked("T", dgvMitarbeiter.SelectedRows(0).Cells("mit_teamId").Value, dgvMitarbeiter.SelectedRows(0).Cells("Team").Value) + btnWeiterleitung_Clicked("T", dgvMitarbeiter.SelectedRows(0).Cells("mit_teamId").Value, dgvMitarbeiter.SelectedRows(0).Cells("Team").Value, dgvMitarbeiter.SelectedRows(0).Cells("mit_firma").Value) End If End If End Sub diff --git a/Aviso/frmHauptfenster.Designer.vb b/Aviso/frmHauptfenster.Designer.vb index 2c0a846..f5efeac 100644 --- a/Aviso/frmHauptfenster.Designer.vb +++ b/Aviso/frmHauptfenster.Designer.vb @@ -181,13 +181,14 @@ Partial Class frmHauptfenster Me.lblSuche = New System.Windows.Forms.Label() Me.SplitContainer2 = New System.Windows.Forms.SplitContainer() Me.pnlLinks = New System.Windows.Forms.Panel() + Me.Panel2 = New System.Windows.Forms.Panel() + Me.Label7 = New System.Windows.Forms.Label() Me.lblErrVermerk = New System.Windows.Forms.Label() + Me.lblHinweis = New System.Windows.Forms.Label() Me.Label20 = New System.Windows.Forms.Label() Me.picAVISOMessenger = New System.Windows.Forms.PictureBox() - Me.pic = New System.Windows.Forms.PictureBox() - Me.lblHinweis = New System.Windows.Forms.Label() - Me.Label7 = New System.Windows.Forms.Label() Me.lblVersion = New System.Windows.Forms.Label() + Me.pic = New System.Windows.Forms.PictureBox() Me.pnlLinksOben = New System.Windows.Forms.Panel() Me.btnNeu = New System.Windows.Forms.Button() Me.SplitContainer3 = New System.Windows.Forms.SplitContainer() @@ -275,6 +276,7 @@ Partial Class frmHauptfenster Me.EUTaricToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components) Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem() + Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripMenuItem() Me.conMenuAviso.SuspendLayout() Me.MenuStrip1.SuspendLayout() Me.Top.SuspendLayout() @@ -283,6 +285,7 @@ Partial Class frmHauptfenster Me.SplitContainer2.Panel2.SuspendLayout() Me.SplitContainer2.SuspendLayout() Me.pnlLinks.SuspendLayout() + Me.Panel2.SuspendLayout() CType(Me.picAVISOMessenger, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() Me.pnlLinksOben.SuspendLayout() @@ -597,7 +600,7 @@ Partial Class frmHauptfenster ' 'FunktionenToolStripMenuItem ' - Me.FunktionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GenerelleGestellungenDurchsuchenToolStripMenuItem, Me.KundenVonFremdenSpeditionenToolStripMenuItem, Me.KundenverwaltungToolStripMenuItem, Me.MDMParkplatzkartenToolStripMenuItem, Me.SMSSendenToolStripMenuItem, Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem, Me.ToolStripSeparator12, Me.ToolStripMenuItem3, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.BürgschaftenExcelToolStripMenuItem, Me.ToolStripMenuItem10, Me.TICKETWaidhausToolStripMenuItem, Me.ToolStripSeparator10, Me.DAKOSYToolStripMenuItem, Me.ToolStripSeparator11, Me.SDLAbholaufträgeToolStripMenuItem, Me.ToolStripMenuItem13, Me.VorauskassenToolStripMenuItem}) + Me.FunktionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GenerelleGestellungenDurchsuchenToolStripMenuItem, Me.KundenVonFremdenSpeditionenToolStripMenuItem, Me.KundenverwaltungToolStripMenuItem, Me.MDMParkplatzkartenToolStripMenuItem, Me.SMSSendenToolStripMenuItem, Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem, Me.ToolStripSeparator12, Me.ToolStripMenuItem3, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.BürgschaftenExcelToolStripMenuItem, Me.ToolStripMenuItem6, Me.ToolStripMenuItem10, Me.TICKETWaidhausToolStripMenuItem, Me.ToolStripSeparator10, Me.DAKOSYToolStripMenuItem, Me.ToolStripSeparator11, Me.SDLAbholaufträgeToolStripMenuItem, Me.ToolStripMenuItem13, Me.VorauskassenToolStripMenuItem}) Me.FunktionenToolStripMenuItem.Name = "FunktionenToolStripMenuItem" Me.FunktionenToolStripMenuItem.Size = New System.Drawing.Size(79, 20) Me.FunktionenToolStripMenuItem.Text = "Funktionen" @@ -1313,7 +1316,7 @@ Partial Class frmHauptfenster Me.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button7.ForeColor = System.Drawing.Color.Black Me.Button7.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button7.Location = New System.Drawing.Point(2, 19) + Me.Button7.Location = New System.Drawing.Point(5, 21) Me.Button7.Name = "Button7" Me.Button7.Size = New System.Drawing.Size(121, 33) Me.Button7.TabIndex = 2 @@ -1328,7 +1331,7 @@ Partial Class frmHauptfenster Me.Button1.ForeColor = System.Drawing.Color.Black Me.Button1.Image = CType(resources.GetObject("Button1.Image"), System.Drawing.Image) Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button1.Location = New System.Drawing.Point(2, 55) + Me.Button1.Location = New System.Drawing.Point(5, 57) Me.Button1.Name = "Button1" Me.Button1.Size = New System.Drawing.Size(121, 33) Me.Button1.TabIndex = 0 @@ -1517,41 +1520,72 @@ Partial Class frmHauptfenster Me.SplitContainer2.Panel2.Controls.Add(Me.SplitContainer3) Me.SplitContainer2.Panel2MinSize = 650 Me.SplitContainer2.Size = New System.Drawing.Size(885, 298) - Me.SplitContainer2.SplitterDistance = 230 + Me.SplitContainer2.SplitterDistance = 234 Me.SplitContainer2.SplitterWidth = 1 Me.SplitContainer2.TabIndex = 0 ' 'pnlLinks ' - Me.pnlLinks.Controls.Add(Me.lblErrVermerk) + Me.pnlLinks.Controls.Add(Me.Panel2) Me.pnlLinks.Controls.Add(Me.Label20) Me.pnlLinks.Controls.Add(Me.picAVISOMessenger) - Me.pnlLinks.Controls.Add(Me.pic) - Me.pnlLinks.Controls.Add(Me.lblHinweis) - Me.pnlLinks.Controls.Add(Me.Label7) - Me.pnlLinks.Controls.Add(Me.Button1) - Me.pnlLinks.Controls.Add(Me.Button7) Me.pnlLinks.Controls.Add(Me.lblVersion) + Me.pnlLinks.Controls.Add(Me.pic) Me.pnlLinks.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlLinks.Location = New System.Drawing.Point(0, 43) Me.pnlLinks.Name = "pnlLinks" - Me.pnlLinks.Size = New System.Drawing.Size(230, 255) + Me.pnlLinks.Size = New System.Drawing.Size(234, 255) Me.pnlLinks.TabIndex = 0 ' + 'Panel2 + ' + Me.Panel2.Controls.Add(Me.Label7) + Me.Panel2.Controls.Add(Me.lblErrVermerk) + Me.Panel2.Controls.Add(Me.Button7) + Me.Panel2.Controls.Add(Me.Button1) + Me.Panel2.Controls.Add(Me.lblHinweis) + Me.Panel2.Dock = System.Windows.Forms.DockStyle.Top + Me.Panel2.Location = New System.Drawing.Point(0, 0) + Me.Panel2.Name = "Panel2" + Me.Panel2.Size = New System.Drawing.Size(234, 169) + Me.Panel2.TabIndex = 10 + ' + 'Label7 + ' + Me.Label7.AutoSize = True + Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label7.ForeColor = System.Drawing.Color.Black + Me.Label7.Location = New System.Drawing.Point(6, 5) + Me.Label7.Name = "Label7" + Me.Label7.Size = New System.Drawing.Size(41, 13) + Me.Label7.TabIndex = 3 + Me.Label7.Text = "Links:" + ' 'lblErrVermerk ' Me.lblErrVermerk.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblErrVermerk.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) Me.lblErrVermerk.ForeColor = System.Drawing.Color.Red - Me.lblErrVermerk.Location = New System.Drawing.Point(2, 95) + Me.lblErrVermerk.Location = New System.Drawing.Point(12, 216) Me.lblErrVermerk.Name = "lblErrVermerk" - Me.lblErrVermerk.Size = New System.Drawing.Size(205, 27) + Me.lblErrVermerk.Size = New System.Drawing.Size(208, 27) Me.lblErrVermerk.TabIndex = 1 Me.lblErrVermerk.Text = "Bei diesem Status kann kein Vermerk erfasst werden!" Me.lblErrVermerk.TextAlign = System.Drawing.ContentAlignment.BottomLeft Me.lblErrVermerk.Visible = False ' + 'lblHinweis + ' + Me.lblHinweis.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblHinweis.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.lblHinweis.Location = New System.Drawing.Point(5, 93) + Me.lblHinweis.Name = "lblHinweis" + Me.lblHinweis.Size = New System.Drawing.Size(129, 16) + Me.lblHinweis.TabIndex = 4 + Me.lblHinweis.Text = "Hinweis eingetragen" + Me.lblHinweis.Visible = False + ' 'Label20 ' Me.Label20.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) @@ -1579,39 +1613,6 @@ Partial Class frmHauptfenster Me.picAVISOMessenger.TabStop = False Me.picAVISOMessenger.Visible = False ' - 'pic - ' - Me.pic.BackgroundImage = Global.AVISO.My.Resources.Resources.disconnect - Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.pic.Location = New System.Drawing.Point(7, 95) - Me.pic.Name = "pic" - Me.pic.Size = New System.Drawing.Size(59, 50) - Me.pic.TabIndex = 5 - Me.pic.TabStop = False - Me.pic.Visible = False - ' - 'lblHinweis - ' - Me.lblHinweis.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblHinweis.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.lblHinweis.Location = New System.Drawing.Point(2, 148) - Me.lblHinweis.Name = "lblHinweis" - Me.lblHinweis.Size = New System.Drawing.Size(129, 16) - Me.lblHinweis.TabIndex = 4 - Me.lblHinweis.Text = "Hinweis eingetragen" - Me.lblHinweis.Visible = False - ' - 'Label7 - ' - Me.Label7.AutoSize = True - Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label7.ForeColor = System.Drawing.Color.Black - Me.Label7.Location = New System.Drawing.Point(3, 3) - Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(41, 13) - Me.Label7.TabIndex = 3 - Me.Label7.Text = "Links:" - ' 'lblVersion ' Me.lblVersion.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) @@ -1624,13 +1625,24 @@ Partial Class frmHauptfenster Me.lblVersion.TabIndex = 6 Me.lblVersion.Text = "V1.0.0.0" ' + 'pic + ' + Me.pic.BackgroundImage = Global.AVISO.My.Resources.Resources.disconnect + Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.pic.Location = New System.Drawing.Point(169, 192) + Me.pic.Name = "pic" + Me.pic.Size = New System.Drawing.Size(59, 50) + Me.pic.TabIndex = 5 + Me.pic.TabStop = False + Me.pic.Visible = False + ' 'pnlLinksOben ' Me.pnlLinksOben.Controls.Add(Me.btnNeu) Me.pnlLinksOben.Dock = System.Windows.Forms.DockStyle.Top Me.pnlLinksOben.Location = New System.Drawing.Point(0, 0) Me.pnlLinksOben.Name = "pnlLinksOben" - Me.pnlLinksOben.Size = New System.Drawing.Size(230, 43) + Me.pnlLinksOben.Size = New System.Drawing.Size(234, 43) Me.pnlLinksOben.TabIndex = 1 ' 'btnNeu @@ -1662,8 +1674,8 @@ Partial Class frmHauptfenster 'SplitContainer3.Panel2 ' Me.SplitContainer3.Panel2.Controls.Add(Me.pnl) - Me.SplitContainer3.Size = New System.Drawing.Size(654, 298) - Me.SplitContainer3.SplitterDistance = 166 + Me.SplitContainer3.Size = New System.Drawing.Size(650, 298) + Me.SplitContainer3.SplitterDistance = 164 Me.SplitContainer3.TabIndex = 3 ' 'UsrCntlBenachrichtigungen1 @@ -1671,7 +1683,7 @@ Partial Class frmHauptfenster Me.UsrCntlBenachrichtigungen1.Dock = System.Windows.Forms.DockStyle.Fill Me.UsrCntlBenachrichtigungen1.Location = New System.Drawing.Point(0, 0) Me.UsrCntlBenachrichtigungen1.Name = "UsrCntlBenachrichtigungen1" - Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(166, 298) + Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(164, 298) Me.UsrCntlBenachrichtigungen1.TabIndex = 0 ' 'pnl @@ -1682,7 +1694,7 @@ Partial Class frmHauptfenster Me.pnl.Dock = System.Windows.Forms.DockStyle.Fill Me.pnl.Location = New System.Drawing.Point(0, 0) Me.pnl.Name = "pnl" - Me.pnl.Size = New System.Drawing.Size(484, 298) + Me.pnl.Size = New System.Drawing.Size(482, 298) Me.pnl.TabIndex = 0 ' 'Button10 @@ -1715,7 +1727,7 @@ Partial Class frmHauptfenster Me.gridMyAviso.Name = "gridMyAviso" Me.gridMyAviso.ReadOnly = True Me.gridMyAviso.RowHeadersVisible = False - Me.gridMyAviso.Size = New System.Drawing.Size(484, 277) + Me.gridMyAviso.Size = New System.Drawing.Size(482, 277) Me.gridMyAviso.TabIndex = 0 ' 'Panel6 @@ -1733,7 +1745,7 @@ Partial Class frmHauptfenster Me.Panel6.Dock = System.Windows.Forms.DockStyle.Top Me.Panel6.Location = New System.Drawing.Point(0, 0) Me.Panel6.Name = "Panel6" - Me.Panel6.Size = New System.Drawing.Size(484, 21) + Me.Panel6.Size = New System.Drawing.Size(482, 21) Me.Panel6.TabIndex = 1 ' 'lblMeineAviso @@ -1758,7 +1770,7 @@ Partial Class frmHauptfenster Me.cboMy_Grenzstelle.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.cboMy_Grenzstelle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.cboMy_Grenzstelle.FormattingEnabled = True - Me.cboMy_Grenzstelle.Location = New System.Drawing.Point(165, 1) + Me.cboMy_Grenzstelle.Location = New System.Drawing.Point(163, 1) Me.cboMy_Grenzstelle.Name = "cboMy_Grenzstelle" Me.cboMy_Grenzstelle.Size = New System.Drawing.Size(64, 21) Me.cboMy_Grenzstelle.TabIndex = 26 @@ -1768,7 +1780,7 @@ Partial Class frmHauptfenster Me.Label18.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label18.AutoSize = True Me.Label18.ForeColor = System.Drawing.Color.White - Me.Label18.Location = New System.Drawing.Point(97, 4) + Me.Label18.Location = New System.Drawing.Point(95, 4) Me.Label18.Name = "Label18" Me.Label18.Size = New System.Drawing.Size(62, 13) Me.Label18.TabIndex = 25 @@ -1779,7 +1791,7 @@ Partial Class frmHauptfenster Me.cbx_My_LKW.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.cbx_My_LKW.AutoSize = True Me.cbx_My_LKW.ForeColor = System.Drawing.Color.White - Me.cbx_My_LKW.Location = New System.Drawing.Point(41, 3) + Me.cbx_My_LKW.Location = New System.Drawing.Point(39, 3) Me.cbx_My_LKW.Name = "cbx_My_LKW" Me.cbx_My_LKW.Size = New System.Drawing.Size(50, 17) Me.cbx_My_LKW.TabIndex = 24 @@ -1793,7 +1805,7 @@ Partial Class frmHauptfenster Me.cboMy_QS.Checked = True Me.cboMy_QS.CheckState = System.Windows.Forms.CheckState.Indeterminate Me.cboMy_QS.ForeColor = System.Drawing.Color.White - Me.cboMy_QS.Location = New System.Drawing.Point(427, 3) + Me.cboMy_QS.Location = New System.Drawing.Point(425, 3) Me.cboMy_QS.Name = "cboMy_QS" Me.cboMy_QS.Size = New System.Drawing.Size(15, 14) Me.cboMy_QS.TabIndex = 23 @@ -1807,7 +1819,7 @@ Partial Class frmHauptfenster Me.cboMy_VB.Checked = True Me.cboMy_VB.CheckState = System.Windows.Forms.CheckState.Indeterminate Me.cboMy_VB.ForeColor = System.Drawing.Color.White - Me.cboMy_VB.Location = New System.Drawing.Point(448, 3) + Me.cboMy_VB.Location = New System.Drawing.Point(446, 3) Me.cboMy_VB.Name = "cboMy_VB" Me.cboMy_VB.Size = New System.Drawing.Size(15, 14) Me.cboMy_VB.TabIndex = 22 @@ -1825,7 +1837,7 @@ Partial Class frmHauptfenster Me.cboMyAvisoAnzeige.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.cboMyAvisoAnzeige.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.cboMyAvisoAnzeige.FormattingEnabled = True - Me.cboMyAvisoAnzeige.Location = New System.Drawing.Point(284, 1) + Me.cboMyAvisoAnzeige.Location = New System.Drawing.Point(282, 1) Me.cboMyAvisoAnzeige.Name = "cboMyAvisoAnzeige" Me.cboMyAvisoAnzeige.Size = New System.Drawing.Size(127, 21) Me.cboMyAvisoAnzeige.TabIndex = 21 @@ -1835,7 +1847,7 @@ Partial Class frmHauptfenster Me.Label17.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label17.AutoSize = True Me.Label17.ForeColor = System.Drawing.Color.White - Me.Label17.Location = New System.Drawing.Point(235, 3) + Me.Label17.Location = New System.Drawing.Point(233, 3) Me.Label17.Name = "Label17" Me.Label17.Size = New System.Drawing.Size(48, 13) Me.Label17.TabIndex = 20 @@ -1845,7 +1857,7 @@ Partial Class frmHauptfenster ' Me.lblAkte.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAkte.ForeColor = System.Drawing.Color.White - Me.lblAkte.Location = New System.Drawing.Point(813, 6) + Me.lblAkte.Location = New System.Drawing.Point(811, 6) Me.lblAkte.Name = "lblAkte" Me.lblAkte.Size = New System.Drawing.Size(207, 19) Me.lblAkte.TabIndex = 1 @@ -2725,6 +2737,13 @@ Partial Class frmHauptfenster Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28) Me.UsrCntlTestsystem1.TabIndex = 8 ' + 'ToolStripMenuItem6 + ' + Me.ToolStripMenuItem6.Name = "ToolStripMenuItem6" + Me.ToolStripMenuItem6.Size = New System.Drawing.Size(383, 22) + Me.ToolStripMenuItem6.Text = "AT | Gesamtsicherheit IMEX Customs Service GmbH - Excel" + Me.ToolStripMenuItem6.Visible = False + ' 'frmHauptfenster ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -2759,6 +2778,8 @@ Partial Class frmHauptfenster Me.SplitContainer2.ResumeLayout(False) Me.pnlLinks.ResumeLayout(False) Me.pnlLinks.PerformLayout() + Me.Panel2.ResumeLayout(False) + Me.Panel2.PerformLayout() CType(Me.picAVISOMessenger, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit() Me.pnlLinksOben.ResumeLayout(False) @@ -3040,4 +3061,6 @@ Partial Class frmHauptfenster Friend WithEvents Panel1 As Panel Friend WithEvents UsrCntlBenachrichtigungen1 As usrCntlBenachrichtigungen Friend WithEvents Button10 As Button + Friend WithEvents Panel2 As Panel + Friend WithEvents ToolStripMenuItem6 As ToolStripMenuItem End Class diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index 0d92a5b..af2ce56 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -2212,7 +2212,7 @@ Public Class frmHauptfenster Button6.Visible = False tbcntrAviso.TabPages.RemoveAt(2) btnWichtigeStandort.Visible = False - pnlLinks.Visible = False + Panel2.Visible = False Label4.Visible = False cboGrenzstelle.Visible = False BürgschaftenExcelToolStripMenuItem.Visible = True @@ -2222,10 +2222,12 @@ Public Class frmHauptfenster 'btnGenerelleGestellungen.Visible = False ToolStripMenuItem4.Visible = True ToolStripMenuItem5.Visible = True + ToolStripMenuItem6.Visible = True Else 'VERAG BürgschaftenExcelToolStripMenuItem.Visible = True ToolStripMenuItem4.Visible = True ToolStripMenuItem5.Visible = True + ToolStripMenuItem6.Visible = True If VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG = "WAI" Then Button5.Visible = True End If @@ -2406,6 +2408,8 @@ Public Class frmHauptfenster Dim tmpY As Integer = Me.Height + If tmpY <= 0 Then tmpY = My.Computer.Screen.WorkingArea.Height + For Each ft As Form In Application.OpenForms If ft.GetType.ToString = "AVISO.frmNotify" Then If ft.Location.Y < tmpY Then tmpY = ft.Location.Y @@ -2960,7 +2964,7 @@ Public Class frmHauptfenster End Sub Private Sub LeereRechnungToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles LeereRechnungToolStripMenuItem.Click - Dim f As New SDL.frmAbrechnungsMaskeEinzeln + Dim f As New SDL.frmAbrechnungsMaskeEinzeln(-1, -1) f.Show(Me) End Sub @@ -3376,6 +3380,12 @@ Public Class frmHauptfenster SplitContainer3.Panel1Collapsed = Not SplitContainer3.Panel1Collapsed Button10.Text = If(Button10.Text = "<", ">", "<") End Sub + + Private Sub ToolStripMenuItem6_Click_1(sender As Object, e As EventArgs) Handles ToolStripMenuItem6.Click + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", "IMEX", "", "Gesamtsicherheit_IMEX") + 'MsgBox(DS.da_id) + DS.OPEN_SINGLE_ORIG() + End Sub End Class Public Class AvisoStatusFunctions @@ -4725,6 +4735,29 @@ Public Class AvisoStatusFunctions End Function + Public Function setSendungFakturiert(SendungsId, AvisoID) As Boolean + + If SendungsId Is Nothing Then Return False + If Not IsNumeric(SendungsId) Then Return False + If AvisoID Is Nothing Then Return False + If Not IsNumeric(AvisoID) Then Return False + + Dim SENDUNG_TMP = New VERAG_PROG_ALLGEMEIN.cSendungen(SendungsId) + + SENDUNG_TMP.saveSachbearbeiter = False + + If SENDUNG_TMP.tblSnd_Fakturiert Is Nothing Then + + SENDUNG_TMP.tblSnd_Fakturiert = Now 'SENDUNG_TMP.tblSnd_Status=VERAG_PROG_ALLGEMEIN.vor ' Status macht keinen Sinn.. + AvisoDAL.addAenderung(AvisoID, "Sendung auf FAKTURIERT gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf FAKTURIERT gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm")) + Else + SENDUNG_TMP.tblSnd_Fakturiert = Nothing + AvisoDAL.addAenderung(AvisoID, "Sendung auf NICHT FAKTURIERT gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf NICHT FAKTURIERT gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm")) + End If + Return SENDUNG_TMP.SAVE() + + End Function + Public Function openSnd(sendId, AvisoID) As Form If sendId Is Nothing Then Return Nothing @@ -4980,7 +5013,7 @@ Public Class AvisoStatusFunctions Dim found = False Select Case s.tblSnd_Abfertigungsart_ID Case 5, 6, 18, 24, 32, 33, 34, 37, 40 - getDataFronDY_NCTS(s.tblSnd_SendungID, AtcMrn, frist, DsId, s.FilialenNr, s.AbfertigungsNr, s.tblSnd_Abfertigungsart_ID, s.tblSnd_DakosyRef) + getDataFronDY_NCTS(s.tblSnd_SendungID, AtcMrn, frist, DsId, s.FilialenNr, s.AbfertigungsNr, s.tblSnd_Abfertigungsart_ID, s.tblSnd_DakosyRef) If KUNDE_ERW.EmailFreigabe_VBDPDF And IsNumeric(DsId) Then 'VBD anhängen Try Dim PathTmp = (New VERAG_PROG_ALLGEMEIN.cDATENSERVER(DsId)).GET_TOP1_PATH(False) @@ -5008,11 +5041,11 @@ Public Class AvisoStatusFunctions Try If IsNumeric(DsId) Then Dim PathTmp = (New VERAG_PROG_ALLGEMEIN.cDATENSERVER(DsId)).GET_TOP1_PATH(False) - anhaenge.Add(PathTmp) : found = True + If PathTmp <> "" Then anhaenge.Add(PathTmp) : found = True End If If IsNumeric(DsId) Then Dim PathTmp2 = (New VERAG_PROG_ALLGEMEIN.cDATENSERVER(DsId2)).GET_TOP1_PATH(False) - anhaenge.Add(PathTmp2) : found = True + If PathTmp2 <> "" Then anhaenge.Add(PathTmp2) : found = True End If Catch ex As Exception : MsgBox(ex.Message & ex.StackTrace) : End Try If Not found Then diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index c3cad98..b09a799 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -401,7 +401,7 @@ Public Class usrcntlAktDetails With dgvSendungen ' Dim selRow = If(.SelectedRows.Count > 0, .SelectedRows(0).Index, -1) .Columns.Clear() - .DataSource = AvisoDAL.loadDataTableBySQL(" SELECT FilialenNr ,/*rank() OVER (ORDER BY tblSnd_PosUnterNr) as */ tblSnd_PosUnterNr, [tblSnd_SendungID],[tblSnd_AvisoID],[tblSnd_Abfertigungsart_ID],[tblSnd_EmpfaengerKdNr],[tblSnd_Empfaenger],isnull(cast(FilialenNr as varchar (4)),'')+'/' + isnull(cast(AbfertigungsNr as varchar (8)),'') as AbfertigungsNr,(SELECT (CASE WHEN Count(*)>0 THEN cast(COUNT(*) as varchar(4)) ELSE '-' END) FROM Vermerke WHERE AvisoID=" & AvisoID & " AND SendungID=tblSnd_SendungID) as Vermerke, tblSnd_SpeditionsbuchEingetragen,tblSnd_Fremdspedition,tblSnd_FremdspeditionText,isnull(tblSnd_QS_MA,-1) as tblSnd_QS_MA,tblSnd_Vorbereitet,tblSnd_Vorgeschrieben,LetzterMitarbeiterId,tblSnd_VG_MA,LetzterMitarbeiter,tblSnd_BARzuKassieren " & + .DataSource = AvisoDAL.loadDataTableBySQL(" SELECT FilialenNr ,/*rank() OVER (ORDER BY tblSnd_PosUnterNr) as */ tblSnd_PosUnterNr, [tblSnd_SendungID],[tblSnd_AvisoID],[tblSnd_Abfertigungsart_ID],[tblSnd_EmpfaengerKdNr],[tblSnd_Empfaenger],isnull(cast(FilialenNr as varchar (4)),'')+'/' + isnull(cast(AbfertigungsNr as varchar (8)),'') as AbfertigungsNr,(SELECT (CASE WHEN Count(*)>0 THEN cast(COUNT(*) as varchar(4)) ELSE '-' END) FROM Vermerke WHERE AvisoID=" & AvisoID & " AND SendungID=tblSnd_SendungID) as Vermerke, tblSnd_SpeditionsbuchEingetragen,tblSnd_Fremdspedition,tblSnd_FremdspeditionText,isnull(tblSnd_QS_MA,-1) as tblSnd_QS_MA,tblSnd_Vorbereitet,tblSnd_Vorgeschrieben,LetzterMitarbeiterId,tblSnd_VG_MA,LetzterMitarbeiter,tblSnd_BARzuKassieren,tblSnd_Fakturiert, AbfertigungsNr as AbfertigungsNr2 " & " FROM tblSendungen WHERE tblSnd_AvisoId=" & AvisoID & " ORDER BY tblSnd_PosUnterNr") 'LEFT JOIN tblQS_Abfertigungsarten ON [tblSnd_Abfertigungsart_ID]=QS_Abfertigungsart_ID ' If .RowCount = 0 Then .Columns.Clear() : Exit Sub @@ -421,6 +421,8 @@ Public Class usrcntlAktDetails .Columns("LetzterMitarbeiterId").Visible = False .Columns("tblSnd_VG_MA").Visible = False .Columns("tblSnd_BARzuKassieren").Visible = False + .Columns("tblSnd_Fakturiert").Visible = False + .Columns("AbfertigungsNr2").Visible = False .Columns("tblSnd_PosUnterNr").Width = 20 .Columns("tblSnd_PosUnterNr").HeaderText = "Nr." @@ -508,6 +510,16 @@ Public Class usrcntlAktDetails ' .Columns.Add(c) 'End If + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("SendungsStatusFakturiert", "AVISO") Then + c = New DataGridViewImageColumn + c.Name = "SendungFakturiert" + c.Image = My.Resources.fakturiertInaktiv : c.ImageLayout = DataGridViewImageCellLayout.Zoom + c.Width = 25 : c.DefaultCellStyle.Padding = New Padding(2) : c.DefaultCellStyle.BackColor = Color.White + c.ToolTipText = "Fakturiert" + .Columns.Add(c) + End If + + ' If VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG = "QS" Then c = New DataGridViewImageColumn c.Name = "SenungUebernehmen" @@ -543,7 +555,7 @@ Public Class usrcntlAktDetails r.Cells("Abfertigungsart").Value = r.Cells("tblSnd_FremdspeditionText").Value Else 'Nomal r.Cells("Abfertigungsart").Value = ADMIN.getValueTxtBySql("SELECT Abfertigungsbezeichnung FROM Abfertigungsarten WHERE [Abfertigungsart]='" & r.Cells("tblSnd_Abfertigungsart_ID").Value.ToString & "'", "FMZOLL") - If r.Cells("Abfertigungsart").Value.ToString.Length > 15 Then r.Cells("Abfertigungsart").Value = r.Cells("Abfertigungsart").Value.Substring(0, 15) & ".." + If r.Cells("Abfertigungsart").Value.ToString.Length > 15 Then r.Cells("Abfertigungsart").Value = r.Cells("Abfertigungsart").Value.Substring(0, 15) & ".." End If r.Cells("FilialenNr").Style.ForeColor = Color.White @@ -1481,6 +1493,31 @@ Public Class usrcntlAktDetails Me.Cursor = Cursors.Default + Case "SendungFakturiert" + sendAktiv = False + Me.Cursor = Cursors.WaitCursor + If FUNC.setSendungFakturiert(SendungsId, AvisoID) Then + initDgvSendungen() + End If + 'If dgvSendungen.Rows(e.RowIndex).Cells("FilialenNr").Value IsNot DBNull.Value AndAlso dgvSendungen.Rows(e.RowIndex).Cells("AbfertigungsNr2").Value IsNot DBNull.Value Then + + ' If VERAG_PROG_ALLGEMEIN.cSpeditionsbuch.existsSpedBuch(dgvSendungen.Rows(e.RowIndex).Cells("FilialenNr").Value, dgvSendungen.Rows(e.RowIndex).Cells("AbfertigungsNr2").Value) Then + ' Dim f As New SDL.frmAbrechnungsMaskeEinzeln(dgvSendungen.Rows(e.RowIndex).Cells("FilialenNr").Value, dgvSendungen.Rows(e.RowIndex).Cells("AbfertigungsNr2").Value) + ' If f.ShowDialog(Me) = DialogResult.OK Then + ' initDgvSendungen() + ' Vermerke_anzeigen() + ' End If + ' Else + ' MsgBox("Speditionsbucheintrag existiert nicht!") + ' End If + 'Else + ' MsgBox("Filiale bzw. Abfertigungsnummer vergeben!") + 'End If + + 'sendAktiv = False + + Me.Cursor = Cursors.Default + End Select @@ -1532,10 +1569,12 @@ Public Class usrcntlAktDetails If dgvSendungen.Columns("StatusVorbereitetQS") Is Nothing Then Return False If dgvSendungen.Columns("SenungUebernehmen") Is Nothing Then Return False If dgvSendungen.Columns("SenungWeiterleiten") Is Nothing Then Return False + ' If dgvSendungen.Columns("SendungFakturiert") Is Nothing Then Return False If dgvSendungen.Columns("SpeditionsbuchEintragen") Is Nothing Then Return False If dgvSendungen.Columns("KundeAnzeigen") Is Nothing Then Return False + ' MsgBox("TEST1") For Each r As DataGridViewRow In dgvSendungen.Rows Try @@ -1546,7 +1585,6 @@ Public Class usrcntlAktDetails DirectCast(r.Cells("SpeditionsbuchEintragen"), DataGridViewImageCell).Value = My.Resources.speditionsbuchAktiv End If - If r.Cells("tblSnd_Vorbereitet").Value IsNot DBNull.Value Then DirectCast(r.Cells("StatusVorbereitetQS"), DataGridViewImageCell).Value = My.Resources.statusBtn_vorbereitet_Aktiv DirectCast(r.Cells("StatusVorbereitetQS"), DataGridViewImageCell).ToolTipText = "Status 'Vorbereitet-QS' entfernen" & vbNewLine & "(" & r.Cells("tblSnd_Vorgeschrieben").Value & ")" @@ -1573,6 +1611,12 @@ Public Class usrcntlAktDetails End If If r.Cells("LetzterMitarbeiter").Value IsNot DBNull.Value Then DirectCast(r.Cells("SenungUebernehmen"), DataGridViewImageCell).ToolTipText = "Sendung von '" & r.Cells("LetzterMitarbeiter").Value & "' übernehmen" + If dgvSendungen.Columns("SendungFakturiert") IsNot Nothing Then + If (r.Cells("tblSnd_Fakturiert").Value) IsNot DBNull.Value Then + DirectCast(r.Cells("SendungFakturiert"), DataGridViewImageCell).Value = My.Resources.fakturiertAktiv + End If + DirectCast(r.Cells("SendungFakturiert"), DataGridViewImageCell).ToolTipText = "Sendung fakturiert" + End If 'If VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG = "QS" Then diff --git a/Diverses/miniButtons/fakturiertAktiv.jpg b/Diverses/miniButtons/fakturiertAktiv.jpg new file mode 100644 index 0000000..5d62165 Binary files /dev/null and b/Diverses/miniButtons/fakturiertAktiv.jpg differ diff --git a/Diverses/miniButtons/fakturiertAktiv.psd b/Diverses/miniButtons/fakturiertAktiv.psd new file mode 100644 index 0000000..d4c71b7 Binary files /dev/null and b/Diverses/miniButtons/fakturiertAktiv.psd differ diff --git a/Diverses/miniButtons/fakturiertInaktiv.jpg b/Diverses/miniButtons/fakturiertInaktiv.jpg new file mode 100644 index 0000000..7b3d562 Binary files /dev/null and b/Diverses/miniButtons/fakturiertInaktiv.jpg differ diff --git a/Diverses/miniButtons/fakturiertInaktiv.psd b/Diverses/miniButtons/fakturiertInaktiv.psd new file mode 100644 index 0000000..7ee0e2e Binary files /dev/null and b/Diverses/miniButtons/fakturiertInaktiv.psd differ