FKAT: Text bei Guthaben Vk, VG setzen bei DY API, RechnugnsPDF in KD Stamm
This commit is contained in:
@@ -376,16 +376,24 @@ Public Class cFakturierung
|
||||
Else
|
||||
If VK IsNot Nothing AndAlso CDbl(VK.vk_Betrag) > 0 Then
|
||||
If VK.vk_GeldEingetroffen Then ' Wenn 0 dann Fehler
|
||||
If CDbl(VK.vk_Betrag) = CDbl(RECHNUNG.SteuerfreierGesamtbetrag + RECHNUNG.SteuerpflichtigerGesamtbetrag) Then
|
||||
Dim diff As Double = CDbl(VK.vk_Betrag) - CDbl(RECHNUNG.SteuerfreierGesamtbetrag + RECHNUNG.SteuerpflichtigerGesamtbetrag)
|
||||
If diff = 0 Then
|
||||
Select Case RECHNUNG.RechnungSprache
|
||||
Case "EN" : strText = strText & "The invoice amount has already been paid in advance." & vbCrLf
|
||||
Case Else : strText = strText & "Der Rechnungsbetrag wurde bereits per Vorauszahlung beglichen." & vbCrLf
|
||||
End Select
|
||||
Else
|
||||
Select Case RECHNUNG.RechnungSprache
|
||||
Case "EN" : strText = strText & "An advance payment has already been made for this invoice, please transfer the difference." & vbCrLf
|
||||
Case Else : strText = strText & "Zu dieser Rechnung wurde bereits eine Vorauszahlung geleistet, bitte überweisen Sie den Differenzbetrag." & vbCrLf
|
||||
End Select
|
||||
If diff > 0 Then 'Guthaben
|
||||
Select Case RECHNUNG.RechnungSprache
|
||||
Case "EN" : strText = strText & "An advance payment has already been made for this invoice, resulting in a credit balance of " & diff.ToString("C2") & "." & vbCrLf
|
||||
Case Else : strText = strText & "Zu dieser Rechnung wurde bereits eine Vorauszahlung geleistet, daraus ergibt sich ein Guthaben von " & diff.ToString("C2") & "." & vbCrLf
|
||||
End Select
|
||||
Else 'Nachzahlung
|
||||
Select Case RECHNUNG.RechnungSprache
|
||||
Case "EN" : strText = strText & "An advance payment has already been made for this invoice, please transfer the difference." & vbCrLf
|
||||
Case Else : strText = strText & "Zu dieser Rechnung wurde bereits eine Vorauszahlung geleistet, bitte überweisen Sie den Differenzbetrag." & vbCrLf
|
||||
End Select
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
|
||||
67
SDL/Fakturierung/frmRechnungenSuche.Designer.vb
generated
67
SDL/Fakturierung/frmRechnungenSuche.Designer.vb
generated
@@ -119,7 +119,9 @@ Partial Class frmRechnungenSuche
|
||||
Me.EVOLOGSammelrechnungAuswählenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.pnl = New System.Windows.Forms.Panel()
|
||||
Me.Button9 = New System.Windows.Forms.Button()
|
||||
Me.btnPDF = New System.Windows.Forms.Button()
|
||||
Me.ctxtRg = New System.Windows.Forms.ContextMenuStrip(Me.components)
|
||||
Me.DateiHochladenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.btnExcel = New System.Windows.Forms.Button()
|
||||
Me.FlatButton7 = New System.Windows.Forms.Button()
|
||||
Me.lblErgebnis = New System.Windows.Forms.Label()
|
||||
@@ -130,8 +132,6 @@ Partial Class frmRechnungenSuche
|
||||
Me.Label4 = New System.Windows.Forms.Label()
|
||||
Me.pnlTop = New System.Windows.Forms.Panel()
|
||||
Me.TestToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.ctxtRg = New System.Windows.Forms.ContextMenuStrip(Me.components)
|
||||
Me.DateiHochladenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
Me.SplitContainer.Panel1.SuspendLayout()
|
||||
Me.SplitContainer.Panel2.SuspendLayout()
|
||||
@@ -149,8 +149,8 @@ Partial Class frmRechnungenSuche
|
||||
Me.pnlBerichte.SuspendLayout()
|
||||
Me.MenuStrip1.SuspendLayout()
|
||||
Me.pnl.SuspendLayout()
|
||||
Me.pnlTop.SuspendLayout()
|
||||
Me.ctxtRg.SuspendLayout()
|
||||
Me.pnlTop.SuspendLayout()
|
||||
Me.SuspendLayout()
|
||||
'
|
||||
'SplitContainer
|
||||
@@ -1653,27 +1653,41 @@ Partial Class frmRechnungenSuche
|
||||
'
|
||||
'pnl
|
||||
'
|
||||
Me.pnl.Controls.Add(Me.Button9)
|
||||
Me.pnl.Controls.Add(Me.btnPDF)
|
||||
Me.pnl.Dock = System.Windows.Forms.DockStyle.Left
|
||||
Me.pnl.Location = New System.Drawing.Point(0, 0)
|
||||
Me.pnl.Name = "pnl"
|
||||
Me.pnl.Size = New System.Drawing.Size(233, 68)
|
||||
Me.pnl.TabIndex = 5
|
||||
'
|
||||
'Button9
|
||||
'btnPDF
|
||||
'
|
||||
Me.Button9.ContextMenuStrip = Me.ctxtRg
|
||||
Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat
|
||||
Me.Button9.Image = Global.SDL.My.Resources.Resources.pdf1
|
||||
Me.Button9.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
|
||||
Me.Button9.Location = New System.Drawing.Point(16, 4)
|
||||
Me.Button9.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3)
|
||||
Me.Button9.Name = "Button9"
|
||||
Me.Button9.Size = New System.Drawing.Size(105, 57)
|
||||
Me.Button9.TabIndex = 93
|
||||
Me.Button9.Text = "Als PDF"
|
||||
Me.Button9.TextAlign = System.Drawing.ContentAlignment.MiddleRight
|
||||
Me.Button9.UseVisualStyleBackColor = True
|
||||
Me.btnPDF.ContextMenuStrip = Me.ctxtRg
|
||||
Me.btnPDF.Enabled = False
|
||||
Me.btnPDF.FlatStyle = System.Windows.Forms.FlatStyle.Flat
|
||||
Me.btnPDF.Image = Global.SDL.My.Resources.Resources.pdf1
|
||||
Me.btnPDF.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
|
||||
Me.btnPDF.Location = New System.Drawing.Point(16, 4)
|
||||
Me.btnPDF.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3)
|
||||
Me.btnPDF.Name = "btnPDF"
|
||||
Me.btnPDF.Size = New System.Drawing.Size(105, 57)
|
||||
Me.btnPDF.TabIndex = 93
|
||||
Me.btnPDF.Text = "Als PDF"
|
||||
Me.btnPDF.TextAlign = System.Drawing.ContentAlignment.MiddleRight
|
||||
Me.btnPDF.UseVisualStyleBackColor = True
|
||||
'
|
||||
'ctxtRg
|
||||
'
|
||||
Me.ctxtRg.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiHochladenToolStripMenuItem})
|
||||
Me.ctxtRg.Name = "ctxtRg"
|
||||
Me.ctxtRg.Size = New System.Drawing.Size(197, 26)
|
||||
'
|
||||
'DateiHochladenToolStripMenuItem
|
||||
'
|
||||
Me.DateiHochladenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.pdf
|
||||
Me.DateiHochladenToolStripMenuItem.Name = "DateiHochladenToolStripMenuItem"
|
||||
Me.DateiHochladenToolStripMenuItem.Size = New System.Drawing.Size(196, 22)
|
||||
Me.DateiHochladenToolStripMenuItem.Text = "PDF in Zwischenablage"
|
||||
'
|
||||
'btnExcel
|
||||
'
|
||||
@@ -1773,19 +1787,6 @@ Partial Class frmRechnungenSuche
|
||||
Me.TestToolStripMenuItem.Size = New System.Drawing.Size(150, 19)
|
||||
Me.TestToolStripMenuItem.Text = "test"
|
||||
'
|
||||
'ctxtRg
|
||||
'
|
||||
Me.ctxtRg.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiHochladenToolStripMenuItem})
|
||||
Me.ctxtRg.Name = "ctxtRg"
|
||||
Me.ctxtRg.Size = New System.Drawing.Size(197, 48)
|
||||
'
|
||||
'DateiHochladenToolStripMenuItem
|
||||
'
|
||||
Me.DateiHochladenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.pdf
|
||||
Me.DateiHochladenToolStripMenuItem.Name = "DateiHochladenToolStripMenuItem"
|
||||
Me.DateiHochladenToolStripMenuItem.Size = New System.Drawing.Size(196, 22)
|
||||
Me.DateiHochladenToolStripMenuItem.Text = "PDF in Zwischenablage"
|
||||
'
|
||||
'frmRechnungenSuche
|
||||
'
|
||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!)
|
||||
@@ -1821,9 +1822,9 @@ Partial Class frmRechnungenSuche
|
||||
Me.MenuStrip1.ResumeLayout(False)
|
||||
Me.MenuStrip1.PerformLayout()
|
||||
Me.pnl.ResumeLayout(False)
|
||||
Me.ctxtRg.ResumeLayout(False)
|
||||
Me.pnlTop.ResumeLayout(False)
|
||||
Me.pnlTop.PerformLayout()
|
||||
Me.ctxtRg.ResumeLayout(False)
|
||||
Me.ResumeLayout(False)
|
||||
|
||||
End Sub
|
||||
@@ -1932,7 +1933,7 @@ Partial Class frmRechnungenSuche
|
||||
Friend WithEvents Button3 As Button
|
||||
Friend WithEvents Label19 As Label
|
||||
Friend WithEvents cboFirma As VERAG_PROG_ALLGEMEIN.MyComboBox
|
||||
Friend WithEvents Button9 As Button
|
||||
Friend WithEvents btnPDF As Button
|
||||
Friend WithEvents ctxtRg As ContextMenuStrip
|
||||
Friend WithEvents DateiHochladenToolStripMenuItem As ToolStripMenuItem
|
||||
End Class
|
||||
|
||||
@@ -126,12 +126,6 @@
|
||||
<metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>316, 17</value>
|
||||
</metadata>
|
||||
<metadata name="ctxtRg.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>431, 17</value>
|
||||
</metadata>
|
||||
<metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>316, 17</value>
|
||||
</metadata>
|
||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<data name="ToolStripMenuItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
@@ -180,7 +174,7 @@
|
||||
XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
|
||||
fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
|
||||
tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
|
||||
6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEAAACxABrSO9dQAAB3VJREFUSEu9VntQ1NUe
|
||||
6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDgAACw4BQL7hQQAAB3VJREFUSEu9VntQ1NUe
|
||||
/86Uo8VVROUlsrsoBGlyNeURECuwPCXSBG0GAXktr2WX5S0GCob4GEF8XdIGAcP0innTMMsxrczb4A3r
|
||||
ZjpxJ3F0uk5aaioomn7u95zdhQWb+u+eme/8zp45nA/f1+f7oSVNxaRtXUWZLasopiGHslqrKf+dWkrZ
|
||||
UUGR67W0Yn8jVb+3jVJ3rCBNXRpV7GsYW9BaOz1mnTZVXZNclrK93IaN5lTGk0NeECkLNKQwhpHSyN+C
|
||||
@@ -262,7 +256,7 @@
|
||||
XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
|
||||
fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
|
||||
tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
|
||||
6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEAAACxABrSO9dQAAB3VJREFUSEu9VntQ1NUe
|
||||
6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDgAACw4BQL7hQQAAB3VJREFUSEu9VntQ1NUe
|
||||
/86Uo8VVROUlsrsoBGlyNeURECuwPCXSBG0GAXktr2WX5S0GCob4GEF8XdIGAcP0innTMMsxrczb4A3r
|
||||
ZjpxJ3F0uk5aaioomn7u95zdhQWb+u+eme/8zp45nA/f1+f7oSVNxaRtXUWZLasopiGHslqrKf+dWkrZ
|
||||
UUGR67W0Yn8jVb+3jVJ3rCBNXRpV7GsYW9BaOz1mnTZVXZNclrK93IaN5lTGk0NeECkLNKQwhpHSyN+C
|
||||
@@ -344,7 +338,7 @@
|
||||
XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
|
||||
fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
|
||||
tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
|
||||
6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEAAACxABrSO9dQAAB3VJREFUSEu9VntQ1NUe
|
||||
6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDgAACw4BQL7hQQAAB3VJREFUSEu9VntQ1NUe
|
||||
/86Uo8VVROUlsrsoBGlyNeURECuwPCXSBG0GAXktr2WX5S0GCob4GEF8XdIGAcP0innTMMsxrczb4A3r
|
||||
ZjpxJ3F0uk5aaioomn7u95zdhQWb+u+eme/8zp45nA/f1+f7oSVNxaRtXUWZLasopiGHslqrKf+dWkrZ
|
||||
UUGR67W0Yn8jVb+3jVJ3rCBNXRpV7GsYW9BaOz1mnTZVXZNclrK93IaN5lTGk0NeECkLNKQwhpHSyN+C
|
||||
@@ -379,6 +373,9 @@
|
||||
+pba6dFrM1PV1UllydvKbJK3ltKLlYvIQffynwNyXv+PBvofzgNyIxLbwtkAAAAASUVORK5CYII=
|
||||
</value>
|
||||
</data>
|
||||
<metadata name="ctxtRg.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>431, 17</value>
|
||||
</metadata>
|
||||
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
AAABAAEAgIAAAAEAGAAoyAAAFgAAACgAAACAAAAAAAEAAAEAGAAAAAAAAMgAAMQOAADEDgAAAAAAAAAA
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
Imports System.Data.SqlClient
|
||||
Imports TAlex.WPF.Helpers
|
||||
|
||||
Public Class frmRechnungenSuche
|
||||
Dim SQL As New SQL
|
||||
@@ -64,7 +65,7 @@ Public Class frmRechnungenSuche
|
||||
'.Columns("Absender").HeaderText = "Absender"
|
||||
'.Columns("Absender").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
|
||||
|
||||
.Columns("Vermittler").MinimumWidth = 150
|
||||
.Columns("Vermittler").MinimumWidth = 150
|
||||
.Columns("Vermittler").HeaderText = "Auftraggeber"
|
||||
.Columns("Vermittler").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
|
||||
|
||||
@@ -72,7 +73,7 @@ Public Class frmRechnungenSuche
|
||||
'.Columns("Empfänger").HeaderText = "Empfänger"
|
||||
'.Columns("Empfänger").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
|
||||
|
||||
.Columns("LKW Kennzeichen").Width = 120
|
||||
.Columns("LKW Kennzeichen").Width = 120
|
||||
.Columns("LKW Kennzeichen").HeaderText = "LKW Kennzeichen"
|
||||
|
||||
.Columns("Sachbearbeiter").MinimumWidth = 100
|
||||
@@ -182,7 +183,7 @@ Public Class frmRechnungenSuche
|
||||
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KdFrachtfuehrerKdNr", KdFrachtfuehrerKdnr.Text.Replace("*", "%")))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KdFrachtfuehrer", KdFrachtfuehrer.Text.Replace("*", "%")))
|
||||
|
||||
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Datum_von", txtAbfertDat.Text & " 00:00:00"))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Datum_bis", txtAbfertDatBis.Text & " 23:59:59"))
|
||||
If txtAbfertigungsnummerBis.Text <> "" Then
|
||||
@@ -231,7 +232,7 @@ Public Class frmRechnungenSuche
|
||||
cboFiliale.fillWithSQL("SELECT FilialenNr, Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)
|
||||
'ComboBox1.fillWithSQL("SELECT [Abfertigungsart],[Abfertigungsbezeichnung] FROM [Abfertigungsarten] ORDER BY Abfertigungsart ", True, "FMZOLL")
|
||||
MyListBox1.fillWithSQL(" SELECT [Abfertigungsart],[Abfertigungsbezeichnung] FROM [Abfertigungsarten] ORDER BY Abfertigungsart ", , "FMZOLL")
|
||||
Button4.PerformClick()
|
||||
Button4.PerformClick()
|
||||
|
||||
Dim FirmaTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
|
||||
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Then
|
||||
@@ -372,7 +373,7 @@ Public Class frmRechnungenSuche
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub DataGridView_CellContentClick(sender As Object, e As EventArgs) Handles DataGridView.DoubleClick
|
||||
Private Sub DataGridView_CellContentClick(sender As Object, e As EventArgs) Handles DataGridView.DoubleClick, DataGridView.CellContentClick
|
||||
If DataGridView.SelectedRows.Count = 0 Then Exit Sub
|
||||
|
||||
Dim f As New frmKundenUebersichtZollRgDetails(DataGridView.SelectedRows(0).Cells("RK_ID").Value)
|
||||
@@ -806,7 +807,7 @@ Public Class frmRechnungenSuche
|
||||
Return list
|
||||
End Function
|
||||
|
||||
Private Sub Button9_Click_1(sender As Object, e As EventArgs) Handles Button9.Click
|
||||
Private Sub Button9_Click_1(sender As Object, e As EventArgs) Handles btnPDF.Click
|
||||
Me.Cursor = Cursors.WaitCursor
|
||||
Try
|
||||
For Each RK_ID In getList_RK_ID()
|
||||
@@ -841,4 +842,8 @@ Public Class frmRechnungenSuche
|
||||
End Try
|
||||
Me.Cursor = Cursors.Default
|
||||
End Sub
|
||||
|
||||
Private Sub DataGridView_SelectionChanged(sender As Object, e As EventArgs) Handles DataGridView.SelectionChanged
|
||||
btnPDF.Enabled = (DataGridView.SelectedRows.Count > 0)
|
||||
End Sub
|
||||
End Class
|
||||
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
||||
' übernehmen, indem Sie "*" eingeben:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("1.2.2.6")>
|
||||
<Assembly: AssemblyFileVersion("1.2.2.6")>
|
||||
<Assembly: AssemblyVersion("1.2.2.7")>
|
||||
<Assembly: AssemblyFileVersion("1.2.2.7")>
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
Imports DAKOSY_Worker
|
||||
Imports Tamir
|
||||
Imports Tamir.SharpSsh
|
||||
Imports VERAG_PROG_ALLGEMEIN
|
||||
|
||||
Public Class usrCntlATLAS_AES
|
||||
|
||||
@@ -438,6 +439,13 @@ Public Class usrCntlATLAS_AES
|
||||
End If
|
||||
|
||||
DY_ANM.UPDATE_DATA()
|
||||
|
||||
|
||||
|
||||
'Beim Senden soll die Sendung überhnommen + tblSnd_VG_MA gesetzt werden --> damit gleich gesehen wird, dass der Akt in Bearbeitung ist.
|
||||
DY_ANM.UPDATE_AVISO_SND(DY_ANM.dy_SendungsId)
|
||||
|
||||
|
||||
Me.FindForm.Close()
|
||||
End If
|
||||
End Sub
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
Imports Tamir
|
||||
Imports Tamir.SharpSsh
|
||||
Imports Microsoft.Office.Interop
|
||||
Imports VERAG_PROG_ALLGEMEIN
|
||||
|
||||
Public Class usrCntlATLAS_EZA
|
||||
|
||||
@@ -9,7 +10,8 @@ Public Class usrCntlATLAS_EZA
|
||||
Property ADRESSEN As usrCntlATLAS_EZA_Adressen
|
||||
Property POSITIONEN As usrCntlATLAS_EZA_Positionen
|
||||
Property DV1 As usrCntlATLAS_EZA_DV1
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Property Jahr2Stellig As Integer
|
||||
@@ -374,7 +376,7 @@ Public Class usrCntlATLAS_EZA
|
||||
'==> VORBLENDUNG:
|
||||
|
||||
' Dim cdy As New cDakosyEZA
|
||||
cdy.EZA_ObjectName = BezugsNr
|
||||
cdy.eza_ObjectName = BezugsNr
|
||||
' cdy.EZA_AbgangsDienststellennummer = "DE004102"
|
||||
'frmZollanmeldung.setAbgangszollstelle(cdy.eza_Eingangszollstelle, AVISO)
|
||||
frmZollanmeldung.setZollstelle(cdy.eza_AdressierteZollstelle, AVISO)
|
||||
@@ -383,7 +385,7 @@ Public Class usrCntlATLAS_EZA
|
||||
End If
|
||||
|
||||
' cdy.EZA_VersendungsLandCode = "DE"
|
||||
cdy.EZA_dyaArt = cDy_ART
|
||||
cdy.eza_dyaArt = cDy_ART
|
||||
If AVISO IsNot Nothing Then
|
||||
' cdy.EZA_Befoerderungsmittel_KennzeichenAbgang = AVISO.LKW_Nr
|
||||
' cdy.EZA_Befoerderungsmittel_KennzeichenGrenzueberschreitend = "X"
|
||||
@@ -671,7 +673,7 @@ Public Class usrCntlATLAS_EZA
|
||||
|
||||
Sub loadDYZollanmeldungen(Optional Status As String = "") ' + Speichern
|
||||
If DY_ANM Is Nothing Then
|
||||
DY_ANM = New cDakosy_Zollanmeldungen(EZA.EZA_dyaAnmID)
|
||||
DY_ANM = New cDakosy_Zollanmeldungen(EZA.eza_dyaAnmID)
|
||||
End If
|
||||
DY_ANM.dy_ART = ALLG.EZA_ART 'cDy_ART
|
||||
DY_ANM.dy_BezugsNr = BezugsNr
|
||||
@@ -706,11 +708,14 @@ Public Class usrCntlATLAS_EZA
|
||||
Else
|
||||
If SENDUNG IsNot Nothing Then SENDUNG.SET_VGMA() ' MA Vorgeschrieben in Sendung setzen.
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
DY_ANM.UPDATE_DATA()
|
||||
|
||||
'Beim Senden soll die Sendung überhnommen + tblSnd_VG_MA gesetzt werden --> damit gleich gesehen wird, dass der Akt in Bearbeitung ist.
|
||||
DY_ANM.UPDATE_AVISO_SND(DY_ANM.dy_SendungsId)
|
||||
|
||||
|
||||
Me.FindForm.Close()
|
||||
|
||||
@@ -730,10 +735,10 @@ Public Class usrCntlATLAS_EZA
|
||||
|
||||
If EZA IsNot Nothing Then
|
||||
'Dim cDY As New cDakosyEZA(cDyAnm.dy_Id, cDyAnm.dy_Erstellung_SB)
|
||||
EZA.EZA_dyaAnmID = DY_ANM.dy_Id
|
||||
EZA.EZA_Erstellung_SB = DY_ANM.dy_Erstellung_SB
|
||||
EZA.EZA_LetzteBearbeitung = Now
|
||||
EZA.EZA_LetzteBearbeitung_SB = DY_ANM.dy_LetzteBearbeitung_SB
|
||||
EZA.eza_dyaAnmID = DY_ANM.dy_Id
|
||||
EZA.eza_Erstellung_SB = DY_ANM.dy_Erstellung_SB
|
||||
EZA.eza_LetzteBearbeitung = Now
|
||||
EZA.eza_LetzteBearbeitung_SB = DY_ANM.dy_LetzteBearbeitung_SB
|
||||
DAKOSY_Interface_SEND.loadInClass_VersandanmeldungEZA(EZA, Me, DY_ANM)
|
||||
|
||||
If Not EZA.SAVE_ALL() Then
|
||||
|
||||
@@ -580,6 +580,10 @@ Public Class usrCntlATLAS_NCTS
|
||||
End If
|
||||
|
||||
DY_ANM.UPDATE_DATA()
|
||||
|
||||
'Beim Senden soll die Sendung überhnommen + tblSnd_VG_MA gesetzt werden --> damit gleich gesehen wird, dass der Akt in Bearbeitung ist.
|
||||
DY_ANM.UPDATE_AVISO_SND(DY_ANM.dy_SendungsId)
|
||||
|
||||
Me.FindForm.Close()
|
||||
End If
|
||||
Me.Cursor = Cursors.Default
|
||||
|
||||
84
SDL/kunden/frmKundenUebersichtZOLL.Designer.vb
generated
84
SDL/kunden/frmKundenUebersichtZOLL.Designer.vb
generated
@@ -35,12 +35,10 @@ Partial Class frmKundenUebersichtZOLL
|
||||
Me.tabZolltarife = New System.Windows.Forms.TabPage()
|
||||
Me.pnlZollTarife = New System.Windows.Forms.Panel()
|
||||
Me.tabKundendaten = New System.Windows.Forms.TabPage()
|
||||
Me.usrcntlKundenuebersicht = New SDL.usrCntlKundenuebersicht()
|
||||
Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
|
||||
Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.tbcntrKundenDaten = New System.Windows.Forms.TabControl()
|
||||
Me.TabPage1 = New System.Windows.Forms.TabPage()
|
||||
Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte()
|
||||
Me.tbStatistik = New System.Windows.Forms.TabPage()
|
||||
Me.cboKundenblattFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox()
|
||||
Me.Button1 = New System.Windows.Forms.Button()
|
||||
@@ -143,6 +141,11 @@ Partial Class frmKundenUebersichtZOLL
|
||||
Me.PDFLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
|
||||
Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn()
|
||||
Me.ctxtRg = New System.Windows.Forms.ContextMenuStrip(Me.components)
|
||||
Me.DateiHochladenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.btnRgPdf = New System.Windows.Forms.Button()
|
||||
Me.usrcntlKundenuebersicht = New SDL.usrCntlKundenuebersicht()
|
||||
Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte()
|
||||
Me.ContextMenuStrip1.SuspendLayout()
|
||||
Me.tabZolltarife.SuspendLayout()
|
||||
Me.tabKundendaten.SuspendLayout()
|
||||
@@ -167,6 +170,7 @@ Partial Class frmKundenUebersichtZOLL
|
||||
Me.pnlTop.SuspendLayout()
|
||||
CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
Me.ContextMenuStrip3.SuspendLayout()
|
||||
Me.ctxtRg.SuspendLayout()
|
||||
Me.SuspendLayout()
|
||||
'
|
||||
'ContextMenuStrip1
|
||||
@@ -213,17 +217,6 @@ Partial Class frmKundenUebersichtZOLL
|
||||
Me.tabKundendaten.TabIndex = 0
|
||||
Me.tabKundendaten.Text = "Kundendaten"
|
||||
'
|
||||
'usrcntlKundenuebersicht
|
||||
'
|
||||
Me.usrcntlKundenuebersicht.BackColor = System.Drawing.Color.White
|
||||
Me.usrcntlKundenuebersicht.BER_STUFE = 0
|
||||
Me.usrcntlKundenuebersicht.Dock = System.Windows.Forms.DockStyle.Fill
|
||||
Me.usrcntlKundenuebersicht.Location = New System.Drawing.Point(3, 3)
|
||||
Me.usrcntlKundenuebersicht.Margin = New System.Windows.Forms.Padding(2)
|
||||
Me.usrcntlKundenuebersicht.Name = "usrcntlKundenuebersicht"
|
||||
Me.usrcntlKundenuebersicht.Size = New System.Drawing.Size(1176, 691)
|
||||
Me.usrcntlKundenuebersicht.TabIndex = 0
|
||||
'
|
||||
'ContextMenuStrip2
|
||||
'
|
||||
Me.ContextMenuStrip2.ImageScalingSize = New System.Drawing.Size(24, 24)
|
||||
@@ -267,16 +260,6 @@ Partial Class frmKundenUebersichtZOLL
|
||||
Me.TabPage1.TabIndex = 2
|
||||
Me.TabPage1.Text = "Offerte"
|
||||
'
|
||||
'UsrCntlOfferte1
|
||||
'
|
||||
Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White
|
||||
Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill
|
||||
Me.UsrCntlOfferte1.Location = New System.Drawing.Point(3, 3)
|
||||
Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(2)
|
||||
Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1"
|
||||
Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1176, 691)
|
||||
Me.UsrCntlOfferte1.TabIndex = 0
|
||||
'
|
||||
'tbStatistik
|
||||
'
|
||||
Me.tbStatistik.BackColor = System.Drawing.Color.White
|
||||
@@ -851,6 +834,7 @@ Partial Class frmKundenUebersichtZOLL
|
||||
'
|
||||
'MyPanel1
|
||||
'
|
||||
Me.MyPanel1.Controls.Add(Me.btnRgPdf)
|
||||
Me.MyPanel1.Controls.Add(Me.btnMonat)
|
||||
Me.MyPanel1.Controls.Add(Me.Button10)
|
||||
Me.MyPanel1.Controls.Add(Me.Button11)
|
||||
@@ -1412,6 +1396,56 @@ Partial Class frmKundenUebersichtZOLL
|
||||
Me.DataGridViewTextBoxColumn2.HeaderText = "KundenNr"
|
||||
Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2"
|
||||
'
|
||||
'ctxtRg
|
||||
'
|
||||
Me.ctxtRg.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiHochladenToolStripMenuItem})
|
||||
Me.ctxtRg.Name = "ctxtRg"
|
||||
Me.ctxtRg.Size = New System.Drawing.Size(197, 26)
|
||||
'
|
||||
'DateiHochladenToolStripMenuItem
|
||||
'
|
||||
Me.DateiHochladenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.pdf
|
||||
Me.DateiHochladenToolStripMenuItem.Name = "DateiHochladenToolStripMenuItem"
|
||||
Me.DateiHochladenToolStripMenuItem.Size = New System.Drawing.Size(196, 22)
|
||||
Me.DateiHochladenToolStripMenuItem.Text = "PDF in Zwischenablage"
|
||||
'
|
||||
'btnRgPdf
|
||||
'
|
||||
Me.btnRgPdf.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
|
||||
Me.btnRgPdf.ContextMenuStrip = Me.ctxtRg
|
||||
Me.btnRgPdf.FlatStyle = System.Windows.Forms.FlatStyle.Flat
|
||||
Me.btnRgPdf.Image = Global.SDL.My.Resources.Resources.pdf1
|
||||
Me.btnRgPdf.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
|
||||
Me.btnRgPdf.Location = New System.Drawing.Point(1069, 2)
|
||||
Me.btnRgPdf.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3)
|
||||
Me.btnRgPdf.Name = "btnRgPdf"
|
||||
Me.btnRgPdf.Size = New System.Drawing.Size(105, 57)
|
||||
Me.btnRgPdf.TabIndex = 212
|
||||
Me.btnRgPdf.Text = "Als PDF"
|
||||
Me.btnRgPdf.TextAlign = System.Drawing.ContentAlignment.MiddleRight
|
||||
Me.btnRgPdf.UseVisualStyleBackColor = True
|
||||
'
|
||||
'usrcntlKundenuebersicht
|
||||
'
|
||||
Me.usrcntlKundenuebersicht.BackColor = System.Drawing.Color.White
|
||||
Me.usrcntlKundenuebersicht.BER_STUFE = 0
|
||||
Me.usrcntlKundenuebersicht.Dock = System.Windows.Forms.DockStyle.Fill
|
||||
Me.usrcntlKundenuebersicht.Location = New System.Drawing.Point(3, 3)
|
||||
Me.usrcntlKundenuebersicht.Margin = New System.Windows.Forms.Padding(2)
|
||||
Me.usrcntlKundenuebersicht.Name = "usrcntlKundenuebersicht"
|
||||
Me.usrcntlKundenuebersicht.Size = New System.Drawing.Size(1176, 691)
|
||||
Me.usrcntlKundenuebersicht.TabIndex = 0
|
||||
'
|
||||
'UsrCntlOfferte1
|
||||
'
|
||||
Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White
|
||||
Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill
|
||||
Me.UsrCntlOfferte1.Location = New System.Drawing.Point(3, 3)
|
||||
Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(2)
|
||||
Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1"
|
||||
Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1176, 691)
|
||||
Me.UsrCntlOfferte1.TabIndex = 0
|
||||
'
|
||||
'frmKundenUebersichtZOLL
|
||||
'
|
||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||
@@ -1457,6 +1491,7 @@ Partial Class frmKundenUebersichtZOLL
|
||||
Me.pnlTop.PerformLayout()
|
||||
CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
Me.ContextMenuStrip3.ResumeLayout(False)
|
||||
Me.ctxtRg.ResumeLayout(False)
|
||||
Me.ResumeLayout(False)
|
||||
|
||||
End Sub
|
||||
@@ -1573,4 +1608,7 @@ Partial Class frmKundenUebersichtZOLL
|
||||
Friend WithEvents ToolStripMenuItem11 As ToolStripMenuItem
|
||||
Friend WithEvents cboKundenblattFirma As VERAG_PROG_ALLGEMEIN.MyComboBox
|
||||
Friend WithEvents SYSKAÜbertragToolStripMenuItem As ToolStripMenuItem
|
||||
Friend WithEvents btnRgPdf As Button
|
||||
Friend WithEvents ctxtRg As ContextMenuStrip
|
||||
Friend WithEvents DateiHochladenToolStripMenuItem As ToolStripMenuItem
|
||||
End Class
|
||||
|
||||
@@ -123,6 +123,9 @@
|
||||
<metadata name="ContextMenuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>518, 17</value>
|
||||
</metadata>
|
||||
<metadata name="ctxtRg.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>832, 17</value>
|
||||
</metadata>
|
||||
<metadata name="NotifyIcon1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
|
||||
@@ -1252,9 +1252,9 @@ Public Class frmKundenUebersichtZOLL
|
||||
Else
|
||||
|
||||
If If(KUNDE.EORITIN, "") = "" Then
|
||||
MsgBox("Bitte EORI-Nr. eintragen!")
|
||||
Exit Sub
|
||||
End If
|
||||
MsgBox("Bitte EORI-Nr. eintragen!")
|
||||
Exit Sub
|
||||
End If
|
||||
If DAKOSY_Worker.cDakosyFunftions.sendDataByKdNr(KUNDE.KundenNr) Then ' Application.StartupPath & "\Dakosy_SEND\")
|
||||
' init(KUNDE.KundenNr)
|
||||
MsgBox("Daten gesendet!")
|
||||
@@ -1354,4 +1354,62 @@ Public Class frmKundenUebersichtZOLL
|
||||
f.ShowDialog(Me)
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Function getList_RK_ID() As List(Of Integer)
|
||||
Dim listRgNr As New List(Of Integer)
|
||||
Dim list As New List(Of Integer)
|
||||
If dgvRg.SelectedRows.Count > 0 Then
|
||||
For Each r As DataGridViewRow In dgvRg.SelectedRows
|
||||
If listRgNr.FindIndex((Function(x) x.ToString = r.Cells("RechnungsNr").Value)) < 0 Then
|
||||
list.Add(r.Cells("RK_ID").Value)
|
||||
listRgNr.Add(r.Cells("RechnungsNr").Value)
|
||||
End If
|
||||
Next
|
||||
End If
|
||||
Return list
|
||||
End Function
|
||||
|
||||
|
||||
Private Sub Button9_Click(sender As Object, e As EventArgs) Handles btnRgPdf.Click
|
||||
Me.Cursor = Cursors.WaitCursor
|
||||
Try
|
||||
For Each RK_ID In getList_RK_ID()
|
||||
Dim RG_PATH = ""
|
||||
cFakturierung.doRechnungsDruck_SRorER(RK_ID,, False, 4, RG_PATH,,, True)
|
||||
Process.Start(RG_PATH)
|
||||
Next
|
||||
Catch ex As Exception
|
||||
MsgBox(ex.Message & ex.StackTrace)
|
||||
End Try
|
||||
Me.Cursor = Cursors.Default
|
||||
End Sub
|
||||
|
||||
Private Sub DateiHochladenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DateiHochladenToolStripMenuItem.Click
|
||||
Me.Cursor = Cursors.WaitCursor
|
||||
Try
|
||||
|
||||
Dim list As New List(Of String)
|
||||
|
||||
For Each RK_ID In getList_RK_ID()
|
||||
Dim RG_PATH = ""
|
||||
cFakturierung.doRechnungsDruck_SRorER(RK_ID,, False, 4, RG_PATH,,, True)
|
||||
list.Add(RG_PATH)
|
||||
Next
|
||||
|
||||
'Zwischenablage
|
||||
Clipboard.Clear()
|
||||
Dim d As New DataObject(DataFormats.FileDrop, list.ToArray)
|
||||
Clipboard.SetDataObject(d, True)
|
||||
Catch ex As Exception
|
||||
MsgBox(ex.Message & ex.StackTrace)
|
||||
End Try
|
||||
Me.Cursor = Cursors.Default
|
||||
End Sub
|
||||
|
||||
Private Sub dgvrg_SelectionChanged(sender As Object, e As EventArgs) Handles dgvRg.SelectionChanged
|
||||
btnRgPdf.Enabled = (dgvRg.SelectedRows.Count > 0)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
|
||||
|
||||
@@ -175,7 +175,9 @@ Public Class usrCntlKundenuebersicht
|
||||
Try
|
||||
|
||||
tbWeitereKundenDetails.TabPages.Remove(tbUmsatz)
|
||||
tbWeitereKundenDetails.TabPages.Remove(tbOffenePosten)
|
||||
If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OP_LISTE", "SDL") Then
|
||||
tbWeitereKundenDetails.TabPages.Remove(tbOffenePosten)
|
||||
End If
|
||||
tbcntrAllg.TabPages.Remove(tbAvisoMail)
|
||||
tbcntrAllg.TabPages.Remove(tbKdSpez)
|
||||
Catch ex As Exception
|
||||
@@ -272,10 +274,13 @@ Public Class usrCntlKundenuebersicht
|
||||
If ADRESSE IsNot Nothing AndAlso ADRESSE.LandKz = "TR" Then
|
||||
tbWeitereKundenDetails.TabPages.Add(tbUmsatz)
|
||||
tbWeitereKundenDetails.TabPages.Add(tbOffenePosten)
|
||||
ElseIf VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OP_LISTE", "SDL") Then
|
||||
tbWeitereKundenDetails.TabPages.Remove(tbOffenePosten)
|
||||
End If
|
||||
End If
|
||||
|
||||
|
||||
|
||||
initDGVUmsatz()
|
||||
initDGVOffenePosten()
|
||||
initDGVVollmachten()
|
||||
@@ -362,6 +367,10 @@ Public Class usrCntlKundenuebersicht
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
|
||||
If (VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" AndAlso ADRESSE IsNot Nothing AndAlso ADRESSE.LandKz = "TR") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OP_LISTE", "SDL") Then
|
||||
dgvOffenePosten.Visible = True
|
||||
End If
|
||||
Else
|
||||
lblFirma.Visible = False
|
||||
End If
|
||||
|
||||
Reference in New Issue
Block a user