This commit is contained in:
2020-11-27 22:56:38 +01:00
parent 24dd462073
commit 65ee38135e
72 changed files with 16680 additions and 587 deletions

View File

@@ -465,6 +465,12 @@
<Compile Include="frmAvisoWeiterleiten.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmAviso_Vorpapiere.Designer.vb">
<DependentUpon>frmAviso_Vorpapiere.vb</DependentUpon>
</Compile>
<Compile Include="frmAviso_Vorpapiere.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmDokumenteSchicken.Designer.vb">
<DependentUpon>frmDokumenteSchicken.vb</DependentUpon>
</Compile>
@@ -739,6 +745,12 @@
<Compile Include="usrCntlAvisoAnhang.vb">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="usrCntlAviso_Vorpapiere.Designer.vb">
<DependentUpon>usrCntlAviso_Vorpapiere.vb</DependentUpon>
</Compile>
<Compile Include="usrCntlAviso_Vorpapiere.vb">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="usrCntlBenachrichtigungen.Designer.vb">
<DependentUpon>usrCntlBenachrichtigungen.vb</DependentUpon>
</Compile>
@@ -874,6 +886,9 @@
<EmbeddedResource Include="frmAvisoWeiterleiten.resx">
<DependentUpon>frmAvisoWeiterleiten.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmAviso_Vorpapiere.resx">
<DependentUpon>frmAviso_Vorpapiere.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmDokumenteSchicken.resx">
<DependentUpon>frmDokumenteSchicken.vb</DependentUpon>
</EmbeddedResource>
@@ -1011,6 +1026,9 @@
<EmbeddedResource Include="usrCntlAvisoAnhang.resx">
<DependentUpon>usrCntlAvisoAnhang.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="usrCntlAviso_Vorpapiere.resx">
<DependentUpon>usrCntlAviso_Vorpapiere.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="usrCntlBenachrichtigungen.resx">
<DependentUpon>usrCntlBenachrichtigungen.vb</DependentUpon>
</EmbeddedResource>
@@ -1154,7 +1172,9 @@
<EmbeddedResource Include="My Project\license.elic.xml" />
<Content Include="My Project\Telefonliste_small.png" />
<None Include="Resources\Telefonliste_small.png" />
<None Include="Resources\Logo_blue_globe_Horizontal.jpg" />
<None Include="Resources\Logo_blue_globe_Horizontal.jpg">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Resources\fakturiertInaktiv.jpg" />
<None Include="Resources\fakturiertAktiv.jpg" />
<None Include="Resources\mitarbeiter.png" />

View File

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

View File

@@ -1429,7 +1429,7 @@ Namespace My.Resources
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die 3.5.6.4 ähnelt.
''' Sucht eine lokalisierte Zeichenfolge, die 3.5.7.8 ähnelt.
'''</summary>
Friend ReadOnly Property Version() As String
Get

View File

@@ -536,7 +536,7 @@
<value>..\Resources\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Version" xml:space="preserve">
<value>3.5.6.4</value>
<value>3.5.7.8</value>
</data>
<data name="statusBtn_vorgeschrieben_Aktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\statusBtn_vorgeschrieben_Aktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

View File

@@ -64,6 +64,7 @@ Public Class frmAddAktenvermerkShort
btnVorgeschrieben.Enabled = VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("STATUS_Vorgeschrieben", Me.FindForm)
btnVorbereitet.Enabled = VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("STATUS_VorbQS", Me.FindForm)
btnErfasst.Enabled = VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("STATUS_Erfasst", Me.FindForm)
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim de = SQL.getValueTxtBySql("SELECT COUNT(*) FROM [Vermerke] where avisoid=" & AvisoID & " and VermerkeCode=17", "AVISO") -

65
Aviso/frmAviso_Vorpapiere.Designer.vb generated Normal file
View File

@@ -0,0 +1,65 @@
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
Partial Class frmAviso_Vorpapiere
Inherits System.Windows.Forms.Form
'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
<System.Diagnostics.DebuggerNonUserCode()> _
Protected Overrides Sub Dispose(ByVal disposing As Boolean)
Try
If disposing AndAlso components IsNot Nothing Then
components.Dispose()
End If
Finally
MyBase.Dispose(disposing)
End Try
End Sub
'Wird vom Windows Form-Designer benötigt.
Private components As System.ComponentModel.IContainer
'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAviso_Vorpapiere))
Me.UsrCntlAviso_Vorpapiere1 = New AVISO.usrCntlAviso_Vorpapiere()
Me.btn = New System.Windows.Forms.Button()
Me.SuspendLayout()
'
'UsrCntlAviso_Vorpapiere1
'
Me.UsrCntlAviso_Vorpapiere1.BackColor = System.Drawing.Color.White
Me.UsrCntlAviso_Vorpapiere1.Location = New System.Drawing.Point(0, 0)
Me.UsrCntlAviso_Vorpapiere1.Name = "UsrCntlAviso_Vorpapiere1"
Me.UsrCntlAviso_Vorpapiere1.Size = New System.Drawing.Size(410, 157)
Me.UsrCntlAviso_Vorpapiere1.TabIndex = 64
'
'btn
'
Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btn.Location = New System.Drawing.Point(289, 163)
Me.btn.Name = "btn"
Me.btn.Size = New System.Drawing.Size(109, 33)
Me.btn.TabIndex = 65
Me.btn.Text = "OK"
Me.btn.UseVisualStyleBackColor = True
'
'frmAviso_Vorpapiere
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.BackColor = System.Drawing.Color.White
Me.ClientSize = New System.Drawing.Size(410, 207)
Me.Controls.Add(Me.btn)
Me.Controls.Add(Me.UsrCntlAviso_Vorpapiere1)
Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
Me.Name = "frmAviso_Vorpapiere"
Me.Text = "frmAviso_Vorpapiere"
Me.ResumeLayout(False)
End Sub
Friend WithEvents UsrCntlAviso_Vorpapiere1 As usrCntlAviso_Vorpapiere
Friend WithEvents btn As Button
End Class

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,28 @@
Public Class frmAviso_Vorpapiere
Dim AVISO As VERAG_PROG_ALLGEMEIN.cAviso
Sub New(AVISO As VERAG_PROG_ALLGEMEIN.cAviso)
' Dieser Aufruf ist für den Designer erforderlich.
InitializeComponent()
Me.AVISO = AVISO
' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
End Sub
Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click
If UsrCntlAviso_Vorpapiere1.checkDouble() Then
MsgBox("Doppelte Einträge!")
Me.DialogResult = DialogResult.None
Exit Sub
End If
UsrCntlAviso_Vorpapiere1.getVorpapiere(AVISO)
Dim AvisoDAL As New VERAG_PROG_ALLGEMEIN.cAvisoDAL
If AvisoDAL.SpeichernAvisoVorpapiere(AVISO.AvisoID, AVISO.VORPAPIERE) Then
Me.Close()
End If
End Sub
Private Sub frmAviso_Vorpapiere_Load(sender As Object, e As EventArgs) Handles Me.Load
UsrCntlAviso_Vorpapiere1.setVorpapiere(AVISO)
End Sub
End Class

View File

@@ -75,6 +75,7 @@ Partial Class frmEintragAviso
Me.cboGrenzstelle = New System.Windows.Forms.ComboBox()
Me.Label15 = New System.Windows.Forms.Label()
Me.grpAviso = New System.Windows.Forms.GroupBox()
Me.PictureBox1 = New System.Windows.Forms.PictureBox()
Me.lblErr_KdNr = New System.Windows.Forms.Label()
Me.Button5 = New System.Windows.Forms.Button()
Me.lblErrVorraussuchtlEintreffen = New System.Windows.Forms.Label()
@@ -103,7 +104,6 @@ Partial Class frmEintragAviso
Me.lblErr_LKW = New System.Windows.Forms.Label()
Me.lblErr_Grenzstelle = New System.Windows.Forms.Label()
Me.Button1 = New System.Windows.Forms.Button()
Me.btnAbsSrch = New System.Windows.Forms.Button()
Me.lblAtrAvis = New System.Windows.Forms.Label()
Me.lblAtr = New System.Windows.Forms.Label()
Me.Label17 = New System.Windows.Forms.Label()
@@ -115,6 +115,7 @@ Partial Class frmEintragAviso
Me.cbxWarenort = New System.Windows.Forms.CheckBox()
Me.txtBestimmungszollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox()
Me.lblZA = New System.Windows.Forms.Label()
Me.btnAbsSrch = New System.Windows.Forms.Button()
Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem()
Me.lblErrFmZollKdNr = New System.Windows.Forms.Label()
Me.grp = New System.Windows.Forms.GroupBox()
@@ -145,13 +146,10 @@ Partial Class frmEintragAviso
Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.clmnPfad = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.UsrCntlEintragAvisoAtilla = New AVISO.usrCntlEintragAvisoAtilla()
Me.GroupBox1 = New System.Windows.Forms.GroupBox()
Me.dgvVorpapier = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.clmnArt = New System.Windows.Forms.DataGridViewComboBoxColumn()
Me.clmnMRN = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.PictureBox1 = New System.Windows.Forms.PictureBox()
Me.UsrCntlAviso_Vorpapiere1 = New AVISO.usrCntlAviso_Vorpapiere()
Me.panAdmin.SuspendLayout()
Me.grpAviso.SuspendLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
Me.pnl.SuspendLayout()
Me.grp.SuspendLayout()
@@ -159,9 +157,6 @@ Partial Class frmEintragAviso
Me.grpAktVerzollung.SuspendLayout()
Me.pnlSBG.SuspendLayout()
CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit()
Me.GroupBox1.SuspendLayout()
CType(Me.dgvVorpapier, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'btnOK
@@ -779,6 +774,16 @@ Partial Class frmEintragAviso
Me.grpAviso.TabStop = False
Me.grpAviso.Text = "Aviso"
'
'PictureBox1
'
Me.PictureBox1.BackgroundImage = Global.AVISO.My.Resources.Resources.lorry
Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.PictureBox1.Location = New System.Drawing.Point(3, 143)
Me.PictureBox1.Name = "PictureBox1"
Me.PictureBox1.Size = New System.Drawing.Size(22, 24)
Me.PictureBox1.TabIndex = 48
Me.PictureBox1.TabStop = False
'
'lblErr_KdNr
'
Me.lblErr_KdNr.AutoSize = True
@@ -1176,18 +1181,6 @@ Partial Class frmEintragAviso
Me.Button1.UseVisualStyleBackColor = True
Me.Button1.Visible = False
'
'btnAbsSrch
'
Me.btnAbsSrch.FlatAppearance.BorderSize = 0
Me.btnAbsSrch.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnAbsSrch.Image = CType(resources.GetObject("btnAbsSrch.Image"), System.Drawing.Image)
Me.btnAbsSrch.Location = New System.Drawing.Point(447, 411)
Me.btnAbsSrch.Name = "btnAbsSrch"
Me.btnAbsSrch.Size = New System.Drawing.Size(37, 20)
Me.btnAbsSrch.TabIndex = 12
Me.btnAbsSrch.UseVisualStyleBackColor = True
Me.btnAbsSrch.Visible = False
'
'lblAtrAvis
'
Me.lblAtrAvis.AutoSize = True
@@ -1324,6 +1317,18 @@ Partial Class frmEintragAviso
Me.lblZA.TabIndex = 0
Me.lblZA.Text = "Zollamt:"
'
'btnAbsSrch
'
Me.btnAbsSrch.FlatAppearance.BorderSize = 0
Me.btnAbsSrch.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnAbsSrch.Image = CType(resources.GetObject("btnAbsSrch.Image"), System.Drawing.Image)
Me.btnAbsSrch.Location = New System.Drawing.Point(447, 411)
Me.btnAbsSrch.Name = "btnAbsSrch"
Me.btnAbsSrch.Size = New System.Drawing.Size(37, 20)
Me.btnAbsSrch.TabIndex = 12
Me.btnAbsSrch.UseVisualStyleBackColor = True
Me.btnAbsSrch.Visible = False
'
'UsrCntlTestsystem1
'
Me.UsrCntlTestsystem1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
@@ -1717,57 +1722,13 @@ Partial Class frmEintragAviso
Me.UsrCntlEintragAvisoAtilla.TabIndex = 6
Me.UsrCntlEintragAvisoAtilla.Visible = False
'
'GroupBox1
'UsrCntlAviso_Vorpapiere1
'
Me.GroupBox1.Controls.Add(Me.dgvVorpapier)
Me.GroupBox1.Location = New System.Drawing.Point(12, 455)
Me.GroupBox1.Name = "GroupBox1"
Me.GroupBox1.Size = New System.Drawing.Size(403, 150)
Me.GroupBox1.TabIndex = 56
Me.GroupBox1.TabStop = False
Me.GroupBox1.Text = "Vorpapiere"
'
'dgvVorpapier
'
Me.dgvVorpapier.AKTUALISIERUNGS_INTERVALL = -1
Me.dgvVorpapier.AllowUserToResizeColumns = False
Me.dgvVorpapier.AllowUserToResizeRows = False
Me.dgvVorpapier.BackgroundColor = System.Drawing.Color.White
Me.dgvVorpapier.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvVorpapier.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnArt, Me.clmnMRN})
Me.dgvVorpapier.Location = New System.Drawing.Point(9, 19)
Me.dgvVorpapier.Name = "dgvVorpapier"
Me.dgvVorpapier.RowHeadersWidth = 25
Me.dgvVorpapier.Size = New System.Drawing.Size(388, 126)
Me.dgvVorpapier.TabIndex = 36
'
'clmnArt
'
Me.clmnArt.DisplayStyle = System.Windows.Forms.DataGridViewComboBoxDisplayStyle.ComboBox
Me.clmnArt.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.clmnArt.HeaderText = "Art"
Me.clmnArt.Items.AddRange(New Object() {"ATA", "MRN", "CRN"})
Me.clmnArt.Name = "clmnArt"
Me.clmnArt.Resizable = System.Windows.Forms.DataGridViewTriState.[True]
Me.clmnArt.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic
Me.clmnArt.Visible = False
Me.clmnArt.Width = 60
'
'clmnMRN
'
Me.clmnMRN.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
Me.clmnMRN.HeaderText = "T1 MRN"
Me.clmnMRN.Name = "clmnMRN"
'
'PictureBox1
'
Me.PictureBox1.BackgroundImage = Global.AVISO.My.Resources.Resources.lorry
Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.PictureBox1.Location = New System.Drawing.Point(3, 143)
Me.PictureBox1.Name = "PictureBox1"
Me.PictureBox1.Size = New System.Drawing.Size(22, 24)
Me.PictureBox1.TabIndex = 48
Me.PictureBox1.TabStop = False
Me.UsrCntlAviso_Vorpapiere1.BackColor = System.Drawing.Color.White
Me.UsrCntlAviso_Vorpapiere1.Location = New System.Drawing.Point(12, 462)
Me.UsrCntlAviso_Vorpapiere1.Name = "UsrCntlAviso_Vorpapiere1"
Me.UsrCntlAviso_Vorpapiere1.Size = New System.Drawing.Size(410, 157)
Me.UsrCntlAviso_Vorpapiere1.TabIndex = 63
'
'frmEintragAviso
'
@@ -1776,9 +1737,9 @@ Partial Class frmEintragAviso
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.BackColor = System.Drawing.Color.White
Me.ClientSize = New System.Drawing.Size(792, 728)
Me.Controls.Add(Me.UsrCntlAviso_Vorpapiere1)
Me.Controls.Add(Me.btnAbsSrch)
Me.Controls.Add(Me.panAdmin)
Me.Controls.Add(Me.GroupBox1)
Me.Controls.Add(Me.grp)
Me.Controls.Add(Me.txtDyRef)
Me.Controls.Add(Me.picDy)
@@ -1817,6 +1778,7 @@ Partial Class frmEintragAviso
Me.panAdmin.PerformLayout()
Me.grpAviso.ResumeLayout(False)
Me.grpAviso.PerformLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit()
Me.pnl.ResumeLayout(False)
Me.pnl.PerformLayout()
@@ -1828,9 +1790,6 @@ Partial Class frmEintragAviso
Me.pnlSBG.ResumeLayout(False)
Me.pnlSBG.PerformLayout()
CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).EndInit()
Me.GroupBox1.ResumeLayout(False)
CType(Me.dgvVorpapier, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -1957,9 +1916,6 @@ Partial Class frmEintragAviso
Friend WithEvents lblErr_KdNr As Label
Friend WithEvents cbxWarenort As CheckBox
Friend WithEvents pnl As Panel
Friend WithEvents GroupBox1 As GroupBox
Friend WithEvents dgvVorpapier As VERAG_PROG_ALLGEMEIN.MyDatagridview
Friend WithEvents clmnArt As DataGridViewComboBoxColumn
Friend WithEvents clmnMRN As DataGridViewTextBoxColumn
Friend WithEvents PictureBox1 As PictureBox
Friend WithEvents UsrCntlAviso_Vorpapiere1 As usrCntlAviso_Vorpapiere
End Class

View File

@@ -216,24 +216,6 @@
<metadata name="clmnPfad.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="columnName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="clmnPfad.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="clmnArt.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="clmnMRN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="clmnArt.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="clmnMRN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAgIAAAAEAIAAoCAEAFgAAACgAAACAAAAAAAEAAAEAIAAAAAAAAAgBABMLAAATCwAAAAAAAAAA

View File

@@ -396,11 +396,7 @@ Public Class frmEintragAviso
End If
'Vorpapier laden
dgvVorpapier.Rows.Clear()
myAviso.LOAD_Vorpapiere()
For Each VP In myAviso.VORPAPIERE
dgvVorpapier.Rows.Add({VP.vp_Art, VP.vp_Nr})
Next
UsrCntlAviso_Vorpapiere1.setVorpapiere(myAviso)
' If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Then
@@ -782,8 +778,11 @@ Public Class frmEintragAviso
If optOhneAviso.Checked Then myAviso.Telefonisch = ""
' myAviso.Info = txtInfo.Text.Trim ' jetzt in Vermerke gespeichert!!
myAviso.Info = ""
myAviso.letzterMitarbeiter = cGlobal.AktiverMitarbeiter.Mitarbeiter
myAviso.TeamId = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId
If Neuanlage Then
myAviso.letzterMitarbeiter = cGlobal.AktiverMitarbeiter.Mitarbeiter
myAviso.TeamId = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId
End If
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then
myAviso.Grenzstelle = "SUB"
Else
@@ -928,17 +927,15 @@ Public Class frmEintragAviso
myAviso.AvisoID = tmpId
AvisoDAL.addAenderung(tmpId, aendart, aendText)
'VORPAPIERE
myAviso.VORPAPIERE.Clear()
For Each r As DataGridViewRow In dgvVorpapier.Rows
If r.Cells("clmnMRN").Value IsNot Nothing AndAlso r.Cells("clmnMRN").Value <> "" Then
Dim VP As New cAvisoVorpapier
VP.vp_AvisoId = tmpId
VP.vp_Nr = r.Cells("clmnMRN").Value
VP.vp_Art = "T1" 'r.Cells("clmnMRN").Value
myAviso.VORPAPIERE.Add(VP)
End If
Next
'VORPAPIER
If UsrCntlAviso_Vorpapiere1.checkDouble() Then
MsgBox("Vorpapiere: Doppelte Einträge!")
Me.DialogResult = DialogResult.None
Me.Cursor = Cursors.Default
Exit Sub
End If
UsrCntlAviso_Vorpapiere1.getVorpapiere(myAviso)
AvisoDAL.SpeichernAvisoVorpapiere(tmpId, myAviso.VORPAPIERE)

View File

@@ -289,6 +289,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.MRNBarcodedruckToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.conMenuAviso.SuspendLayout()
Me.MenuStrip1.SuspendLayout()
Me.Top.SuspendLayout()
@@ -669,7 +670,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.ToolStripMenuItem6, 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.MRNBarcodedruckToolStripMenuItem, 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"
@@ -2863,6 +2864,12 @@ Partial Class frmHauptfenster
Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28)
Me.UsrCntlTestsystem1.TabIndex = 8
'
'MRNBarcodedruckToolStripMenuItem
'
Me.MRNBarcodedruckToolStripMenuItem.Name = "MRNBarcodedruckToolStripMenuItem"
Me.MRNBarcodedruckToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.MRNBarcodedruckToolStripMenuItem.Text = "MRN Barcodedruck"
'
'frmHauptfenster
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -3194,4 +3201,5 @@ Partial Class frmHauptfenster
Friend WithEvents NKDToolStripMenuItem As ToolStripMenuItem
Friend WithEvents NEUToolStripMenuItem As ToolStripMenuItem
Friend WithEvents AMBToolStripMenuItem As ToolStripMenuItem
Friend WithEvents MRNBarcodedruckToolStripMenuItem As ToolStripMenuItem
End Class

View File

@@ -2487,7 +2487,10 @@ Public Class frmHauptfenster
End Function
Private Sub Button3_Click_1(sender As Object, e As EventArgs) Handles Button3.Click
Dim ep As New SDL.cEORIWebService
MsgBox(ep.ValidateEoriNumber("ATEOS1000000199").Result(0).Name)
Exit Sub
'Dim cRKSV_DE As New VERAG_PROG_ALLGEMEIN.cRKSV_DE
'cRKSV_DE.SignRKSV_DE()
@@ -3543,6 +3546,14 @@ Public Class frmHauptfenster
MsgBox("Keine Berechtigung!")
End If
End Sub
Private Sub MRNBarcodedruckToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles MRNBarcodedruckToolStripMenuItem.Click
Dim MRN = InputBox("Bitte geben Sie die MRN-Nummer ein:")
SDL.FormularManagerNEU.printMRN(MRN)
End Sub
End Class
Public Class AvisoStatusFunctions
@@ -3566,7 +3577,41 @@ Public Class AvisoStatusFunctions
End Function
Public Sub sendAnkunftBenachrichtigung(AvisoId)
'VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.INSERT_BENACHRICHTIGUNG(AvisoId, -1, 3, "T", TeamID, "*ANKUNFT*", 0, "", "AUTO: LKW Ankunft - nicht vorgeschrieben!")
Dim alreadySent As New List(Of Integer)
Dim SENDUNG_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cSendungen)
For Each r In AvisoDAL.loadDataTableBySQL("SELECT tblSnd_SendungID FROM tblSendungen WHERE tblSnd_AvisoID=" & AvisoId).Rows
SENDUNG_LIST.Add(New VERAG_PROG_ALLGEMEIN.cSendungen(r("tblSnd_SendungID")))
Next
For Each s In SENDUNG_LIST
'Keine Fremdspedition / Handling + nicht vorgeschrieben
If Not s.tblSnd_Fremdspedition And s.tblSnd_Abfertigungsart_ID <> "23" And s.tblSnd_Vorgeschrieben = Nothing Then
'Avisierer vorhanden
Dim TeamId = ""
'Zugeordnetes Team anhand von Avisierer...
If s.tblSnd_AvisiererKdNr IsNot Nothing AndAlso s.tblSnd_AvisiererKdNr > 0 Then
TeamId = SQL.getValueTxtBySql("SELECT TOP 1 kde_TeamId FROM [tblKundenErweitert] where kde_KundenNr ='" & s.tblSnd_AvisiererKdNr & "'", "FMZOLL")
End If
'...wenn nicht --> Team aus Sendung
'If TeamId = "" And If(s.tblSnd_TeamId, "") <> "" Then TeamId = s.tblSnd_TeamId 'derzeit nicht..
If TeamId <> "" Then
Dim sent = False
For Each i In alreadySent
If i = TeamId Then sent = True
Next
If Not sent Then
VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.INSERT_BENACHRICHTIGUNG(AvisoId, -1, 3, "T", TeamId, "*ANKUNFT*", 0, "", "AUTO: LKW Ankunft - nicht vorgeschrieben!")
alreadySent.Add(TeamId)
End If
End If
End If
Next
End Sub
Public Function setAnkunft(AvisoID) As Boolean
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then
MsgBox("Keine Berechtigung!")
Return False
@@ -3594,6 +3639,13 @@ Public Class AvisoStatusFunctions
MsgBox("Dieses LKW-Aviso ist bereits auf ANKUNFT gesetzt.", vbInformation)
Return False
End If
'Wenn Aviserer einem Team zugeordnet, aber noch nicht "vorgeschrieben", dann bekommt das Team eine Nachricht!
' If Aviso.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_Vorbereitet Or Aviso.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_Erfasst Then
'Sendungsbasis
sendAnkunftBenachrichtigung(Aviso.AvisoID)
' End If
If Aviso.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_NichtEingetroffen Then
msg = "Dieses LKW-Aviso hat bereits den Status 'LKW nicht eingetroffen'." & vbCrLf & vbCrLf &
"Soll es jetzt trotzdem auf ANKUNFT (zurück)gesetzt werden?"
@@ -3604,7 +3656,7 @@ Public Class AvisoStatusFunctions
If Aviso.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_Freigegeben Then
msg = "Dieses LKW-Aviso ist bereits auf FREIGABE gesetzt." & vbCrLf & vbCrLf &
"Soll der Status wieder auf ANKUNFT geändert werden?"
"Soll der Status wieder auf ANKUNFT geändert werden?"
antwort = MsgBox(msg, CType(MsgBoxStyle.YesNo + MsgBoxStyle.DefaultButton2 + MsgBoxStyle.Question, MsgBoxStyle), "Status-Änderung")
If antwort = vbNo Then Return False
'Status ist offen - jetzt auf Ankunft setzen
@@ -4139,7 +4191,9 @@ Public Class AvisoStatusFunctions
Public Function setErfasst(AvisoID) As Boolean
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then
' If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then
If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("STATUS_Erfasst", "AVISO") Then
MsgBox("Keine Berechtigung!")
Return False
End If
@@ -4791,7 +4845,7 @@ Public Class AvisoStatusFunctions
Aviso.LetzterMitarbeiterId = -1
Aviso.letzterMitarbeiter = "-" ' VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter
Aviso.letzterMitarbeiter = "Weiterleitung" ' VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter
Aviso.TeamId = -1 'VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId

File diff suppressed because it is too large Load Diff

View File

@@ -117,9 +117,6 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="cntxtAnh.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>496, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btnEORIPruef.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@@ -1494,6 +1491,25 @@
<metadata name="MenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>296, 17</value>
</metadata>
<data name="Button14.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAABGdBTUEAALGPC/xhBQAAAytJREFUOE+d
kmtIU2EYx3df01qiZYX0JfuYBEFF2U2JEgqESCgScYpQZlYalV20mpUVRuk03+k2L7Plpt0sO5ouK7tf
zcsSnYlCecl5vLy7uXOezuYpEhOqHzzwwvv8f/CHh/MTHo/H9/PznxUt25+kLiQGr98wkunpWTG+vn4+
fD6fy679EZIkJx5CoVAUvDYsVqU1jpdXN43nEv2WHMJC3qlpHG9u73VGRspC/f3ne09sT8Uj4nJ5/OUr
N8Yo9C3DOY8HB98NA27HgHtsgM1WwPc7qd6OfiupUun2sbkpeERSqa/05Nky52F9f9+tLsCPBwC7ZZ9G
AX8YAfzMAriszTXwtOF997JlK9ew2Ul4ROvWb086eqnKcbEBsLoZsFv2sBdwPSOs6wdc2QO4qNk1ml5q
/pKRka1ns5PwiKJk578HJzc1h2TaamN1zobLL6iurNd0i/wRZUwhXLXKRtqS+ZweOWjAnUplEcFmJ+ER
7Yw8M7TqwMfWoNQxtC3fUXCkiiqT19Pa1Ic0SqqkmHHd3qF23N2lHG3IzdVMLwoJjZKFx+QNbM1xoORK
F1K8pZHeDOhmF6DCFkByI41kWkeBvNT8LSUlY3qRROLts+9o4VCczqa5+opGNb2AmuyATE5AL4YBlZgA
pVVTqvonr1tFIrEXm52ER8QcAGfJkuCQs4r7HZpGu/rN0Hj+IEWjURpQu51SVXW71ApFOWRmFn/dvGlL
uFjAEXvSv8GKOByBQCRZsWJzXOL+C905xcSn9j6LvmeALLtn/NhXcfNBa3LyxdaiwsrOiuxjddd2Lyzx
9ebOnUhO8Ev0kwULAleHhcl00dGHiLi4I0RERAIhEAi9REKh+FxCrMGkDQer6TRk7w0smT+bG8DGpoqm
Q8DjiOPXzdR2KIPAZToJuOkEXNmzWDOPlf21yM1MMWdOYqikpA0tZWTHYYyRZcUvKmZqzvknkRufGdyA
hA1emrY8t+wEU/MM5MUvNNjGyBnsyt/jI+EGJIZIis3ump/ToOelBiinXcp+/xtMzbmJG7wMhqvHQH7q
GthsjMjd738Gj5ASh80mtVrtUpqmOT8ASDXvdskQmQUAAAAASUVORK5CYII=
</value>
</data>
<data name="Button3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAABGdBTUEAALGPC/xhBQAACQpJREFUaEPl
@@ -1742,6 +1758,9 @@
mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="cntxtAnh.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>496, 17</value>
</metadata>
<data name="BindingNavigatorAddNewItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO

View File

@@ -241,11 +241,7 @@ Public Class frmSendungsdetailsNEU
End If
cboVorpapier.Items.Clear()
AVISO.LOAD_Vorpapiere()
For Each VP In AVISO.VORPAPIERE
cboVorpapier.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(VP.vp_Nr, VP.vp_Nr))
Next
initVorpapiere()
If AVISO.Abgeschlossen Then
Label8.Visible = True
@@ -579,7 +575,7 @@ Public Class frmSendungsdetailsNEU
lbleori_Pruef.Text = "-"
If kdSB IsNot Nothing Then
If kdSB.KdData_KUNDE IsNot Nothing AndAlso kdSB.KdData_KUNDE.EORITIN IsNot Nothing Then
lbleori_Pruef.Text = kdSB.KdData_KUNDE.EORITIN & If(kdSB.KdData_KUNDE.EORITIN_NL, "")
lbleori_Pruef.Text = kdSB.KdData_KUNDE.EORITIN ' & If(kdSB.KdData_KUNDE.EORITIN_NL, "")
btnEORIPruef.Visible = True
End If
If kdSB.KdData_ADRESSEN IsNot Nothing AndAlso kdSB.KdData_ADRESSEN.UstIdKz IsNot Nothing AndAlso kdSB.KdData_ADRESSEN.UstIdNr IsNot Nothing Then
@@ -878,7 +874,7 @@ Public Class frmSendungsdetailsNEU
newRow.tblSnd_Gewicht = ""
newRow.tblSnd_Colli = ""
newRow.tblSnd_SendungID = -1
newRow.ABRECHNUNG.Clear()
SENDUNG_LIST.Add(newRow)
SAVE_ME()
@@ -1136,9 +1132,7 @@ Public Class frmSendungsdetailsNEU
txtFrachtfuehrer.Text = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Frachtfuehrer 'IIf(SENDUNG_LIST(CURRENT_INDEX).tblSnd_frachtfuehrer Is Nothing, "", SENDUNG_LIST(CURRENT_INDEX).tblSnd_frachtfuehrer)
End If
cboVorpapier.Text = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier
txtVorpapierPos.Text = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier_Pos
setVorpapiere()
initFraechterAvisererFromAkt()
@@ -1273,6 +1267,33 @@ Public Class frmSendungsdetailsNEU
' GEAENDERT = False
End Sub
Sub initVorpapiere()
cboVorpapier.Items.Clear()
cboVorpapier2.Items.Clear()
cboVorpapier3.Items.Clear()
AVISO.LOAD_Vorpapiere()
cboVorpapier.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
cboVorpapier2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
cboVorpapier3.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
For Each VP In AVISO.VORPAPIERE
cboVorpapier.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(VP.vp_Nr, VP.vp_Nr))
cboVorpapier2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(VP.vp_Nr, VP.vp_Nr))
cboVorpapier3.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(VP.vp_Nr, VP.vp_Nr))
Next
End Sub
Sub setVorpapiere()
cboVorpapier.Text = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier
txtVorpapierPos.Text = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier_Pos
cboVorpapier2.Text = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier2
txtVorpapier2Pos.Text = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier2_Pos
cboVorpapier3.Text = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier3
txtVorpapier3Pos.Text = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier3_Pos
End Sub
Sub initFraechterAvisererFromAkt()
'Übergangsphase Aviso/Sendung
@@ -1554,8 +1575,12 @@ Public Class frmSendungsdetailsNEU
SENDUNG_LIST(CURRENT_INDEX).tblSnd_KdAuftragsNrFrachtfuehrer = txtKdAuftragsNrFrachtfuehrer.Text
SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier = cboVorpapier.Text
SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier_Pos = txtVorpapierPos.Text
SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier = cboVorpapier.Text.Trim
SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier_Pos = txtVorpapierPos.Text.Trim
SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier2 = cboVorpapier2.Text.Trim
SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier2_Pos = txtVorpapier2Pos.Text.Trim
SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier3 = cboVorpapier3.Text.Trim
SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier3_Pos = txtVorpapier3Pos.Text.Trim
End Sub
@@ -2813,7 +2838,7 @@ Public Class frmSendungsdetailsNEU
End Sub
Sub initAnhang()
Dim hSQL As String = " SELECT [anh_id],[anh_Name],[anh_docId],CASE WHEN (anh_SendungsId is null OR anh_SendungsId <=0) AND anh_Art='' THEN '***' ELSE [anh_Art] END as [anh_Art],[anh_Typ],anh_LaufzettelDruck FROM [tblAvisoAnhaenge]
Dim hSQL As String = " SELECT [anh_id],[anh_Name],[anh_docId],CASE WHEN (anh_SendungsId is null OR anh_SendungsId <=0) AND anh_Art='' THEN '***' ELSE [anh_Art] END as [anh_Art],[anh_Typ],anh_LaufzettelDruck,anh_GestellungslisteAnfuegen FROM [tblAvisoAnhaenge]
WHERE anh_AvisoId=" & AvisoId & " AND (anh_SendungsId is null OR anh_SendungsId <=0 OR anh_SendungsId=" & SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID & ")
ORDER BY anh_SendungsId desc,
case
@@ -2874,6 +2899,11 @@ Public Class frmSendungsdetailsNEU
.Columns("anh_LaufzettelDruck").Width = 150
.Columns("anh_LaufzettelDruck").HeaderText = "Laufzettel-Druck"
.Columns("anh_GestellungslisteAnfuegen").Width = 150
.Columns("anh_GestellungslisteAnfuegen").HeaderText = "GestListe anfügen"
.ClearSelection()
End With
End Sub
@@ -3977,37 +4007,132 @@ Public Class frmSendungsdetailsNEU
End Sub
Private Sub Button24_Click(sender As Object, e As EventArgs) Handles btnEORIPruef.Click
MsgBox("Noch nicht verfügbar!")
Exit sub
Me.Cursor = Cursors.WaitCursor
Try
If lbleori_Pruef.Text.Replace("-", "").Trim = "" Then Me.Cursor = Cursors.Default : Exit Sub
Dim url = "https://ec.europa.eu/taxation_customs/dds2/eos/eori_validation.jsp?Lang=de&EoriNumb=" & lbleori_Pruef.Text.Replace(" ", "") & "&Expand=true"
Dim path = VERAG_PROG_ALLGEMEIN.cFormularManager.getPDFViaSpirePDF_FromURL(url)
Dim EORI_NR = lbleori_Pruef.Text.Replace("-", "").Replace(" ", "").Trim
If EORI_NR = "" Then Me.Cursor = Cursors.Default : Exit Sub
Dim EORI_ERG As Integer = -1
Dim path = SDL.cEORIWebService.genEORI_Formular(EORI_NR, AvisoId, SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, EORI_ERG)
btnEORIPruef.BackgroundImage = My.Resources.fragezeichen
MsgBox("1:" & path)
If path <> "" AndAlso IO.File.Exists(path) Then 'ADD
Dim fi As New IO.FileInfo(path)
Dim filename = fi.Name
If filename = "" Then
MsgBox("Dateiname konnte nicht ermittelt werden." & vbNewLine & path)
Else
MsgBox("2:" & path)
If frmSendungAnhangImport.saveToDS(AvisoId, filename, path, "EORI", "PDF", , , , SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID) Then
initAnhang()
End If
End If
End If
Select Case EORI_ERG
Case 0 : btnEORIPruef.BackgroundImage = My.Resources.ok
'If path <> "" AndAlso IO.File.Exists(path) Then 'ADD
' Dim fi As New IO.FileInfo(path)
' Dim filename = fi.Name
' If filename = "" Then
' MsgBox("Dateiname konnte nicht ermittelt werden." & vbNewLine & path)
' Else
' If frmSendungAnhangImport.saveToDS(AvisoId, filename, path, "UID", "PDF", , , , SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID) Then
' initAnhang()
' End If
' End If
'End If
initAnhang()
Case 1 : btnEORIPruef.BackgroundImage = My.Resources.del
End Select
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
End Try
Me.Cursor = Cursors.Default
'MsgBox("Noch nicht verfügbar!")
'Exit sub
'Me.Cursor = Cursors.WaitCursor
'Try
' If lbleori_Pruef.Text.Replace("-", "").Trim = "" Then Me.Cursor = Cursors.Default : Exit Sub
' Dim url = "https://ec.europa.eu/taxation_customs/dds2/eos/eori_validation.jsp?Lang=de&EoriNumb=" & lbleori_Pruef.Text.Replace(" ", "") & "&Expand=true"
' Dim path = VERAG_PROG_ALLGEMEIN.cFormularManager.getPDFViaSpirePDF_FromURL(url)
' btnEORIPruef.BackgroundImage = My.Resources.fragezeichen
' MsgBox("1:" & path)
' If path <> "" AndAlso IO.File.Exists(path) Then 'ADD
' Dim fi As New IO.FileInfo(path)
' Dim filename = fi.Name
' If filename = "" Then
' MsgBox("Dateiname konnte nicht ermittelt werden." & vbNewLine & path)
' Else
' MsgBox("2:" & path)
' If frmSendungAnhangImport.saveToDS(AvisoId, filename, path, "EORI", "PDF", , , , SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID) Then
' initAnhang()
' End If
' End If
' End If
'Catch ex As Exception
' MsgBox(ex.Message & ex.StackTrace)
'End Try
'Me.Cursor = Cursors.Default
End Sub
Private Sub Button24_Click_1(sender As Object, e As EventArgs) Handles Button24.Click
Dim f As New frmAviso_Vorpapiere(AVISO)
f.ShowDialog(Me)
initVorpapiere()
setVorpapiere()
End Sub
Private Sub GestellungslisteAnfügenJANEINToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GestellungslisteAnfügenJANEINToolStripMenuItem.Click
If dgvAnhang.SelectedRows.Count >= 1 Then
Dim errShown = False
For Each r As DataGridViewRow In dgvAnhang.SelectedRows
' If r.Cells("anh_typ").Value = "PDF" Then
VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge.toggleGestellungslisteAnfuegen(r.Cells("anh_Id").Value)
'ElseIf Not errShown Then
' MsgBox("Nur bei PDF möglich!")
' errShown = True
'End If
Next
initAnhang()
End If
End Sub
'Private Sub dgvAnhang_CellMouseClick(sender As Object, e As DataGridViewCellMouseEventArgs) Handles dgvAnhang.CellMouseClick
' If e.Button = MouseButtons.Right Then
' MsgBox("HM1")
' dgvAnhang.ClearSelection()
' dgvAnhang.Rows(e.RowIndex).Selected = True
' End If
'End Sub
'Private Sub dgvAnhang_MouseClick(sender As Object, e As MouseEventArgs) Handles dgvAnhang.MouseClick
' If e.Button = MouseButtons.Right Then
' MsgBox("HM2")
' dgvAnhang.ClearSelection()
' ' dgvAnhang.Rows(e.RowIndex).Selected = True
' End If
'End Sub
Private Sub grid_CellMouseClick(sender As Object, e As System.Windows.Forms.DataGridViewCellMouseEventArgs) Handles dgvAnhang.CellMouseClick
If e.Button = MouseButtons.Right Then
If Not dgvAnhang.Rows(e.RowIndex).Selected Then
If e.RowIndex < 0 Then Exit Sub 'Es wurde außerhalb einer gültigen Datenzeile geklickt
dgvAnhang.ClearSelection()
dgvAnhang.Rows(e.RowIndex).Selected = True
End If
cntxtAnh.Show(Cursor.Position)
End If
'If e.Button = MouseButtons.Right Then
' If AVISO.Abgeschlossen Then Exit Sub
' If sender Is gridVermerke Then
' If gridVermerke.SelectedRows.Count = 0 Then Exit Sub 'Es wurde außerhalb einer gültigen Datenzeile geklickt
' ' AvisoID = CInt(gridVermerke.Rows(e.RowIndex).Cells("AvisoId").Value)
' gridVermerke.CurrentCell = gridVermerke.Rows(e.RowIndex).Cells(e.ColumnIndex)
' conMenuVermerke.Show(Cursor.Position)
' ToolUeberweisungsBeleg.Visible = (gridVermerke.SelectedRows(0).Cells("VermerkeCode").Value = "13")
' toolVkReminder.Visible = (gridVermerke.SelectedRows(0).Cells("VermerkeCode").Value = "13")
' End If
'End If
End Sub
End Class

View File

@@ -0,0 +1,94 @@
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
Partial Class usrCntlAviso_Vorpapiere
Inherits System.Windows.Forms.UserControl
'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
<System.Diagnostics.DebuggerNonUserCode()> _
Protected Overrides Sub Dispose(ByVal disposing As Boolean)
Try
If disposing AndAlso components IsNot Nothing Then
components.Dispose()
End If
Finally
MyBase.Dispose(disposing)
End Try
End Sub
'Wird vom Windows Form-Designer benötigt.
Private components As System.ComponentModel.IContainer
'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Me.GroupBox1 = New System.Windows.Forms.GroupBox()
Me.dgvVorpapier = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.clmnArt = New System.Windows.Forms.DataGridViewComboBoxColumn()
Me.clmnMRN = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.GroupBox1.SuspendLayout()
CType(Me.dgvVorpapier, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'GroupBox1
'
Me.GroupBox1.Controls.Add(Me.dgvVorpapier)
Me.GroupBox1.Location = New System.Drawing.Point(0, 0)
Me.GroupBox1.Name = "GroupBox1"
Me.GroupBox1.Size = New System.Drawing.Size(403, 150)
Me.GroupBox1.TabIndex = 57
Me.GroupBox1.TabStop = False
Me.GroupBox1.Text = "Vorpapiere"
'
'dgvVorpapier
'
Me.dgvVorpapier.AKTUALISIERUNGS_INTERVALL = -1
Me.dgvVorpapier.AllowUserToResizeColumns = False
Me.dgvVorpapier.AllowUserToResizeRows = False
Me.dgvVorpapier.BackgroundColor = System.Drawing.Color.White
Me.dgvVorpapier.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvVorpapier.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnArt, Me.clmnMRN})
Me.dgvVorpapier.Location = New System.Drawing.Point(9, 19)
Me.dgvVorpapier.Name = "dgvVorpapier"
Me.dgvVorpapier.RowHeadersWidth = 25
Me.dgvVorpapier.Size = New System.Drawing.Size(388, 126)
Me.dgvVorpapier.TabIndex = 36
'
'clmnArt
'
Me.clmnArt.DisplayStyle = System.Windows.Forms.DataGridViewComboBoxDisplayStyle.ComboBox
Me.clmnArt.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.clmnArt.HeaderText = "Art"
Me.clmnArt.Items.AddRange(New Object() {"ATA", "MRN", "CRN"})
Me.clmnArt.Name = "clmnArt"
Me.clmnArt.Resizable = System.Windows.Forms.DataGridViewTriState.[True]
Me.clmnArt.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic
Me.clmnArt.Visible = False
Me.clmnArt.Width = 60
'
'clmnMRN
'
Me.clmnMRN.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
Me.clmnMRN.HeaderText = "T1 MRN"
Me.clmnMRN.Name = "clmnMRN"
'
'usrCntlAviso_Vorpapiere
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.BackColor = System.Drawing.Color.White
Me.Controls.Add(Me.GroupBox1)
Me.Name = "usrCntlAviso_Vorpapiere"
Me.Size = New System.Drawing.Size(410, 157)
Me.GroupBox1.ResumeLayout(False)
CType(Me.dgvVorpapier, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
End Sub
Friend WithEvents GroupBox1 As GroupBox
Friend WithEvents dgvVorpapier As VERAG_PROG_ALLGEMEIN.MyDatagridview
Friend WithEvents clmnArt As DataGridViewComboBoxColumn
Friend WithEvents clmnMRN As DataGridViewTextBoxColumn
End Class

View File

@@ -0,0 +1,126 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="clmnArt.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="clmnMRN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root>

View File

@@ -0,0 +1,40 @@
Public Class usrCntlAviso_Vorpapiere
Sub setVorpapiere(ByRef myAviso As VERAG_PROG_ALLGEMEIN.cAviso)
'Vorpapier laden
dgvVorpapier.Rows.Clear()
myAviso.LOAD_Vorpapiere()
For Each VP In myAviso.VORPAPIERE
dgvVorpapier.Rows.Add({VP.vp_Art, VP.vp_Nr})
Next
End Sub
Function checkDouble()
For Each r As DataGridViewRow In dgvVorpapier.Rows
For Each r2 As DataGridViewRow In dgvVorpapier.Rows
If r.Index <> r2.Index Then
If r.Cells("clmnMRN").Value = r2.Cells("clmnMRN").Value Then
Return True
End If
End If
Next
Next
Return False
End Function
Sub getVorpapiere(ByRef myAviso As VERAG_PROG_ALLGEMEIN.cAviso)
'VORPAPIERE
myAviso.VORPAPIERE.Clear()
For Each r As DataGridViewRow In dgvVorpapier.Rows
If r.Cells("clmnMRN").Value IsNot Nothing AndAlso r.Cells("clmnMRN").Value <> "" Then
Dim VP As New VERAG_PROG_ALLGEMEIN.cAvisoVorpapier
VP.vp_AvisoId = myAviso.AvisoID
VP.vp_Nr = r.Cells("clmnMRN").Value
VP.vp_Art = "T1" 'r.Cells("clmnMRN").Value
myAviso.VORPAPIERE.Add(VP)
End If
Next
End Sub
End Class

View File

@@ -45,17 +45,13 @@ Partial Class usrcntlAktDetails
Me.cboGrenzstelle = New System.Windows.Forms.ComboBox()
Me.Label11 = New System.Windows.Forms.Label()
Me.lnlSendungText = New System.Windows.Forms.Label()
Me.txtSendungen = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.pnlSBG = New System.Windows.Forms.Panel()
Me.lblSndFremd = New System.Windows.Forms.Label()
Me.Label21 = New System.Windows.Forms.Label()
Me.txtSndFremd = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Label20 = New System.Windows.Forms.Label()
Me.Label19 = New System.Windows.Forms.Label()
Me.lblFiskde = New System.Windows.Forms.Label()
Me.txtSndFiskalDE = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.lblFiskAT = New System.Windows.Forms.Label()
Me.txtSndFiskalAT = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.cbxSammelakt = New System.Windows.Forms.CheckBox()
Me.Button5 = New System.Windows.Forms.Button()
Me.Button3 = New System.Windows.Forms.Button()
@@ -70,14 +66,11 @@ Partial Class usrcntlAktDetails
Me.Button12 = New System.Windows.Forms.Button()
Me.Button11 = New System.Windows.Forms.Button()
Me.btnKasse_User = New System.Windows.Forms.Button()
Me.cboFormulareRgAn = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Label4 = New System.Windows.Forms.Label()
Me.Button8 = New System.Windows.Forms.Button()
Me.Button10 = New System.Windows.Forms.Button()
Me.Button9 = New System.Windows.Forms.Button()
Me.btnKasse_LG = New System.Windows.Forms.Button()
Me.cbxLZRg = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components)
Me.cbxLZT1 = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components)
Me.Button18 = New System.Windows.Forms.Button()
Me.gridVermerke = New System.Windows.Forms.DataGridView()
Me.pnlVermerkeTop = New System.Windows.Forms.Panel()
@@ -158,6 +151,14 @@ Partial Class usrcntlAktDetails
Me.btnLöschen = New System.Windows.Forms.Button()
Me.btnÄndern = New System.Windows.Forms.Button()
Me.btnTV = New System.Windows.Forms.Button()
Me.cbxVPSplit = New System.Windows.Forms.CheckBox()
Me.txtSendungen = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.txtSndFremd = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.txtSndFiskalDE = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.txtSndFiskalAT = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.cboFormulareRgAn = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.cbxLZRg = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components)
Me.cbxLZT1 = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components)
Me.pnlDetailsRechts.SuspendLayout()
Me.Panel3.SuspendLayout()
CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -348,30 +349,6 @@ Partial Class usrcntlAktDetails
Me.lnlSendungText.TabIndex = 2
Me.lnlSendungText.Text = "Sendung"
'
'txtSendungen
'
Me.txtSendungen._DateTimeOnly = False
Me.txtSendungen._numbersOnly = True
Me.txtSendungen._numbersOnlyKommastellen = ""
Me.txtSendungen._Prozent = False
Me.txtSendungen._ShortDateNew = False
Me.txtSendungen._ShortDateOnly = False
Me.txtSendungen._TimeOnly = False
Me.txtSendungen._value = ""
Me.txtSendungen._Waehrung = False
Me.txtSendungen._WaehrungZeichen = True
Me.txtSendungen.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtSendungen.ForeColor = System.Drawing.Color.Black
Me.txtSendungen.Location = New System.Drawing.Point(22, 17)
Me.txtSendungen.MaxLineLength = -1
Me.txtSendungen.MaxLines_Warning = ""
Me.txtSendungen.MaxLines_Warning_Label = Nothing
Me.txtSendungen.Name = "txtSendungen"
Me.txtSendungen.Size = New System.Drawing.Size(32, 26)
Me.txtSendungen.TabIndex = 1
Me.txtSendungen.Text = "1"
Me.txtSendungen.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
'
'pnlSBG
'
Me.pnlSBG.Controls.Add(Me.lblSndFremd)
@@ -408,31 +385,6 @@ Partial Class usrcntlAktDetails
Me.Label21.Text = "1"
Me.Label21.TextAlign = System.Drawing.ContentAlignment.TopRight
'
'txtSndFremd
'
Me.txtSndFremd._DateTimeOnly = False
Me.txtSndFremd._numbersOnly = True
Me.txtSndFremd._numbersOnlyKommastellen = ""
Me.txtSndFremd._Prozent = False
Me.txtSndFremd._ShortDateNew = False
Me.txtSndFremd._ShortDateOnly = False
Me.txtSndFremd._TimeOnly = False
Me.txtSndFremd._value = ""
Me.txtSndFremd._Waehrung = False
Me.txtSndFremd._WaehrungZeichen = True
Me.txtSndFremd.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtSndFremd.ForeColor = System.Drawing.Color.Black
Me.txtSndFremd.Location = New System.Drawing.Point(149, 5)
Me.txtSndFremd.MaxLineLength = -1
Me.txtSndFremd.MaxLines_Warning = ""
Me.txtSndFremd.MaxLines_Warning_Label = Nothing
Me.txtSndFremd.Name = "txtSndFremd"
Me.txtSndFremd.Size = New System.Drawing.Size(32, 26)
Me.txtSndFremd.TabIndex = 83
Me.txtSndFremd.Text = "0"
Me.txtSndFremd.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
Me.txtSndFremd.Visible = False
'
'Label20
'
Me.Label20.AutoSize = True
@@ -460,30 +412,6 @@ Partial Class usrcntlAktDetails
Me.lblFiskde.TabIndex = 6
Me.lblFiskde.Text = "Fiskal DE"
'
'txtSndFiskalDE
'
Me.txtSndFiskalDE._DateTimeOnly = False
Me.txtSndFiskalDE._numbersOnly = True
Me.txtSndFiskalDE._numbersOnlyKommastellen = ""
Me.txtSndFiskalDE._Prozent = False
Me.txtSndFiskalDE._ShortDateNew = False
Me.txtSndFiskalDE._ShortDateOnly = False
Me.txtSndFiskalDE._TimeOnly = False
Me.txtSndFiskalDE._value = ""
Me.txtSndFiskalDE._Waehrung = False
Me.txtSndFiskalDE._WaehrungZeichen = True
Me.txtSndFiskalDE.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtSndFiskalDE.ForeColor = System.Drawing.Color.Black
Me.txtSndFiskalDE.Location = New System.Drawing.Point(16, 34)
Me.txtSndFiskalDE.MaxLineLength = -1
Me.txtSndFiskalDE.MaxLines_Warning = ""
Me.txtSndFiskalDE.MaxLines_Warning_Label = Nothing
Me.txtSndFiskalDE.Name = "txtSndFiskalDE"
Me.txtSndFiskalDE.Size = New System.Drawing.Size(32, 26)
Me.txtSndFiskalDE.TabIndex = 5
Me.txtSndFiskalDE.Text = "0"
Me.txtSndFiskalDE.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
'
'lblFiskAT
'
Me.lblFiskAT.AutoSize = True
@@ -493,30 +421,6 @@ Partial Class usrcntlAktDetails
Me.lblFiskAT.TabIndex = 4
Me.lblFiskAT.Text = "Fiskal AT"
'
'txtSndFiskalAT
'
Me.txtSndFiskalAT._DateTimeOnly = False
Me.txtSndFiskalAT._numbersOnly = True
Me.txtSndFiskalAT._numbersOnlyKommastellen = ""
Me.txtSndFiskalAT._Prozent = False
Me.txtSndFiskalAT._ShortDateNew = False
Me.txtSndFiskalAT._ShortDateOnly = False
Me.txtSndFiskalAT._TimeOnly = False
Me.txtSndFiskalAT._value = ""
Me.txtSndFiskalAT._Waehrung = False
Me.txtSndFiskalAT._WaehrungZeichen = True
Me.txtSndFiskalAT.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtSndFiskalAT.ForeColor = System.Drawing.Color.Black
Me.txtSndFiskalAT.Location = New System.Drawing.Point(16, 5)
Me.txtSndFiskalAT.MaxLineLength = -1
Me.txtSndFiskalAT.MaxLines_Warning = ""
Me.txtSndFiskalAT.MaxLines_Warning_Label = Nothing
Me.txtSndFiskalAT.Name = "txtSndFiskalAT"
Me.txtSndFiskalAT.Size = New System.Drawing.Size(32, 26)
Me.txtSndFiskalAT.TabIndex = 3
Me.txtSndFiskalAT.Text = "0"
Me.txtSndFiskalAT.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
'
'cbxSammelakt
'
Me.cbxSammelakt.AutoSize = True
@@ -653,6 +557,7 @@ Partial Class usrcntlAktDetails
Me.Panel4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.Panel4.BackColor = System.Drawing.Color.PapayaWhip
Me.Panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.Panel4.Controls.Add(Me.cbxVPSplit)
Me.Panel4.Controls.Add(Me.Button15)
Me.Panel4.Controls.Add(Me.btnSendungslisteUNISPED)
Me.Panel4.Controls.Add(Me.cbxAlleFirmen)
@@ -713,7 +618,7 @@ Partial Class usrcntlAktDetails
Me.cbxAlleFirmen.Checked = True
Me.cbxAlleFirmen.CheckState = System.Windows.Forms.CheckState.Checked
Me.cbxAlleFirmen.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cbxAlleFirmen.Location = New System.Drawing.Point(184, 5)
Me.cbxAlleFirmen.Location = New System.Drawing.Point(134, 5)
Me.cbxAlleFirmen.Name = "cbxAlleFirmen"
Me.cbxAlleFirmen.Size = New System.Drawing.Size(76, 17)
Me.cbxAlleFirmen.TabIndex = 111
@@ -768,17 +673,6 @@ Partial Class usrcntlAktDetails
Me.btnKasse_User.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnKasse_User.UseVisualStyleBackColor = False
'
'cboFormulareRgAn
'
Me.cboFormulareRgAn._allowedValuesFreiText = Nothing
Me.cboFormulareRgAn._allowFreiText = False
Me.cboFormulareRgAn._value = ""
Me.cboFormulareRgAn.FormattingEnabled = True
Me.cboFormulareRgAn.Location = New System.Drawing.Point(40, 2)
Me.cboFormulareRgAn.Name = "cboFormulareRgAn"
Me.cboFormulareRgAn.Size = New System.Drawing.Size(88, 21)
Me.cboFormulareRgAn.TabIndex = 108
'
'Label4
'
Me.Label4.AutoSize = True
@@ -853,35 +747,6 @@ Partial Class usrcntlAktDetails
Me.btnKasse_LG.Text = "Dispo.Haft" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(nur T1/T2)"
Me.btnKasse_LG.UseVisualStyleBackColor = False
'
'cbxLZRg
'
Me.cbxLZRg._value = ""
Me.cbxLZRg.AutoSize = True
Me.cbxLZRg.Checked = True
Me.cbxLZRg.Checked_value = False
Me.cbxLZRg.CheckedValue = False
Me.cbxLZRg.CheckState = System.Windows.Forms.CheckState.Checked
Me.cbxLZRg.Location = New System.Drawing.Point(134, 93)
Me.cbxLZRg.Name = "cbxLZRg"
Me.cbxLZRg.Size = New System.Drawing.Size(88, 17)
Me.cbxLZRg.TabIndex = 115
Me.cbxLZRg.Text = "Rechnungen"
Me.cbxLZRg.UseVisualStyleBackColor = True
'
'cbxLZT1
'
Me.cbxLZT1._value = ""
Me.cbxLZT1.AutoSize = True
Me.cbxLZT1.Checked_value = False
Me.cbxLZT1.CheckedValue = False
Me.cbxLZT1.Location = New System.Drawing.Point(223, 93)
Me.cbxLZT1.Name = "cbxLZT1"
Me.cbxLZT1.Size = New System.Drawing.Size(39, 17)
Me.cbxLZT1.TabIndex = 114
Me.cbxLZT1.Text = "T1"
Me.cbxLZT1.UseVisualStyleBackColor = True
Me.cbxLZT1.Visible = False
'
'Button18
'
Me.Button18.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -1847,7 +1712,7 @@ Partial Class usrcntlAktDetails
'
'MitarbeiterAnzeigenToolStripMenuItem
'
Me.MitarbeiterAnzeigenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.mitarbeiter_s
Me.MitarbeiterAnzeigenToolStripMenuItem.Image = CType(resources.GetObject("MitarbeiterAnzeigenToolStripMenuItem.Image"), System.Drawing.Image)
Me.MitarbeiterAnzeigenToolStripMenuItem.Name = "MitarbeiterAnzeigenToolStripMenuItem"
Me.MitarbeiterAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(251, 30)
Me.MitarbeiterAnzeigenToolStripMenuItem.Text = "Mitarbeiter anzeigen"
@@ -1965,6 +1830,154 @@ Partial Class usrcntlAktDetails
Me.btnTV.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnTV.UseVisualStyleBackColor = False
'
'cbxVPSplit
'
Me.cbxVPSplit.AutoSize = True
Me.cbxVPSplit.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cbxVPSplit.Location = New System.Drawing.Point(207, 5)
Me.cbxVPSplit.Name = "cbxVPSplit"
Me.cbxVPSplit.Size = New System.Drawing.Size(51, 17)
Me.cbxVPSplit.TabIndex = 116
Me.cbxVPSplit.Text = "je VP"
Me.cbxVPSplit.UseVisualStyleBackColor = True
'
'txtSendungen
'
Me.txtSendungen._DateTimeOnly = False
Me.txtSendungen._numbersOnly = True
Me.txtSendungen._numbersOnlyKommastellen = ""
Me.txtSendungen._Prozent = False
Me.txtSendungen._ShortDateNew = False
Me.txtSendungen._ShortDateOnly = False
Me.txtSendungen._TimeOnly = False
Me.txtSendungen._value = ""
Me.txtSendungen._Waehrung = False
Me.txtSendungen._WaehrungZeichen = True
Me.txtSendungen.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtSendungen.ForeColor = System.Drawing.Color.Black
Me.txtSendungen.Location = New System.Drawing.Point(22, 17)
Me.txtSendungen.MaxLineLength = -1
Me.txtSendungen.MaxLines_Warning = ""
Me.txtSendungen.MaxLines_Warning_Label = Nothing
Me.txtSendungen.Name = "txtSendungen"
Me.txtSendungen.Size = New System.Drawing.Size(32, 26)
Me.txtSendungen.TabIndex = 1
Me.txtSendungen.Text = "1"
Me.txtSendungen.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
'
'txtSndFremd
'
Me.txtSndFremd._DateTimeOnly = False
Me.txtSndFremd._numbersOnly = True
Me.txtSndFremd._numbersOnlyKommastellen = ""
Me.txtSndFremd._Prozent = False
Me.txtSndFremd._ShortDateNew = False
Me.txtSndFremd._ShortDateOnly = False
Me.txtSndFremd._TimeOnly = False
Me.txtSndFremd._value = ""
Me.txtSndFremd._Waehrung = False
Me.txtSndFremd._WaehrungZeichen = True
Me.txtSndFremd.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtSndFremd.ForeColor = System.Drawing.Color.Black
Me.txtSndFremd.Location = New System.Drawing.Point(149, 5)
Me.txtSndFremd.MaxLineLength = -1
Me.txtSndFremd.MaxLines_Warning = ""
Me.txtSndFremd.MaxLines_Warning_Label = Nothing
Me.txtSndFremd.Name = "txtSndFremd"
Me.txtSndFremd.Size = New System.Drawing.Size(32, 26)
Me.txtSndFremd.TabIndex = 83
Me.txtSndFremd.Text = "0"
Me.txtSndFremd.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
Me.txtSndFremd.Visible = False
'
'txtSndFiskalDE
'
Me.txtSndFiskalDE._DateTimeOnly = False
Me.txtSndFiskalDE._numbersOnly = True
Me.txtSndFiskalDE._numbersOnlyKommastellen = ""
Me.txtSndFiskalDE._Prozent = False
Me.txtSndFiskalDE._ShortDateNew = False
Me.txtSndFiskalDE._ShortDateOnly = False
Me.txtSndFiskalDE._TimeOnly = False
Me.txtSndFiskalDE._value = ""
Me.txtSndFiskalDE._Waehrung = False
Me.txtSndFiskalDE._WaehrungZeichen = True
Me.txtSndFiskalDE.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtSndFiskalDE.ForeColor = System.Drawing.Color.Black
Me.txtSndFiskalDE.Location = New System.Drawing.Point(16, 34)
Me.txtSndFiskalDE.MaxLineLength = -1
Me.txtSndFiskalDE.MaxLines_Warning = ""
Me.txtSndFiskalDE.MaxLines_Warning_Label = Nothing
Me.txtSndFiskalDE.Name = "txtSndFiskalDE"
Me.txtSndFiskalDE.Size = New System.Drawing.Size(32, 26)
Me.txtSndFiskalDE.TabIndex = 5
Me.txtSndFiskalDE.Text = "0"
Me.txtSndFiskalDE.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
'
'txtSndFiskalAT
'
Me.txtSndFiskalAT._DateTimeOnly = False
Me.txtSndFiskalAT._numbersOnly = True
Me.txtSndFiskalAT._numbersOnlyKommastellen = ""
Me.txtSndFiskalAT._Prozent = False
Me.txtSndFiskalAT._ShortDateNew = False
Me.txtSndFiskalAT._ShortDateOnly = False
Me.txtSndFiskalAT._TimeOnly = False
Me.txtSndFiskalAT._value = ""
Me.txtSndFiskalAT._Waehrung = False
Me.txtSndFiskalAT._WaehrungZeichen = True
Me.txtSndFiskalAT.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtSndFiskalAT.ForeColor = System.Drawing.Color.Black
Me.txtSndFiskalAT.Location = New System.Drawing.Point(16, 5)
Me.txtSndFiskalAT.MaxLineLength = -1
Me.txtSndFiskalAT.MaxLines_Warning = ""
Me.txtSndFiskalAT.MaxLines_Warning_Label = Nothing
Me.txtSndFiskalAT.Name = "txtSndFiskalAT"
Me.txtSndFiskalAT.Size = New System.Drawing.Size(32, 26)
Me.txtSndFiskalAT.TabIndex = 3
Me.txtSndFiskalAT.Text = "0"
Me.txtSndFiskalAT.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
'
'cboFormulareRgAn
'
Me.cboFormulareRgAn._allowedValuesFreiText = Nothing
Me.cboFormulareRgAn._allowFreiText = False
Me.cboFormulareRgAn._value = ""
Me.cboFormulareRgAn.FormattingEnabled = True
Me.cboFormulareRgAn.Location = New System.Drawing.Point(40, 2)
Me.cboFormulareRgAn.Name = "cboFormulareRgAn"
Me.cboFormulareRgAn.Size = New System.Drawing.Size(88, 21)
Me.cboFormulareRgAn.TabIndex = 108
'
'cbxLZRg
'
Me.cbxLZRg._value = ""
Me.cbxLZRg.AutoSize = True
Me.cbxLZRg.Checked = True
Me.cbxLZRg.Checked_value = False
Me.cbxLZRg.CheckedValue = False
Me.cbxLZRg.CheckState = System.Windows.Forms.CheckState.Checked
Me.cbxLZRg.Location = New System.Drawing.Point(134, 93)
Me.cbxLZRg.Name = "cbxLZRg"
Me.cbxLZRg.Size = New System.Drawing.Size(88, 17)
Me.cbxLZRg.TabIndex = 115
Me.cbxLZRg.Text = "Rechnungen"
Me.cbxLZRg.UseVisualStyleBackColor = True
'
'cbxLZT1
'
Me.cbxLZT1._value = ""
Me.cbxLZT1.AutoSize = True
Me.cbxLZT1.Checked_value = False
Me.cbxLZT1.CheckedValue = False
Me.cbxLZT1.Location = New System.Drawing.Point(223, 93)
Me.cbxLZT1.Name = "cbxLZT1"
Me.cbxLZT1.Size = New System.Drawing.Size(39, 17)
Me.cbxLZT1.TabIndex = 114
Me.cbxLZT1.Text = "T1"
Me.cbxLZT1.UseVisualStyleBackColor = True
Me.cbxLZT1.Visible = False
'
'usrcntlAktDetails
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!)
@@ -2150,4 +2163,5 @@ Partial Class usrcntlAktDetails
Friend WithEvents Button15 As Button
Friend WithEvents cbxLZRg As VERAG_PROG_ALLGEMEIN.MyCheckbox
Friend WithEvents cbxLZT1 As VERAG_PROG_ALLGEMEIN.MyCheckbox
Friend WithEvents cbxVPSplit As CheckBox
End Class

View File

@@ -212,6 +212,37 @@
rGp33g/w9ql7NoGnXyWw0LUP726+A48ybH5BknCWWY7Lq2TVaSzNVMvnjcLjoYqrHD5NUxOdyqYOtXoR
rY7H4jHYSnSdT2lHL8uwNOUI/FU+hyHGUMfjc2xVDEQxsJvDOOIVCrQdKLqYyNPBKNaFOo4UMPToVZT5
eWpiMRXkm9o//9k=
</value>
</data>
<data name="MitarbeiterAnzeigenToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACMAAAAjCAYAAAAe2bNZAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAXLSURBVFhHzVhncFVFFI69jr33rjOOOjpjL2P54Ywj
AQkKhCIqCIoIKk3AQURaEMShSBsERFCaiKaQ8FJfCkle3oOENBNIQl4qqaS3437nupe99+0LGJzRH1+S
8+3es3tP+XZvAojofwMt6Q/dPT10rLqVfo4vo1HLDtKjExPo2uFRdM2wKP79yMcJNGKph36K9VJxVQt1
dfeIx/S+dNCS/lBZ307rI0to6GI3XTk0kgL6hfrg8sH76K1FGbQ2ooTKatvEY3pfOmhJOxpbOmnmj3n8
9ljwsUlO+vD7LJqzLZ82R5fSbwcq+DfsCWsO0xOfJfK8K4ZE0ozNuVTT2CHc6H2r0JIqwl1VdP+4WHY+
aV02xWbWCFo/V0V8Vg1N+SGHn7trTAztSakQtH6uhJaUmL01n85/I5z6zU0jz5EGQenn9YaDRxtpcEgG
ndM/jKaKzdnHVWhJYPKGHHbwpdhQR5dvIXYKrvZEBxfz9E25nMaw9CoCb5+Lwg/ZVcj+kF77uISWRETw
4EbHMWH6jq+JKKbhSzx0n0jfuQPCOBUAoohuSsmrE9N8n9sS4+01Qj4EagKOERH7GOAubODClBvQ4caR
+6lESID9WWDx7kKeE5pWJUzrmMWobmin29+LpldmpQjT4OqaOjj80I4q0dqJObV0mWhf+wZUXDwogiJE
4VfUtdEmRyk5s2tNf0D/r9N5w+W21jf/ANCacIZFYe9MLKfnpiWZi/ySUEZtHd103d8t7g+InLfGEEfY
FwwMp9HLD1Frezf7Pd7YzjxqDbYE/0CBQqCgI2NXZvIEPHh1sHVRCBnGbnnHYeHtuOltB89Dzan8uFWZ
hGLGGPQIyl1U2ULtncYmeTMIl3wwNb+eB060drE+qM5Whhbx2D3vW3k77hwdw/Og1iqP4s33NvEYpALc
6vBis754M9udZSzhUE55niBaz0w5maKrgiMps6iRfk+tpIuCIkxeh/NEhyGlf5Y1c21I/uzAMPo1+aT4
PTs1iV7/Ks3sWibRpihKhA42gLw+9FG86ejlmUZRvzo71eR6wwvTk3k+BFNy2CReHDwwce1hrqegBS7m
mJSLQl9gA3hIOgEe+CCO8z1tY66F94cxKw6xL5zkksNmdjjLzTUW7ixgXqaVyetHGKGEKMEGkNNL37Sm
A22KMTV9OmADSDO6UeXPCgyl7/YeNdfYlWSMo/tgMymvA9AT2BIboqzdcNu70ZQhRA8FBy1Rx1RgvL65
k+4daxywKlCXaHv4j3RXMwepgM2L6iIj8dKMFIuzF4WNdA1b4rbwEoMWuqi5rcs86XWQ6+zWRebhCb41
I2GvHRyIOAwhASovkVfaxPcXtYuApyYn8hGDqwWUGb4XicMTY3cI1YfNCwZ/4+b6QHXDVoG3UJ1CpcE3
iDSgINUxHJrgMb5M1IY6tjXON+q4H8HHgHnpPMbktngvDZzv4nzChiLizXG6yiJGKtHWOCgxZ7/nOBek
uiBs6BDGC8ub6bU5qWaEkAr4S86t4yMFc9D+8Llun6HsvBkcBegUPLR0zxG+bMsF0HbjV2eZDrCZ+TsK
6AZbGiRwhCB6rgJDySGiiPjdipqj3lb8UcR/44ixKDAKEiKHu618AG+J+yvGARTbkBB90foDoq2KHGpG
Te2D4+O4fqTq8yQJRAWTcI2Qd1ZctE+lK6cC0g+ZgD/Ih4wSRA+chGUz6AJoSeBco6D8tW9fgbaH35Hf
eriW8OkDW8KyGQA3sFvFFQGHmM7hmeJpEWW8sHosSFgMidM9f/oK9UBW4UNIzNqSp3V0psBXh7xg2eFD
qJi3vYAusR2WfcWFQeH0hXhB+xoqtKQKiJj8XO0r8A8CSIPdtx1a0g58ay8QQofi0y3mD49/6iRE91/7
1lYBp7iDfLI+m29yN49y8L0WAolzCRfx5wWPAoXYya+M04WW7A24vO89UMnqDN1AtJ4UaYQwQnE/F58f
SIm8s/wTaMn/BhTwFyTS58zDvQ4BAAAAAElFTkSuQmCC
</value>
</data>
<metadata name="cntxtFormulare.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

View File

@@ -191,6 +191,14 @@ Public Class usrcntlAktDetails
btnVorbereitet.Visible = True
End If
If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("STATUS_Erfasst", Me.FindForm) Then
lblTimeErfasst.Visible = False
btnErfasst.Visible = False
Else
lblTimeErfasst.Visible = True
btnErfasst.Visible = True
End If
'If VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME <> "ADMIN" Then
' tbcntlVermerke.TabPages.Remove(tbAnhang)
'End If
@@ -1037,6 +1045,11 @@ Public Class usrcntlAktDetails
Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
VermerkeDAL.UpdateLKW(myVermerk.AvisoID, False)
Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
sql.doSQL("UPDATE AVISO SET ZOLLDigitalEingereicht=0, LKW_fertig=1 where avisoid=" & AvisoID, "AVISO")
' avisoAktualisierenAktiveIdBehalten(myVermerk.AvisoID)
'Vermerke_aktualisieren()
init = True ' Vermerke_anzeigen(e.RowIndex)
@@ -2655,17 +2668,21 @@ Public Class usrcntlAktDetails
End If
Next
'DIGITALE ABFERTIGUNG:
If (sender Is Button15) Then
'DIGITALE ABFERTIGUNG:
If (sender Is Button15) Or cbxVPSplit.Checked Then ' digital oder splittung --> per Vorpapier
Try
Dim SENDUNG_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cSendungen)
VERAG_PROG_ALLGEMEIN.cSendungen.LOAD_LIST(SENDUNG_LIST, -1, AvisoID) 'LÄDT alle SENDUNGSDATEN
For Each s In SENDUNG_LIST
If If(s.tblSnd_Vorpapier, "") = "" Then
MsgBox("Nicht alle Sendungen haben ein Vorpapier eingetragen!" & vbNewLine & "Laufzettelerstellung wird abgebrochen.")
Exit Sub : pnlDetailsRechts.Cursor = Cursors.Default
End If
Select Case s.tblSnd_Abfertigungsart_ID.ToString
Case "38", "26" 'AT - Keine Prüfung
Case Else
If If(s.tblSnd_Vorpapier, "") = "" Then
MsgBox("Nicht alle Sendungen haben ein Vorpapier eingetragen!" & vbNewLine & "Laufzettelerstellung wird abgebrochen.")
pnlDetailsRechts.Cursor = Cursors.Default : Exit Sub
End If
End Select
Next
AVISO.LOAD_Vorpapiere()
Dim VP_Enum = VERAG_PROG_ALLGEMEIN.cSendungen.VP_Enum(SENDUNG_LIST) 'Filtert nach eindeutigen Vorpapieren
@@ -2675,58 +2692,98 @@ Public Class usrcntlAktDetails
paths.Add(SDL.FormularManagerNEU.LaufzettelZollDE_VP(AvisoID, False,, VP))
Next
Dim outl As New Outlook.Application
Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
Mail = outl.CreateItem(0)
If (sender Is Button15) Then 'NUR BEI DIGITALANMELDUNG!
Select Case AVISO.Grenzstelle
Case "SUB"
Mail.To = "abfertigung.za-suben@zoll.bund.de"
End Select
Dim outl As New Outlook.Application
Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
Mail = outl.CreateItem(0)
Dim tX As New VERAG_PROG_ALLGEMEIN.cTextkonserve("LAUFZETTEL_DIGITAL", "LAUFZETTEL_DE_DIGITAL_SUB", "DE", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
Dim MAIL_SUBJ = tX.txt_betreff.Replace("%LKWKennzeichen%", AVISO.LKW_Nr)
Dim MAIL_BODY = tX.txt_text.Replace("%LKWKennzeichen%", AVISO.LKW_Nr)
Dim tX As VERAG_PROG_ALLGEMEIN.cTextkonserve = Nothing
Select Case AVISO.Grenzstelle
Case "SUB"
Mail.To = "abfertigung.za-suben@zoll.bund.de"
tX = New VERAG_PROG_ALLGEMEIN.cTextkonserve("LAUFZETTEL_DIGITAL", "LAUFZETTEL_DE_DIGITAL_SUB", "DE", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
Case "WAI"
Mail.To = ""
tX = New VERAG_PROG_ALLGEMEIN.cTextkonserve("LAUFZETTEL_DIGITAL", "LAUFZETTEL_DE_DIGITAL_WAI", "DE", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
Case "SBG"
Mail.To = ""
tX = New VERAG_PROG_ALLGEMEIN.cTextkonserve("LAUFZETTEL_DIGITAL", "LAUFZETTEL_DE_DIGITAL_SBG", "DE", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
Case Else
Mail.To = ""
tX = New VERAG_PROG_ALLGEMEIN.cTextkonserve("LAUFZETTEL_DIGITAL", "LAUFZETTEL_DE_DIGITAL_SUB", "DE", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
End Select
addVPList(MAIL_BODY, VP_Enum)
Mail.HTMLBody = "<div style=""font-family:Calibri, Arial"">" & MAIL_BODY & SDL.cFakturierung.getSignature("DE", tX.txt_firmaSig, True) & "</div>"
Mail.Subject = MAIL_SUBJ
Dim MAIL_SUBJ = tx.txt_betreff.Replace("%LKWKennzeichen%", AVISO.LKW_Nr)
Dim MAIL_BODY = tX.txt_text.Replace("%LKWKennzeichen%", AVISO.LKW_Nr)
For Each p In paths
Mail.Attachments.Add(p, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , "Gestellungsliste.pdf")
Next
If loadAttachRg Then
If cbxLZT1.Visible AndAlso cbxLZT1.Checked Then
'Falls CMR, Vorpapier in den Unterlagen vorhanden, werden diese beigefügt
For Each l In ANH_LIST
Select Case l.anh_Art.ToString.ToUpper
Case "VORPAPIER" ', "CMR"
Mail.Attachments.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(l.anh_docId), Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
End Select
Next
addVPList(MAIL_BODY, VP_Enum)
Mail.HTMLBody = "<div style=""font-family:Calibri, Arial"">" & MAIL_BODY & SDL.cFakturierung.getSignature("DE", tX.txt_firmaSig, True, True) & "</div>"
Mail.Subject = MAIL_SUBJ
If VP_Enum.Count > 1 Then
Mail.Subject &= ", " & VP_Enum.Count & "x Vorpapier"
ElseIf VP_Enum.Count = 1 Then
Mail.Subject &= ", " & VP_Enum(0)
End If
If cbxLZRg.Visible AndAlso cbxLZRg.Checked Then
For Each s In SENDUNG_LIST
Select Case s.tblSnd_Abfertigungsart_ID
For Each p In paths
Mail.Attachments.Add(p, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , "Gestellungsliste.pdf")
Next
If loadAttachRg Then
If cbxLZT1.Visible AndAlso cbxLZT1.Checked Then
'Falls CMR, Vorpapier in den Unterlagen vorhanden, werden diese beigefügt
For Each l In ANH_LIST
Select Case l.anh_Art.ToString.ToUpper
Case "VORPAPIER" ', "CMR"
Mail.Attachments.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(l.anh_docId), Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
End Select
Next
End If
If cbxLZRg.Visible AndAlso cbxLZRg.Checked Then
For Each s In SENDUNG_LIST
Select Case s.tblSnd_Abfertigungsart_ID
'Falls RECHNUNGen in den Unterlagen vorhanden, werden diese beigefügt
Case "5", "45", "28" 'T1, Ü-T1, DE-FISK
Dim ANH_LIST_SND As New List(Of VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge)
VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge.LOAD_LIST_BySendung(ANH_LIST_SND, s.tblSnd_SendungID) 'LÄDT alle Aviso-Anhänge
For Each l In ANH_LIST_SND
Select Case l.anh_Art.ToString.ToUpper
Case "RECHNUNG", "HANDELSRECHNUNG"
Mail.Attachments.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(l.anh_docId), Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
End Select
Next
End Select
Next
Case "5", "45", "28", "26", "38" 'T1, Ü-T1, DE-FISK
Dim ANH_LIST_SND As New List(Of VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge)
VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge.LOAD_LIST_BySendung(ANH_LIST_SND, s.tblSnd_SendungID) 'LÄDT alle Aviso-Anhänge
For Each l In ANH_LIST_SND
Select Case l.anh_Art.ToString.ToUpper
Case "RECHNUNG", "HANDELSRECHNUNG"
Mail.Attachments.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(l.anh_docId), Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
End Select
Next
End Select
Next
End If
End If
'Markierte Anhänge
For Each l In ANH_LIST
'Markierte:
If l.anh_GestellungslisteAnfuegen Then
Mail.Attachments.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(l.anh_docId), Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
End If
Next
Mail.Display()
Else 'Keine Digitalabfertigung
Try
If paths.Count = 1 Then '1 Gestellungsliste
Process.Start(paths(0))
ElseIf paths.Count > 0 Then 'Mehrere Gestellungslisten zusammenführen
Dim outputFile As String = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("Gestellungsliste_Merge.pdf", ".pdf", True,, "Merge") ' "result.pdf"
VERAG_PROG_ALLGEMEIN.cFormularManager.mergePDFs(paths, outputFile)
Process.Start(outputFile)
End If
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
End Try
End If
Mail.Display()
Catch ex As Exception
MsgBox("Fehler beim erstellen der E-Mail:" & vbNewLine & ex.Message & ex.StackTrace)