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
2022-12-07 12:50:43 +01:00
parent d6da1f2865 92f1e75562
commit 22bc383f34
20 changed files with 26005 additions and 3818 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
SDL/Classes/cEABeleg.vb
View File

@@ -267,6 +267,7 @@ Public Class EABeleg
Property SgutKompl As Object = Nothing
Property rksv_id As Integer = Nothing
Property rksv_BelegId As Integer = Nothing
Property rksv_BelegIdStorno As Object = Nothing
Property rksv_jws As String = Nothing
Property rksv_qr As String = Nothing
Property rksv_umsatz As Double = Nothing
@@ -339,6 +340,7 @@ Public Class EABeleg
Me.gebuchtStorno = cSqlDb.checkNullBool(dr.Item("gebuchtStorno"))
Me.SgutKompl = cSqlDb.checkNullReturnValue(dr.Item("SgutKompl"), Nothing)
Me.rksv_BelegId = cSqlDb.checkNullReturnValue(dr.Item("rksv_BelegId"), Nothing)
Me.rksv_BelegIdStorno = cSqlDb.checkNullReturnValue(dr.Item("rksv_BelegIdStorno"), Nothing)
Me.rksv_id = cSqlDb.checkNullReturnValue(dr.Item("rksv_id"), Nothing)
Me.rksv_jws = cSqlDb.checkNullReturnValue(dr.Item("rksv_jws"), Nothing)
@@ -519,6 +521,7 @@ Public Class EABeleg
list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_id", rksv_id))
list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_BelegId", rksv_BelegId))
list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_BelegIdStorno", rksv_BelegIdStorno))
list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_jws", rksv_jws))
list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_qr", rksv_qr))

42
SDL/Classes/cRKSV.vb
View File

@@ -519,7 +519,7 @@ Public Class cRKSV
'Dim [error] As VERAG_PROG_ALLGEMEIN.RKSV_DE_DSFinVKService.ErrorCode
'Dim InitializeLibraryResultSpecified As Boolean
' Dim [error] = "" 'm_com.InitializeLibrary(tbLicense.Text, "D:\Database\DSFinVK\dsfinvkdb.db3", "Administrator", "test", cashbox)
m_com.InitializeLibrary("SQLGUIDE01.verag.ost.dmn", "itg_RKSV_DE", "dsfinvk", "dsfinvk#1337", cashbox, [error], InitializeLibraryResultSpecified)
' m_com.InitializeLibrary("SQLGUIDE01.verag.ost.dmn", "itg_RKSV_DE", "dsfinvk", "dsfinvk#1337", cashbox, [error], InitializeLibraryResultSpecified)
' MsgBox("1: " & [error])
@@ -532,16 +532,35 @@ Public Class cRKSV
' MsgBox("2")
Dim BON_ID As Integer = 0
Dim BON_IDSpecified = False
Dim GetNextBON_IDResultSpecified = False
m_com.GetNextBON_ID(cashbox, BON_ID, BON_IDSpecified, [error], GetNextBON_IDResultSpecified)
'MsgBox("3: " & [error])
If False Then
If [error] <> VERAG_PROG_ALLGEMEIN.DSFinVKService.ErrorCode.OK Then
MessageBox.Show([error].ToString(), "Error2", MessageBoxButtons.OK, MessageBoxIcon.[Error])
Return False
Dim BON_IDSpecified = False
Dim GetNextBON_IDResultSpecified = False
m_com.GetNextBON_ID(cashbox, BON_ID, BON_IDSpecified, [error], GetNextBON_IDResultSpecified)
' MsgBox("3: " & [error])
If [error] <> VERAG_PROG_ALLGEMEIN.DSFinVKService.ErrorCode.OK Then
If [error].ToString() <> "CASHBOX_ALREADY_MANAGED" Then '--> CASHBOX_ALREADY_MANAGED --> der Fehler darf auftreten, die Cashbox wird Serverseitig initialisert, hier nur der Versuch, falls das nciht geschehen ist... lt. Jan Mika / AITG
MessageBox.Show([error].ToString(), "Error2", MessageBoxButtons.OK, MessageBoxIcon.[Error])
Return False
End If
End If
Else
' MsgBox(RKSV_Beleg_Id)
BON_ID = RKSV_Beleg_Id
End If
'Dim BON_ID As Integer = 0
'Dim BON_IDSpecified = False
'Dim GetNextBON_IDResultSpecified = False
'm_com.GetNextBON_ID(cashbox, BON_ID, BON_IDSpecified, [error], GetNextBON_IDResultSpecified)
''MsgBox("3: " & [error])
'If [error] <> VERAG_PROG_ALLGEMEIN.DSFinVKService.ErrorCode.OK Then
' MessageBox.Show([error].ToString(), "Error2", MessageBoxButtons.OK, MessageBoxIcon.[Error])
' Return False
'End If
'Dim BON_NR As Integer = 0
'[error] = m_com.GetNextBON_NR(cashbox, BON_NR)
@@ -2527,13 +2546,6 @@ Public Class cRKSV_DE
Return False
End If
Dim BON_NR As Integer = 0
[error] = m_com.GetNextBON_ID(cashbox, BON_NR)
If [error] <> VERAG_PROG_ALLGEMEIN.DSFinVKService.ErrorCode.OK Then
MessageBox.Show([error].ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error])
Return False
End If

3
SDL/Classes/cRKSV_Kasse.vb
View File

@@ -24,6 +24,7 @@ Public Class cRKSV_Kasse
Property rksv_DE_pwd As Object = Nothing
Property rksv_DE_apiToken As Object = Nothing
Property rksv_DE_license As Object = Nothing
Property rksv_StornoIncreaseBelegCnt As Object = Nothing
Dim SQL As New SQL
@@ -222,6 +223,7 @@ Public Class cRKSV_Kasse
Me.rksv_DE_pwd = cSqlDb.checkNullReturnValue(dr.Item("rksv_DE_pwd"), Nothing)
Me.rksv_DE_apiToken = cSqlDb.checkNullReturnValue(dr.Item("rksv_DE_apiToken"), Nothing)
Me.rksv_DE_license = cSqlDb.checkNullReturnValue(dr.Item("rksv_DE_license"), Nothing)
Me.rksv_StornoIncreaseBelegCnt = cSqlDb.checkNullBool(dr.Item("rksv_StornoIncreaseBelegCnt"))
End If
dr.Close()
@@ -258,6 +260,7 @@ Public Class cRKSV_Kasse
list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_DE_pwd", rksv_DE_pwd))
list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_DE_apiToken", rksv_DE_apiToken))
list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_DE_license", rksv_DE_license))
list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_StornoIncreaseBelegCnt", rksv_StornoIncreaseBelegCnt))
Return list

31
SDL/kassenbuch/frmKassenbuch.vb
View File

@@ -909,6 +909,9 @@ Public Class frmKassenbuch
End If
'NUR KB
If f.cbxStornoRKSV.Checked Or f.cbxStornoBELEG.Checked Or f.cbxStornoErzwingenAdmin.Checked Then
Dim grund2 = InputBox("ADMIN-Storno (" & If(f.cbxStornoRKSV.Checked, " -RKSV-Tabelle- ", "") & If(f.cbxStornoBELEG.Checked, " -BELEG-Tabelle- ", "") & If(f.cbxStornoErzwingenAdmin.Checked, " -KASSENBUCH-Tabelle- ", "") & "):" & vbNewLine & vbNewLine & "Betrag: " & BELEGTmp.rksv_umsatz & vbNewLine & "Datum: " & BELEGTmp.BelegDat & vbNewLine & vbNewLine & "Bitte geben Sie einen Stornogrund an:" & vbNewLine, "Storno")
@@ -918,11 +921,17 @@ Public Class frmKassenbuch
End If
Dim KASSETmp As New cRKSV_Kasse(BELEGTmp.rksv_id)
' Dim OLD_rksv_BelegId = BELEGTmp.rksv_BelegId
If BELEGTmp.BelegDat < Now.AddMonths(-2) And Not master_Kasse Then
MsgBox("Beleg älter als 2 Monate, Aktion wird abgebrochen") 'alte Belege nicht mehr storinieren
Exit Sub
End If
'If KASSETmp.StornoIncreaseBelegCnt Then ' Ob beim Storno eine neue BelegNr vergeben werden soll
' Dim RKSV_Beleg_Id = KASSETmp.INCREASE_BELEG_UMSATZ(BELEGTmp.rksv_umsatz)
' BELEGTmp.rksv_BelegId = RKSV_Beleg_Id
'End If
If f.cbxStornoErzwingenAdmin.Checked Then
BELEGTmp = cRKSV.STORNO(BELEGTmp, grund2, True, KASSETmp.rksv_firma) 'Beleg storno und Kassenbuch Gegenbuchung
End If
@@ -980,6 +989,12 @@ Public Class frmKassenbuch
Dim OLD_rksv_BelegId = BELEGTmp.rksv_BelegId
Dim KASSETmp As New cRKSV_Kasse(BELEGTmp.rksv_id)
If KASSETmp.rksv_StornoIncreaseBelegCnt Then ' Ob beim Storno eine neue BelegNr vergeben werden soll
Dim RKSV_Beleg_Id = KASSETmp.INCREASE_BELEG_UMSATZ(BELEGTmp.rksv_umsatz)
BELEGTmp.rksv_BelegIdStorno = RKSV_Beleg_Id
End If
BELEGTmp = cRKSV.STORNO(BELEGTmp, grund, KASSETmp.rksv_firma) 'Beleg storno und Kassenbuch Gegenbuchung
' BELEGTmp = cRKSV.STORNO(BELEGTmp, "") 'Beleg storno und Kassenbuch Gegenbuchung
@@ -992,21 +1007,23 @@ Public Class frmKassenbuch
If KASSETmp IsNot Nothing Then
KASSETmp.INCREASE_ONLY_BELEG_UMSATZ(BELEGTmp.rksv_umsatz * -1) ' Bei Storno wird der Umsatz vermindert!
Dim QRQString As String = ""
Dim LastJWS As String = ""
Dim answer = ""
If KASSETmp.rksv_aktiv Then
If Not cRKSV.stornoRKSV(KASSETmp, BELEGTmp.BelegDat, BELEGTmp.Steuerschlüssel, BELEGTmp.rksv_BelegId, BELEGTmp.rksv_umsatz, QRQString, LastJWS, answer) Then
KASSETmp.INCREASE_ONLY_BELEG_UMSATZ(BELEGTmp.rksv_umsatz * -1) ' Bei Storno wird der Umsatz vermindert!
Dim QRQString As String = ""
Dim LastJWS As String = ""
Dim answer = ""
If KASSETmp.rksv_aktiv Then
If Not cRKSV.stornoRKSV(KASSETmp, BELEGTmp.BelegDat, BELEGTmp.Steuerschlüssel, If(BELEGTmp.rksv_BelegIdStorno, BELEGTmp.rksv_BelegId), BELEGTmp.rksv_umsatz, QRQString, LastJWS, answer) Then
'FEHLER!!
If KASSETmp.rksv_StornoIncreaseBelegCnt Then BELEGTmp.rksv_BelegIdStorno = Nothing
BELEGTmp = cRKSV.STORNO_RUECKGAENGIG(BELEGTmp, grund, KASSETmp.rksv_firma) 'Beleg storno und Kassenbuch Gegenbuchung
MessageBox.Show("Fehler bei der RKSV-Storinerung:" & vbNewLine & vbNewLine & answer, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error)
Exit Sub
End If
End If
If KASSETmp.rksvDE_aktiv Then
If Not cRKSV.stornoRKSV_DE(PERSONALTmp, BELEGTmp, KASSETmp, BELEGTmp.rksv_BelegId, OLD_rksv_BelegId, BELEGTmp.rksv_umsatz, QRQString, LastJWS, False, answer) Then
If Not cRKSV.stornoRKSV_DE(PERSONALTmp, BELEGTmp, KASSETmp, If(BELEGTmp.rksv_BelegIdStorno, BELEGTmp.rksv_BelegId), BELEGTmp.rksv_BelegId, BELEGTmp.rksv_umsatz, QRQString, LastJWS, False, answer) Then
'FEHLER!!
If KASSETmp.rksv_StornoIncreaseBelegCnt Then BELEGTmp.rksv_BelegIdStorno = Nothing
BELEGTmp = cRKSV.STORNO_RUECKGAENGIG(BELEGTmp, grund, KASSETmp.rksv_firma) 'Beleg storno und Kassenbuch Gegenbuchung
MessageBox.Show("Fehler bei der RKSV-Storinerung:" & vbNewLine & vbNewLine & answer, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error)
Exit Sub

106
SDL/kunden/frmKundenUebersichtZOLL.Designer.vb generated
View File

@@ -93,14 +93,14 @@ Partial Class frmKundenUebersichtZOLL
Me.tbSpeditionsbuch = New System.Windows.Forms.TabPage()
Me.NotifyIcon1 = New System.Windows.Forms.NotifyIcon(Me.components)
Me.Panel1 = New System.Windows.Forms.Panel()
Me.MenuStripSDL = New System.Windows.Forms.MenuStrip()
Me.MenuStripKunden = New System.Windows.Forms.MenuStrip()
Me.mnueKunden = New System.Windows.Forms.ToolStripMenuItem()
Me.mnueZoll = New System.Windows.Forms.ToolStripMenuItem()
Me.mnueOfferte = New System.Windows.Forms.ToolStripMenuItem()
Me.mnueRechnungen = New System.Windows.Forms.ToolStripMenuItem()
Me.mnueSpeditionsbuch = New System.Windows.Forms.ToolStripMenuItem()
Me.mnueStatistik = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripFormulare = New System.Windows.Forms.ToolStripMenuItem()
Me.mneFormulare = New System.Windows.Forms.ToolStripMenuItem()
Me.MANAGERToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
Me.ToolStripMenuItem4 = New System.Windows.Forms.ToolStripMenuItem()
@@ -118,8 +118,8 @@ Partial Class frmKundenUebersichtZOLL
Me.VeragCustomsServiceToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripMenuItem19 = New System.Windows.Forms.ToolStripMenuItem()
Me.mnueFiskal = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripMenuItem5 = New System.Windows.Forms.ToolStripMenuItem()
Me.toolNeuerKunde = New System.Windows.Forms.ToolStripMenuItem()
Me.mneBearbeiten = New System.Windows.Forms.ToolStripMenuItem()
Me.toolOptionen = New System.Windows.Forms.ToolStripMenuItem()
Me.BearbeitenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.AnDakosyÜbertragenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -163,7 +163,7 @@ Partial Class frmKundenUebersichtZOLL
CType(Me.dgvRg, System.ComponentModel.ISupportInitialize).BeginInit()
Me.MyPanel1.SuspendLayout()
Me.Panel1.SuspendLayout()
Me.MenuStripSDL.SuspendLayout()
Me.MenuStripKunden.SuspendLayout()
Me.pnlTop.SuspendLayout()
CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
Me.ContextMenuStrip3.SuspendLayout()
@@ -940,21 +940,21 @@ Partial Class frmKundenUebersichtZOLL
Me.Panel1.Size = New System.Drawing.Size(1190, 726)
Me.Panel1.TabIndex = 201
'
'MenuStripSDL
'MenuStripKunden
'
Me.MenuStripSDL.AutoSize = False
Me.MenuStripSDL.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
Me.MenuStripSDL.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.MenuStripSDL.Dock = System.Windows.Forms.DockStyle.Left
Me.MenuStripSDL.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.MenuStripSDL.ImeMode = System.Windows.Forms.ImeMode.NoControl
Me.MenuStripSDL.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnueKunden, Me.mnueZoll, Me.mnueOfferte, Me.mnueRechnungen, Me.mnueSpeditionsbuch, Me.mnueStatistik, Me.ToolStripFormulare, Me.mnueFiskal, Me.toolNeuerKunde, Me.ToolStripMenuItem5, Me.toolOptionen, Me.ToolStripMenuItem1, Me.ToolStripMenuItem11})
Me.MenuStripSDL.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.VerticalStackWithOverflow
Me.MenuStripSDL.Location = New System.Drawing.Point(0, 0)
Me.MenuStripSDL.Name = "MenuStripSDL"
Me.MenuStripSDL.Size = New System.Drawing.Size(114, 758)
Me.MenuStripSDL.TabIndex = 208
Me.MenuStripSDL.Text = "test"
Me.MenuStripKunden.AutoSize = False
Me.MenuStripKunden.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
Me.MenuStripKunden.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.MenuStripKunden.Dock = System.Windows.Forms.DockStyle.Left
Me.MenuStripKunden.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.MenuStripKunden.ImeMode = System.Windows.Forms.ImeMode.NoControl
Me.MenuStripKunden.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnueKunden, Me.mnueZoll, Me.mnueOfferte, Me.mnueRechnungen, Me.mnueSpeditionsbuch, Me.mnueStatistik, Me.mneFormulare, Me.mnueFiskal, Me.toolNeuerKunde, Me.mneBearbeiten, Me.toolOptionen, Me.ToolStripMenuItem1, Me.ToolStripMenuItem11})
Me.MenuStripKunden.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.VerticalStackWithOverflow
Me.MenuStripKunden.Location = New System.Drawing.Point(0, 0)
Me.MenuStripKunden.Name = "MenuStripKunden"
Me.MenuStripKunden.Size = New System.Drawing.Size(114, 758)
Me.MenuStripKunden.TabIndex = 208
Me.MenuStripKunden.Text = "test"
'
'mnueKunden
'
@@ -1046,22 +1046,22 @@ Partial Class frmKundenUebersichtZOLL
Me.mnueStatistik.TextAlign = System.Drawing.ContentAlignment.BottomCenter
Me.mnueStatistik.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
'
'ToolStripFormulare
'mneFormulare
'
Me.ToolStripFormulare.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
Me.ToolStripFormulare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MANAGERToolStripMenuItem, Me.ToolStripSeparator3, Me.ToolStripMenuItem4, Me.ToolStripMenuItem9, Me.ToolStripMenuItem10, Me.ToolStripMenuItem14, Me.ToolStripMenuItem16, Me.ToolStripMenuItem17, Me.ToolStripMenuItem19})
Me.ToolStripFormulare.Enabled = False
Me.ToolStripFormulare.Font = New System.Drawing.Font("Segoe UI", 9.0!)
Me.ToolStripFormulare.ForeColor = System.Drawing.Color.White
Me.ToolStripFormulare.Image = Global.SDL.My.Resources.Resources.report
Me.ToolStripFormulare.ImageAlign = System.Drawing.ContentAlignment.TopCenter
Me.ToolStripFormulare.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
Me.ToolStripFormulare.Margin = New System.Windows.Forms.Padding(0, 10, 0, 0)
Me.ToolStripFormulare.Name = "ToolStripFormulare"
Me.ToolStripFormulare.Size = New System.Drawing.Size(107, 64)
Me.ToolStripFormulare.Text = "Formulare"
Me.ToolStripFormulare.TextAlign = System.Drawing.ContentAlignment.BottomCenter
Me.ToolStripFormulare.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
Me.mneFormulare.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
Me.mneFormulare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MANAGERToolStripMenuItem, Me.ToolStripSeparator3, Me.ToolStripMenuItem4, Me.ToolStripMenuItem9, Me.ToolStripMenuItem10, Me.ToolStripMenuItem14, Me.ToolStripMenuItem16, Me.ToolStripMenuItem17, Me.ToolStripMenuItem19})
Me.mneFormulare.Enabled = False
Me.mneFormulare.Font = New System.Drawing.Font("Segoe UI", 9.0!)
Me.mneFormulare.ForeColor = System.Drawing.Color.White
Me.mneFormulare.Image = Global.SDL.My.Resources.Resources.report
Me.mneFormulare.ImageAlign = System.Drawing.ContentAlignment.TopCenter
Me.mneFormulare.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
Me.mneFormulare.Margin = New System.Windows.Forms.Padding(0, 10, 0, 0)
Me.mneFormulare.Name = "mneFormulare"
Me.mneFormulare.Size = New System.Drawing.Size(107, 64)
Me.mneFormulare.Text = "Formulare"
Me.mneFormulare.TextAlign = System.Drawing.ContentAlignment.BottomCenter
Me.mneFormulare.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
'
'MANAGERToolStripMenuItem
'
@@ -1171,20 +1171,6 @@ Partial Class frmKundenUebersichtZOLL
Me.mnueFiskal.Text = "Fiskal"
Me.mnueFiskal.Visible = False
'
'ToolStripMenuItem5
'
Me.ToolStripMenuItem5.Enabled = False
Me.ToolStripMenuItem5.ForeColor = System.Drawing.Color.White
Me.ToolStripMenuItem5.Image = Global.SDL.My.Resources.Resources.stift1
Me.ToolStripMenuItem5.ImageAlign = System.Drawing.ContentAlignment.TopCenter
Me.ToolStripMenuItem5.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
Me.ToolStripMenuItem5.Margin = New System.Windows.Forms.Padding(0, 20, 0, 0)
Me.ToolStripMenuItem5.Name = "ToolStripMenuItem5"
Me.ToolStripMenuItem5.Size = New System.Drawing.Size(107, 44)
Me.ToolStripMenuItem5.Text = "Bearbeiten"
Me.ToolStripMenuItem5.TextAlign = System.Drawing.ContentAlignment.BottomCenter
Me.ToolStripMenuItem5.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
'
'toolNeuerKunde
'
Me.toolNeuerKunde.ForeColor = System.Drawing.Color.White
@@ -1198,6 +1184,20 @@ Partial Class frmKundenUebersichtZOLL
Me.toolNeuerKunde.TextAlign = System.Drawing.ContentAlignment.BottomCenter
Me.toolNeuerKunde.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
'
'mneBearbeiten
'
Me.mneBearbeiten.Enabled = False
Me.mneBearbeiten.ForeColor = System.Drawing.Color.White
Me.mneBearbeiten.Image = Global.SDL.My.Resources.Resources.stift1
Me.mneBearbeiten.ImageAlign = System.Drawing.ContentAlignment.TopCenter
Me.mneBearbeiten.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
Me.mneBearbeiten.Margin = New System.Windows.Forms.Padding(0, 20, 0, 0)
Me.mneBearbeiten.Name = "mneBearbeiten"
Me.mneBearbeiten.Size = New System.Drawing.Size(107, 44)
Me.mneBearbeiten.Text = "Bearbeiten"
Me.mneBearbeiten.TextAlign = System.Drawing.ContentAlignment.BottomCenter
Me.mneBearbeiten.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
'
'toolOptionen
'
Me.toolOptionen.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BearbeitenToolStripMenuItem, Me.AnDakosyÜbertragenToolStripMenuItem, Me.AufschubEORIBearbeitenToolStripMenuItem, Me.SYSKAÜbertragToolStripMenuItem})
@@ -1421,7 +1421,7 @@ Partial Class frmKundenUebersichtZOLL
Me.Controls.Add(Me.rtbInfo)
Me.Controls.Add(Me.Panel1)
Me.Controls.Add(Me.pnlTop)
Me.Controls.Add(Me.MenuStripSDL)
Me.Controls.Add(Me.MenuStripKunden)
Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
Me.MinimumSize = New System.Drawing.Size(900, 780)
Me.Name = "frmKundenUebersichtZOLL"
@@ -1451,8 +1451,8 @@ Partial Class frmKundenUebersichtZOLL
Me.MyPanel1.ResumeLayout(False)
Me.MyPanel1.PerformLayout()
Me.Panel1.ResumeLayout(False)
Me.MenuStripSDL.ResumeLayout(False)
Me.MenuStripSDL.PerformLayout()
Me.MenuStripKunden.ResumeLayout(False)
Me.MenuStripKunden.PerformLayout()
Me.pnlTop.ResumeLayout(False)
Me.pnlTop.PerformLayout()
CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1467,7 +1467,7 @@ Partial Class frmKundenUebersichtZOLL
Friend WithEvents pnlZollTarife As System.Windows.Forms.Panel
Friend WithEvents Panel1 As System.Windows.Forms.Panel
Friend WithEvents TabPage1 As System.Windows.Forms.TabPage
Friend WithEvents MenuStripSDL As System.Windows.Forms.MenuStrip
Friend WithEvents MenuStripKunden As System.Windows.Forms.MenuStrip
Friend WithEvents mnueKunden As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents mnueZoll As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents mnueOfferte As System.Windows.Forms.ToolStripMenuItem
@@ -1519,7 +1519,7 @@ Partial Class frmKundenUebersichtZOLL
Friend WithEvents tbFiskal As System.Windows.Forms.TabPage
Friend WithEvents Label35 As System.Windows.Forms.Label
Friend WithEvents tmrFiskal As System.Windows.Forms.Timer
Friend WithEvents ToolStripFormulare As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents mneFormulare As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents MANAGERToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents ToolStripSeparator3 As System.Windows.Forms.ToolStripSeparator
Friend WithEvents ToolStripMenuItem4 As System.Windows.Forms.ToolStripMenuItem
@@ -1559,7 +1559,7 @@ Partial Class frmKundenUebersichtZOLL
Friend WithEvents UsrCntlOfferte1 As usrCntlOfferte
Friend WithEvents ContextMenuStrip3 As ContextMenuStrip
Friend WithEvents ToolStripMenuItem3 As ToolStripMenuItem
Friend WithEvents ToolStripMenuItem5 As ToolStripMenuItem
Friend WithEvents mneBearbeiten As ToolStripMenuItem
Friend WithEvents HochladenToolStripMenuItem As ToolStripMenuItem
Friend WithEvents ScannenToolStripMenuItem As ToolStripMenuItem
Friend WithEvents ÄndernToolStripMenuItem As ToolStripMenuItem

2
SDL/kunden/frmKundenUebersichtZOLL.resx
View File

@@ -126,7 +126,7 @@
<metadata name="NotifyIcon1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="MenuStripSDL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<metadata name="MenuStripKunden.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>232, 17</value>
</metadata>
<metadata name="tmrFiskal.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

28
SDL/kunden/frmKundenUebersichtZOLL.vb
View File

@@ -55,7 +55,7 @@ Public Class frmKundenUebersichtZOLL
'strip, such as context menu strip just add additional code
'line under InitializeComponent(), and it will work;
InitializeComponent()
MenuStripSDL.Renderer = New MyRenderer()
MenuStripKunden.Renderer = New MyRenderer()
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
@@ -67,7 +67,7 @@ Public Class frmKundenUebersichtZOLL
Try
InitializeComponent()
Me.kdNr = KdNr
MenuStripSDL.Renderer = New MyRenderer()
MenuStripKunden.Renderer = New MyRenderer()
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
@@ -102,6 +102,10 @@ Public Class frmKundenUebersichtZOLL
Private Sub frmKundenUebersichtZOLL_Load(sender As Object, e As EventArgs) Handles MyBase.Load
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("WARENORT", "AVISO") Then Exit Sub
Me.BER_STUFE = VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG("KUNDEN", "SDL")
timerOP.Interval = 500
timerOP.Enabled = False
@@ -158,9 +162,9 @@ Public Class frmKundenUebersichtZOLL
mnueSpeditionsbuch.Visible = False
mnueStatistik.Visible = False
toolOptionen.Visible = False
ToolStripMenuItem5.Visible = False
mneBearbeiten.Visible = False
mnueOfferte.Visible = False
ToolStripFormulare.Visible = False
mneFormulare.Visible = False
mnueFiskal.Visible = False
toolNeuerKunde.Visible = False
' cbx.Checked = True
@@ -247,7 +251,7 @@ Public Class frmKundenUebersichtZOLL
loaded = False
If Not (New kundenSQL).existByKdNr(kdnr) Then
Me.tbcntrKundenDaten.Visible = False
For Each m As ToolStripItem In MenuStripSDL.Items
For Each m As ToolStripItem In MenuStripKunden.Items
m.Enabled = False
Next
'initAbfVerb(False)
@@ -284,13 +288,13 @@ Public Class frmKundenUebersichtZOLL
mnueKunden.Enabled = True
mnueZoll.Enabled = True
ToolStripFormulare.Enabled = True
mneFormulare.Enabled = True
mnueOfferte.Enabled = True
mnueStatistik.Enabled = True
mnueRechnungen.Enabled = True
mnueSpeditionsbuch.Enabled = True
toolOptionen.Enabled = True
ToolStripMenuItem5.Enabled = True
mneBearbeiten.Enabled = True
'SchließenToolStripMenuItem.Enabled = True
mnueFiskal.Enabled = True
@@ -323,9 +327,9 @@ Public Class frmKundenUebersichtZOLL
mnueRechnungen.Enabled = False
mnueSpeditionsbuch.Enabled = False
mnueStatistik.Enabled = False
ToolStripFormulare.Enabled = False
mneFormulare.Enabled = False
mnueFiskal.Enabled = False
ToolStripMenuItem5.Enabled = False
mneBearbeiten.Enabled = False
toolOptionen.Enabled = False
UsrCntlOfferte1.init(-1)
End If
@@ -631,8 +635,8 @@ Public Class frmKundenUebersichtZOLL
Sub changeTab(index As Integer, tsi As ToolStripItem)
tbcntrKundenDaten.SelectedIndex = index
For Each i As ToolStripItem In MenuStripSDL.Items
i.Font = New Font(MenuStripSDL.Font.FontFamily, MenuStripSDL.Font.Size, FontStyle.Regular)
For Each i As ToolStripItem In MenuStripKunden.Items
i.Font = New Font(MenuStripKunden.Font.FontFamily, MenuStripKunden.Font.Size, FontStyle.Regular)
Next
tsi.Font = New Font(tsi.Font.FontFamily, tsi.Font.Size, FontStyle.Underline Or FontStyle.Bold)
End Sub
@@ -1292,7 +1296,7 @@ Public Class frmKundenUebersichtZOLL
Private Sub ToolStripMenuItem5_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem5.Click
Private Sub ToolStripMenuItem5_Click(sender As Object, e As EventArgs) Handles mneBearbeiten.Click
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG("Kundendaten_bearbeiten", "SDL") = 0 Then
If kdNr > 0 Then
Dim frmKundenblatt As New frmKundenblatt

2073
SDL/kunden/usrCntlKundenuebersicht.Designer.vb generated
View File

File diff suppressed because it is too large Load Diff

12
SDL/kunden/usrCntlKundenuebersicht.vb
View File

@@ -174,7 +174,7 @@ Public Class usrCntlKundenuebersicht
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then
Try
tbWeitereKundenDetails.TabPages.Remove(TabPage3)
tbWeitereKundenDetails.TabPages.Remove(tbUmsatz)
tbWeitereKundenDetails.TabPages.Remove(tbOffenePosten)
tbcntrAllg.TabPages.Remove(tbAvisoMail)
tbcntrAllg.TabPages.Remove(tbKdSpez)
@@ -264,13 +264,13 @@ Public Class usrCntlKundenuebersicht
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then
Try
tbWeitereKundenDetails.TabPages.Remove(TabPage3)
tbWeitereKundenDetails.TabPages.Remove(tbUmsatz)
tbWeitereKundenDetails.TabPages.Remove(tbOffenePosten)
Catch ex As Exception
End Try
If ADRESSE IsNot Nothing AndAlso ADRESSE.LandKz = "TR" Then
tbWeitereKundenDetails.TabPages.Add(TabPage3)
tbWeitereKundenDetails.TabPages.Add(tbUmsatz)
tbWeitereKundenDetails.TabPages.Add(tbOffenePosten)
End If
End If
@@ -689,9 +689,9 @@ Public Class usrCntlKundenuebersicht
End Sub
Sub initDGVAnhaenge()
usrCntlAnhaenge.INIT(kdNr)
TabPage8.Text = "Anhänge"
tbAnhaenge.Text = "Anhänge"
' MsgBox(usrCntlAnhaenge.MyListBox1.Items.Count)
If usrCntlAnhaenge.MyListBox1.Items.Count > 0 Then TabPage8.Text &= " (" & usrCntlAnhaenge.MyListBox1.Items.Count & ")"
If usrCntlAnhaenge.MyListBox1.Items.Count > 0 Then tbAnhaenge.Text &= " (" & usrCntlAnhaenge.MyListBox1.Items.Count & ")"
Exit Sub
With dgvAnhaenge
.DataSource = SQL.loadDgvBySql("SELECT [da_id],[da_pfad],[da_name] FROM [tblDatenarchiv] " &
@@ -2050,7 +2050,7 @@ Public Class usrCntlKundenuebersicht
End If
End Sub
Private Sub FlatButton5_Click_1(sender As Object, e As EventArgs) Handles FlatButton5.Click
Private Sub FlatButton5_Click_1(sender As Object, e As EventArgs) Handles btnSaveOfferte.Click
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG("OFFERTEN_SPERRE", "SDL") > 0 Then
Exit Sub
End If