div. Änderungen, etc.
This commit is contained in:
@@ -1400,9 +1400,7 @@ Public Class cAutomailversand
|
||||
End Function
|
||||
|
||||
Private Function setAccountToSend(FIRMA_ID) As String
|
||||
Dim accountToSend = ""
|
||||
|
||||
'ev aus tabelle TBLFIRMA ziehen??! allerdings IMEX nicht korrekt! -> abklären
|
||||
Dim accountToSend = "rechnungsversand@verag.ag" 'default
|
||||
|
||||
Select Case FIRMA_ID
|
||||
|
||||
|
||||
@@ -901,6 +901,11 @@ Public Class frmFaktSammelRgDrucken
|
||||
If IsNumeric(MyDatagridview1.SelectedRows(0).Cells("RechnungsKundenNr").Value) AndAlso IsNumeric(MyDatagridview1.SelectedRows(0).Cells("RechnungsKundenNr").Value) AndAlso IsNumeric(MyDatagridview1.SelectedRows(0).Cells("RechnungsKundenNr").Value) Then
|
||||
Dim dtRE As DataTable
|
||||
Dim SQLString = ""
|
||||
Dim RechnungsNr As Integer = -1
|
||||
If IsNumeric(MyDatagridview1.SelectedRows(0).Cells("RENR").Value) AndAlso IsNumeric(MyDatagridview1.SelectedRows(0).Cells("RENR").Value) AndAlso IsNumeric(MyDatagridview1.SelectedRows(0).Cells("RENR").Value) Then
|
||||
RechnungsNr = MyDatagridview1.SelectedRows(0).Cells("RENR").Value
|
||||
End If
|
||||
|
||||
|
||||
'Dim SQLAUTOMAIL_RECHNUNGSDATuM = ""
|
||||
|
||||
@@ -911,63 +916,63 @@ Public Class frmFaktSammelRgDrucken
|
||||
'End If
|
||||
|
||||
Select Case Sammelrechung
|
||||
Case 6
|
||||
SQLString = "select RK_ID, RechnungsNr, FilialenNr, AbfertigungsNr from Rechnungsausgang where RechnungsKundenNr = " & MyDatagridview1.SelectedRows(0).Cells("RechnungsKundenNr").Value & " AND cast(RechnungsDatum as Date) = '" & txtRechnungsdatum._value & "' AND Sammelrechnung = " & Sammelrechung & " AND ISNULL(Rechnungsausgang.Automailversand,0) = 1 AND Rechnungsausgang.Status IN (2)" & IIf(Firma > 0, " AND Firma_ID =" & Firma, "")
|
||||
Case Else
|
||||
SQLString = "select RK_ID, RechnungsNr, FilialenNr, AbfertigungsNr from Rechnungsausgang where RechnungsKundenNr = " & MyDatagridview1.SelectedRows(0).Cells("RechnungsKundenNr").Value & " AND cast(Abfertigungsdatum as Date) <= '" & txtRechnungsdatum._value & "' AND Sammelrechnung = " & Sammelrechung & " AND ISNULL(Rechnungsausgang.Automailversand,0) = 1 AND Rechnungsausgang.Status IN (2) " & IIf(Firma > 0, " AND Firma_ID =" & Firma, "")
|
||||
Case 6
|
||||
SQLString = "select RK_ID, RechnungsNr, FilialenNr, AbfertigungsNr from Rechnungsausgang where RechnungsKundenNr = " & MyDatagridview1.SelectedRows(0).Cells("RechnungsKundenNr").Value & " AND cast(RechnungsDatum as Date) = '" & txtRechnungsdatum._value & "' AND Sammelrechnung = " & Sammelrechung & " AND ISNULL(Rechnungsausgang.Automailversand,0) = 1 AND Rechnungsausgang.Status IN (2)" & IIf(Firma > 0, " AND Firma_ID =" & Firma, "")
|
||||
Case Else
|
||||
SQLString = "select RK_ID, RechnungsNr, FilialenNr, AbfertigungsNr from Rechnungsausgang where RechnungsKundenNr = " & MyDatagridview1.SelectedRows(0).Cells("RechnungsKundenNr").Value & " AND cast(Abfertigungsdatum as Date) <= '" & txtRechnungsdatum._value & "' AND Sammelrechnung = " & Sammelrechung & " AND ISNULL(Rechnungsausgang.Automailversand,0) = 1 AND Rechnungsausgang.Status IN (2) " & IIf(RechnungsNr > 0, " AND Rechnungsausgang.RechnungsNr =" & RechnungsNr, "") & IIf(Firma > 0, " AND Firma_ID =" & Firma, "")
|
||||
End Select
|
||||
|
||||
dtRE = (New SQL).loadDgvBySql(SQLString, "FMZOLL")
|
||||
dtRE = (New SQL).loadDgvBySql(SQLString, "FMZOLL")
|
||||
|
||||
|
||||
If dtRE.Rows.Count > 0 Then
|
||||
Dim RK_ID As String = ""
|
||||
If dtRE.Rows.Count = 1 Then
|
||||
If dtRE.Rows.Count > 0 Then
|
||||
Dim RK_ID As String = ""
|
||||
If dtRE.Rows.Count = 1 Then
|
||||
|
||||
RK_ID = dtRE.Rows(0).Item("RK_ID")
|
||||
RK_ID = dtRE.Rows(0).Item("RK_ID")
|
||||
|
||||
If RK_ID <> "" AndAlso IsNumeric(RK_ID) Then
|
||||
|
||||
Dim f As New SDL.frmAbrechnungsMaskeEinzeln(RK_ID)
|
||||
f.Show(Me)
|
||||
|
||||
|
||||
End If
|
||||
|
||||
|
||||
Else
|
||||
ContextMenuStrip1.Items.Clear()
|
||||
|
||||
For Each r As DataRow In dtRE.Rows
|
||||
Dim re As ToolStripMenuItem
|
||||
Select Case Sammelrechung
|
||||
Case 6
|
||||
re = New ToolStripMenuItem() With {.Text = r.Item("FilialenNr") & " - " & r.Item("RechnungsNr"), .Name = r.Item("RK_ID"), .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
|
||||
|
||||
Case Else
|
||||
re = New ToolStripMenuItem() With {.Text = r.Item("FilialenNr") & " - " & r.Item("AbfertigungsNr"), .Name = r.Item("RK_ID"), .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
|
||||
|
||||
End Select
|
||||
|
||||
ContextMenuStrip1.Items.Add(re)
|
||||
AddHandler re.Click, AddressOf mnuItem_Clicked
|
||||
|
||||
Next
|
||||
|
||||
|
||||
ContextMenuStrip1.Show(Cursor.Position)
|
||||
|
||||
If RK_ID <> "" AndAlso IsNumeric(RK_ID) Then
|
||||
|
||||
Dim f As New SDL.frmAbrechnungsMaskeEinzeln(RK_ID)
|
||||
f.Show(Me)
|
||||
|
||||
|
||||
End If
|
||||
|
||||
|
||||
Else
|
||||
ContextMenuStrip1.Items.Clear()
|
||||
|
||||
For Each r As DataRow In dtRE.Rows
|
||||
Dim re As ToolStripMenuItem
|
||||
Select Case Sammelrechung
|
||||
Case 6
|
||||
re = New ToolStripMenuItem() With {.Text = r.Item("FilialenNr") & " - " & r.Item("RechnungsNr"), .Name = r.Item("RK_ID"), .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
|
||||
|
||||
Case Else
|
||||
re = New ToolStripMenuItem() With {.Text = r.Item("FilialenNr") & " - " & r.Item("AbfertigungsNr"), .Name = r.Item("RK_ID"), .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
|
||||
|
||||
End Select
|
||||
|
||||
ContextMenuStrip1.Items.Add(re)
|
||||
AddHandler re.Click, AddressOf mnuItem_Clicked
|
||||
|
||||
Next
|
||||
|
||||
|
||||
ContextMenuStrip1.Show(Cursor.Position)
|
||||
|
||||
|
||||
|
||||
|
||||
End If
|
||||
|
||||
|
||||
|
||||
End If
|
||||
|
||||
|
||||
|
||||
End If
|
||||
End If
|
||||
|
||||
|
||||
End Sub
|
||||
|
||||
40
SDL/Fakturierung/frmRechnungenSuche.Designer.vb
generated
40
SDL/Fakturierung/frmRechnungenSuche.Designer.vb
generated
@@ -127,6 +127,7 @@ Partial Class frmRechnungenSuche
|
||||
Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.EVOLOGSammelrechnungAuswählenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.RechnungsReportgEinschränkungenImFilterToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.pnl = New System.Windows.Forms.Panel()
|
||||
Me.btnPDF = New System.Windows.Forms.Button()
|
||||
Me.ctxtRg = New System.Windows.Forms.ContextMenuStrip(Me.components)
|
||||
@@ -142,7 +143,7 @@ Partial Class frmRechnungenSuche
|
||||
Me.pnlTop = New System.Windows.Forms.Panel()
|
||||
Me.PictureBox5 = New System.Windows.Forms.PictureBox()
|
||||
Me.TestToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.RechnungsReportgEinschränkungenImFilterToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.cbxMitPositionen = New System.Windows.Forms.CheckBox()
|
||||
CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
Me.SplitContainer.Panel1.SuspendLayout()
|
||||
Me.SplitContainer.Panel2.SuspendLayout()
|
||||
@@ -1486,6 +1487,7 @@ Partial Class frmRechnungenSuche
|
||||
'pnlOpt
|
||||
'
|
||||
Me.pnlOpt.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
|
||||
Me.pnlOpt.Controls.Add(Me.cbxMitPositionen)
|
||||
Me.pnlOpt.Controls.Add(Me.lblunterschRe)
|
||||
Me.pnlOpt.Controls.Add(Me.Label17)
|
||||
Me.pnlOpt.Controls.Add(Me.txtMaxSrch)
|
||||
@@ -1718,7 +1720,7 @@ Partial Class frmRechnungenSuche
|
||||
Me.MenuStrip1.Location = New System.Drawing.Point(343, 23)
|
||||
Me.MenuStrip1.Name = "MenuStrip1"
|
||||
Me.MenuStrip1.Padding = New System.Windows.Forms.Padding(5, 2, 0, 2)
|
||||
Me.MenuStrip1.Size = New System.Drawing.Size(302, 28)
|
||||
Me.MenuStrip1.Size = New System.Drawing.Size(182, 28)
|
||||
Me.MenuStrip1.TabIndex = 43
|
||||
Me.MenuStrip1.Text = "Kundenauswertungen"
|
||||
'
|
||||
@@ -1737,24 +1739,31 @@ Partial Class frmRechnungenSuche
|
||||
'
|
||||
Me.ToolStripMenuItem1.Image = CType(resources.GetObject("ToolStripMenuItem1.Image"), System.Drawing.Image)
|
||||
Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1"
|
||||
Me.ToolStripMenuItem1.Size = New System.Drawing.Size(376, 26)
|
||||
Me.ToolStripMenuItem1.Size = New System.Drawing.Size(372, 24)
|
||||
Me.ToolStripMenuItem1.Text = "TRANSFERRY/360 (Sammelrechnung auswählen)"
|
||||
'
|
||||
'EVOLOGSammelrechnungAuswählenToolStripMenuItem
|
||||
'
|
||||
Me.EVOLOGSammelrechnungAuswählenToolStripMenuItem.Image = CType(resources.GetObject("EVOLOGSammelrechnungAuswählenToolStripMenuItem.Image"), System.Drawing.Image)
|
||||
Me.EVOLOGSammelrechnungAuswählenToolStripMenuItem.Name = "EVOLOGSammelrechnungAuswählenToolStripMenuItem"
|
||||
Me.EVOLOGSammelrechnungAuswählenToolStripMenuItem.Size = New System.Drawing.Size(376, 26)
|
||||
Me.EVOLOGSammelrechnungAuswählenToolStripMenuItem.Size = New System.Drawing.Size(372, 24)
|
||||
Me.EVOLOGSammelrechnungAuswählenToolStripMenuItem.Text = "EVOLOG (Sammelrechnung auswählen)"
|
||||
'
|
||||
'ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem
|
||||
'
|
||||
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Image = CType(resources.GetObject("ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Image"), System.Drawing.Image)
|
||||
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Name = "ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem"
|
||||
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(376, 26)
|
||||
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(372, 24)
|
||||
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Text = "ZF Friedrichshafen AG (Zeitraum auswählen)"
|
||||
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Visible = False
|
||||
'
|
||||
'RechnungsReportgEinschränkungenImFilterToolStripMenuItem
|
||||
'
|
||||
Me.RechnungsReportgEinschränkungenImFilterToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.Excel_logo
|
||||
Me.RechnungsReportgEinschränkungenImFilterToolStripMenuItem.Name = "RechnungsReportgEinschränkungenImFilterToolStripMenuItem"
|
||||
Me.RechnungsReportgEinschränkungenImFilterToolStripMenuItem.Size = New System.Drawing.Size(372, 24)
|
||||
Me.RechnungsReportgEinschränkungenImFilterToolStripMenuItem.Text = "Rechnungs-Report (Einschränkungen im Filter)"
|
||||
'
|
||||
'pnl
|
||||
'
|
||||
Me.pnl.Controls.Add(Me.btnPDF)
|
||||
@@ -1800,7 +1809,7 @@ Partial Class frmRechnungenSuche
|
||||
Me.btnExcel.BackgroundImage = Global.SDL.My.Resources.Resources.Excel_logo
|
||||
Me.btnExcel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center
|
||||
Me.btnExcel.FlatStyle = System.Windows.Forms.FlatStyle.Flat
|
||||
Me.btnExcel.Location = New System.Drawing.Point(1235, 27)
|
||||
Me.btnExcel.Location = New System.Drawing.Point(1235, 33)
|
||||
Me.btnExcel.Name = "btnExcel"
|
||||
Me.btnExcel.Size = New System.Drawing.Size(41, 34)
|
||||
Me.btnExcel.TabIndex = 3
|
||||
@@ -1815,7 +1824,7 @@ Partial Class frmRechnungenSuche
|
||||
Me.FlatButton7.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.FlatButton7.ForeColor = System.Drawing.Color.Black
|
||||
Me.FlatButton7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
|
||||
Me.FlatButton7.Location = New System.Drawing.Point(1282, 27)
|
||||
Me.FlatButton7.Location = New System.Drawing.Point(1282, 32)
|
||||
Me.FlatButton7.Name = "FlatButton7"
|
||||
Me.FlatButton7.Size = New System.Drawing.Size(41, 34)
|
||||
Me.FlatButton7.TabIndex = 4
|
||||
@@ -1823,7 +1832,7 @@ Partial Class frmRechnungenSuche
|
||||
'
|
||||
'lblErgebnis
|
||||
'
|
||||
Me.lblErgebnis.Location = New System.Drawing.Point(1061, 42)
|
||||
Me.lblErgebnis.Location = New System.Drawing.Point(1061, 49)
|
||||
Me.lblErgebnis.Name = "lblErgebnis"
|
||||
Me.lblErgebnis.Size = New System.Drawing.Size(168, 16)
|
||||
Me.lblErgebnis.TabIndex = 2
|
||||
@@ -1903,12 +1912,16 @@ Partial Class frmRechnungenSuche
|
||||
Me.TestToolStripMenuItem.Size = New System.Drawing.Size(150, 19)
|
||||
Me.TestToolStripMenuItem.Text = "test"
|
||||
'
|
||||
'RechnungsReportgEinschränkungenImFilterToolStripMenuItem
|
||||
'cbxMitPositionen
|
||||
'
|
||||
Me.RechnungsReportgEinschränkungenImFilterToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.Excel_logo
|
||||
Me.RechnungsReportgEinschränkungenImFilterToolStripMenuItem.Name = "RechnungsReportgEinschränkungenImFilterToolStripMenuItem"
|
||||
Me.RechnungsReportgEinschränkungenImFilterToolStripMenuItem.Size = New System.Drawing.Size(376, 26)
|
||||
Me.RechnungsReportgEinschränkungenImFilterToolStripMenuItem.Text = "Rechnungs-Report (Einschränkungen im Filter)"
|
||||
Me.cbxMitPositionen.AutoSize = True
|
||||
Me.cbxMitPositionen.BackColor = System.Drawing.Color.White
|
||||
Me.cbxMitPositionen.Location = New System.Drawing.Point(1232, 15)
|
||||
Me.cbxMitPositionen.Name = "cbxMitPositionen"
|
||||
Me.cbxMitPositionen.Size = New System.Drawing.Size(91, 17)
|
||||
Me.cbxMitPositionen.TabIndex = 41
|
||||
Me.cbxMitPositionen.Text = "mit Positionen"
|
||||
Me.cbxMitPositionen.UseVisualStyleBackColor = False
|
||||
'
|
||||
'frmRechnungenSuche
|
||||
'
|
||||
@@ -2074,4 +2087,5 @@ Partial Class frmRechnungenSuche
|
||||
Friend WithEvents RechnungenOhnePositionenToolStripMenuItem As ToolStripMenuItem
|
||||
Friend WithEvents PictureBox1 As PictureBox
|
||||
Friend WithEvents RechnungsReportgEinschränkungenImFilterToolStripMenuItem As ToolStripMenuItem
|
||||
Friend WithEvents cbxMitPositionen As CheckBox
|
||||
End Class
|
||||
|
||||
@@ -93,6 +93,7 @@ Public Class frmRechnungenSuche
|
||||
|
||||
End With
|
||||
brexitXLS = False
|
||||
cbxMitPositionen.Visible = True
|
||||
Me.Cursor = Cursors.Default
|
||||
End Sub
|
||||
|
||||
@@ -541,16 +542,26 @@ Public Class frmRechnungenSuche
|
||||
|
||||
Me.Cursor = Cursors.WaitCursor
|
||||
|
||||
Dim SQLMitPositionen As String = ""
|
||||
|
||||
|
||||
'cProgramFunctions.genExcelFromDGV_NEW(DataGridView, False)
|
||||
If brexitXLS Then
|
||||
cProgramFunctions.genExcelFromDT_NEW(DataGridView.DataSource, {"J1:J" & (DataGridView.DataSource.Rows.Count + 2), "L1:M" & (DataGridView.DataSource.Rows.Count + 2)},,,, "£")
|
||||
Else
|
||||
Dim sqlstr As String = ""
|
||||
' Dim TopMax = If(IsNumeric(txtMaxSrch.Text), " TOP " & txtMaxSrch.Text, "")
|
||||
sqlstr &= "SELECT RK_ID,[RechnungsNr],cast([RechnungsDatum] as date) RechnungsDatum, Sammelrechnung, [FilialenNr],[AbfertigungsNr],[UnterNr],cast(Abfertigungsdatum as date) Abfertigungsdatum, isnull(cast(RechnungsKundenNr as nvarchar(10)) + ' ','') + [RechnungsName 1] as [RechnungAn], " &
|
||||
sqlstr &= "SELECT Rechnungsausgang.RK_ID,[RechnungsNr],cast([RechnungsDatum] as date) RechnungsDatum, Sammelrechnung, [FilialenNr],[AbfertigungsNr],[UnterNr],cast(Abfertigungsdatum as date) Abfertigungsdatum, isnull(cast(RechnungsKundenNr as nvarchar(10)) + ' ','') + [RechnungsName 1] as [RechnungAn], " &
|
||||
" isnull(cast([AbsenderKundenNr] as nvarchar(10)) + ' ','') + [AbsenderName 1] as Absender,isnull(cast([EmpfängerKundenNr] as nvarchar(10)) + ' ','') + [EmpfängerName 1] as Empfänger, isnull(cast([VermittlerKundenNr] as nvarchar(10)) + ' ','') + [VermittlerName 1] as Vermittler, [LKW Kennzeichen],Sachbearbeiter,[SteuerpflichtigerGesamtbetrag],[SteuerfreierGesamtbetrag] " &
|
||||
" FROM [Rechnungsausgang] WHERE 1=1 "
|
||||
Dim dt = SQL.loadDgvBySql_Param(sqlstr & getRechnungsAusgangWhere() & " ORDER BY Rechnungsdatum, RK_ID", "FMZOLL", , getSpedbuchList)
|
||||
", * FROM [Rechnungsausgang] " & SQLMitPositionen & " WHERE 1=1 "
|
||||
|
||||
If cbxMitPositionen.Checked Then
|
||||
sqlstr = " SELECT Rechnungsausgang.RK_ID,[RechnungsNr],cast([RechnungsDatum] as date) RechnungsDatum, Sammelrechnung, [FilialenNr],[AbfertigungsNr],[UnterNr],cast(Abfertigungsdatum as date) Abfertigungsdatum, isnull(cast(RechnungsKundenNr as nvarchar(10)) + ' ','') + [RechnungsName 1] as [RechnungAn], " &
|
||||
" isnull(cast([AbsenderKundenNr] as nvarchar(10)) + ' ','') + [AbsenderName 1] as Absender,isnull(cast([EmpfängerKundenNr] as nvarchar(10)) + ' ','') + [EmpfängerName 1] as Empfänger, isnull(cast([VermittlerKundenNr] as nvarchar(10)) + ' ','') + [VermittlerName 1] as Vermittler, [LKW Kennzeichen],Sachbearbeiter,[SteuerpflichtigerGesamtbetrag],[SteuerfreierGesamtbetrag], POS.LeistungsNr, POS.LeistungsBez as Bezeichnung, POS.Preis, Pos.Anzahl as Anzahl " &
|
||||
" FROM [Rechnungsausgang] inner join RechnungsausgangPositionen as POS on Rechnungsausgang.RK_ID = POS.RK_ID WHERE 1=1 "
|
||||
End If
|
||||
|
||||
Dim dt = SQL.loadDgvBySql_Param(sqlstr & getRechnungsAusgangWhere() & " ORDER BY Rechnungsausgang.Rechnungsdatum, Rechnungsausgang.RK_ID", "FMZOLL", , getSpedbuchList)
|
||||
|
||||
cProgramFunctions.genExcelFromDT_NEW(dt, {"M1:N" & (DataGridView.DataSource.Rows.Count + 2)})
|
||||
End If
|
||||
@@ -771,6 +782,8 @@ Public Class frmRechnungenSuche
|
||||
|
||||
lblErgebnis.Text = "Ergebnisse: " & .RowCount
|
||||
brexitXLS = True
|
||||
cbxMitPositionen.Checked = False
|
||||
cbxMitPositionen.Visible = False
|
||||
End With
|
||||
End Sub
|
||||
|
||||
|
||||
@@ -87,6 +87,7 @@
|
||||
txtLKWKennz.Text = If(AVISO.LKW_Nr, "")
|
||||
txtUnternehmer.Text = If(AVISO.Frächter, "")
|
||||
cbxLKWWartet.Checked = (AVISO.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_Ankunft)
|
||||
|
||||
End If
|
||||
End Sub
|
||||
|
||||
@@ -130,6 +131,7 @@
|
||||
|
||||
cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG Spedition AG", "AG"))
|
||||
cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG Customs Service GmbH", "CS"))
|
||||
cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG-UNISPED Ltd", "VU"))
|
||||
cboFirma.changeItem("AG")
|
||||
|
||||
initControlsHandler()
|
||||
|
||||
@@ -19,6 +19,7 @@ Public Class usrcntlVorauskasse
|
||||
Dim VK_ID = -1
|
||||
Dim SQL As New SQL
|
||||
Dim serializedData_CBAM As String = ""
|
||||
Dim brexitEnabled As Boolean = False
|
||||
|
||||
|
||||
Sub New()
|
||||
@@ -134,6 +135,8 @@ Public Class usrcntlVorauskasse
|
||||
lblRechnungsbetrag._value = CDbl(SENDUNG.tblSnd_Warenwert)
|
||||
End If
|
||||
|
||||
preSelectFirmaFromAbfertigungsland(SENDUNG.tblSnd_Zollsystem_Land)
|
||||
|
||||
End If
|
||||
If AVISO IsNot Nothing Then
|
||||
txtLKWKennz.Text = If(AVISO.LKW_Nr, "")
|
||||
@@ -143,6 +146,30 @@ Public Class usrcntlVorauskasse
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub preSelectFirmaFromAbfertigungsland(land As String)
|
||||
|
||||
Select Case land
|
||||
Case "DE"
|
||||
If SENDUNG.tblSnd_Abfertigungsart_ID = 65 AndAlso brexitEnabled Then 'cbam
|
||||
cboFirma.changeItem("26")
|
||||
Else
|
||||
cboFirma.changeItem("1")
|
||||
End If
|
||||
|
||||
Case "AT"
|
||||
cboFirma.changeItem("11")
|
||||
Case "UK"
|
||||
If brexitEnabled Then
|
||||
cboFirma.changeItem("26")
|
||||
Else
|
||||
cboFirma.changeItem("1")
|
||||
End If
|
||||
Case Else
|
||||
cboFirma.changeItem("1")
|
||||
End Select
|
||||
|
||||
End Sub
|
||||
|
||||
Public Sub initKdNR(KdNR)
|
||||
If KdNR > 0 Then
|
||||
Me.KdNR = KdNR
|
||||
@@ -261,6 +288,7 @@ Public Class usrcntlVorauskasse
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("BREXIT", "AVISO") Then
|
||||
cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG-UNISPED LTD", "26"))
|
||||
brexitEnabled = True
|
||||
End If
|
||||
|
||||
|
||||
|
||||
@@ -23,12 +23,12 @@ Partial Class usrCntlSpeditionsBuchSuche
|
||||
<System.Diagnostics.DebuggerStepThrough()>
|
||||
Private Sub InitializeComponent()
|
||||
Me.components = New System.ComponentModel.Container()
|
||||
Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
|
||||
Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
|
||||
Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
|
||||
Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
|
||||
Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
|
||||
Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
|
||||
Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
|
||||
Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
|
||||
Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
|
||||
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlSpeditionsBuchSuche))
|
||||
Me.TabPage1 = New System.Windows.Forms.TabPage()
|
||||
Me.cntxtCntxtSpeditionsbuch = New System.Windows.Forms.ContextMenuStrip(Me.components)
|
||||
@@ -53,6 +53,7 @@ Partial Class usrCntlSpeditionsBuchSuche
|
||||
Me.dgvLKW = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
|
||||
Me.pnlOpt = New System.Windows.Forms.Panel()
|
||||
Me.Panel3 = New System.Windows.Forms.Panel()
|
||||
Me.btnnachLeistungsNr = New System.Windows.Forms.Button()
|
||||
Me.Button2 = New System.Windows.Forms.Button()
|
||||
Me.cbxSpedBerichtBar = New System.Windows.Forms.CheckBox()
|
||||
Me.Label31 = New System.Windows.Forms.Label()
|
||||
@@ -87,6 +88,7 @@ Partial Class usrCntlSpeditionsBuchSuche
|
||||
Me.lblKdAusFortschritt = New System.Windows.Forms.Label()
|
||||
Me.MenuStrip1 = New System.Windows.Forms.MenuStrip()
|
||||
Me.KundenauswertungenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.ZFSteyrZeitraumAuswählenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
@@ -216,7 +218,6 @@ Partial Class usrCntlSpeditionsBuchSuche
|
||||
Me.Label45 = New System.Windows.Forms.Label()
|
||||
Me.cboFilialeHandling = New VERAG_PROG_ALLGEMEIN.MyComboBox()
|
||||
Me.SplitContainer = New System.Windows.Forms.SplitContainer()
|
||||
Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.cntxtCntxtSpeditionsbuch.SuspendLayout()
|
||||
Me.pnlRechts.SuspendLayout()
|
||||
Me.pnlAnzeige.SuspendLayout()
|
||||
@@ -461,35 +462,35 @@ Partial Class usrCntlSpeditionsBuchSuche
|
||||
Me.DataGridView.AllowUserToDeleteRows = False
|
||||
Me.DataGridView.AllowUserToOrderColumns = True
|
||||
Me.DataGridView.AllowUserToResizeRows = False
|
||||
DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
|
||||
DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control
|
||||
DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText
|
||||
DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
|
||||
DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
|
||||
DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
|
||||
Me.DataGridView.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
|
||||
DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
|
||||
DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control
|
||||
DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText
|
||||
DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight
|
||||
DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText
|
||||
DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
|
||||
Me.DataGridView.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle7
|
||||
Me.DataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
|
||||
Me.DataGridView.ContextMenuStrip = Me.cntxtCntxtSpeditionsbuch
|
||||
DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
|
||||
DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window
|
||||
DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText
|
||||
DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
|
||||
DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
|
||||
DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
|
||||
Me.DataGridView.DefaultCellStyle = DataGridViewCellStyle2
|
||||
DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
|
||||
DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window
|
||||
DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText
|
||||
DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight
|
||||
DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText
|
||||
DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
|
||||
Me.DataGridView.DefaultCellStyle = DataGridViewCellStyle8
|
||||
Me.DataGridView.Dock = System.Windows.Forms.DockStyle.Fill
|
||||
Me.DataGridView.Location = New System.Drawing.Point(450, 0)
|
||||
Me.DataGridView.Name = "DataGridView"
|
||||
DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
|
||||
DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control
|
||||
DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText
|
||||
DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
|
||||
DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
|
||||
DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
|
||||
Me.DataGridView.RowHeadersDefaultCellStyle = DataGridViewCellStyle3
|
||||
DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
|
||||
DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control
|
||||
DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText
|
||||
DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight
|
||||
DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText
|
||||
DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
|
||||
Me.DataGridView.RowHeadersDefaultCellStyle = DataGridViewCellStyle9
|
||||
Me.DataGridView.Size = New System.Drawing.Size(789, 262)
|
||||
Me.DataGridView.TabIndex = 0
|
||||
'
|
||||
@@ -501,35 +502,35 @@ Partial Class usrCntlSpeditionsBuchSuche
|
||||
Me.dgvLKW.AllowUserToOrderColumns = True
|
||||
Me.dgvLKW.AllowUserToResizeRows = False
|
||||
Me.dgvLKW.BackgroundColor = System.Drawing.Color.WhiteSmoke
|
||||
DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
|
||||
DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control
|
||||
DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText
|
||||
DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
|
||||
DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
|
||||
DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
|
||||
Me.dgvLKW.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4
|
||||
DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
|
||||
DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control
|
||||
DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText
|
||||
DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
|
||||
DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
|
||||
DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
|
||||
Me.dgvLKW.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
|
||||
Me.dgvLKW.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
|
||||
Me.dgvLKW.ContextMenuStrip = Me.cntxtCntxtSpeditionsbuch
|
||||
DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
|
||||
DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window
|
||||
DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText
|
||||
DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
|
||||
DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
|
||||
DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
|
||||
Me.dgvLKW.DefaultCellStyle = DataGridViewCellStyle5
|
||||
DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
|
||||
DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window
|
||||
DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText
|
||||
DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
|
||||
DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
|
||||
DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
|
||||
Me.dgvLKW.DefaultCellStyle = DataGridViewCellStyle2
|
||||
Me.dgvLKW.Dock = System.Windows.Forms.DockStyle.Left
|
||||
Me.dgvLKW.Location = New System.Drawing.Point(0, 0)
|
||||
Me.dgvLKW.Name = "dgvLKW"
|
||||
DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
|
||||
DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control
|
||||
DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText
|
||||
DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
|
||||
DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
|
||||
DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
|
||||
Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle6
|
||||
DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
|
||||
DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control
|
||||
DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText
|
||||
DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
|
||||
DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
|
||||
DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
|
||||
Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle3
|
||||
Me.dgvLKW.Size = New System.Drawing.Size(450, 262)
|
||||
Me.dgvLKW.TabIndex = 35
|
||||
Me.dgvLKW.Visible = False
|
||||
@@ -555,6 +556,7 @@ Partial Class usrCntlSpeditionsBuchSuche
|
||||
'
|
||||
Me.Panel3.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
|
||||
Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
|
||||
Me.Panel3.Controls.Add(Me.btnnachLeistungsNr)
|
||||
Me.Panel3.Controls.Add(Me.Button2)
|
||||
Me.Panel3.Controls.Add(Me.cbxSpedBerichtBar)
|
||||
Me.Panel3.Controls.Add(Me.Label31)
|
||||
@@ -571,6 +573,21 @@ Partial Class usrCntlSpeditionsBuchSuche
|
||||
Me.Panel3.Size = New System.Drawing.Size(386, 186)
|
||||
Me.Panel3.TabIndex = 95
|
||||
'
|
||||
'btnnachLeistungsNr
|
||||
'
|
||||
Me.btnnachLeistungsNr.FlatStyle = System.Windows.Forms.FlatStyle.Flat
|
||||
Me.btnnachLeistungsNr.Image = Global.SDL.My.Resources.Resources.Excel_logo
|
||||
Me.btnnachLeistungsNr.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
|
||||
Me.btnnachLeistungsNr.Location = New System.Drawing.Point(9, 148)
|
||||
Me.btnnachLeistungsNr.Margin = New System.Windows.Forms.Padding(0)
|
||||
Me.btnnachLeistungsNr.Name = "btnnachLeistungsNr"
|
||||
Me.btnnachLeistungsNr.Size = New System.Drawing.Size(127, 32)
|
||||
Me.btnnachLeistungsNr.TabIndex = 94
|
||||
Me.btnnachLeistungsNr.Text = "nach Leistungen"
|
||||
Me.btnnachLeistungsNr.TextAlign = System.Drawing.ContentAlignment.MiddleRight
|
||||
Me.btnnachLeistungsNr.UseVisualStyleBackColor = True
|
||||
Me.btnnachLeistungsNr.Visible = False
|
||||
'
|
||||
'Button2
|
||||
'
|
||||
Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
|
||||
@@ -820,7 +837,7 @@ Partial Class usrCntlSpeditionsBuchSuche
|
||||
Me.btnSpedBuchEinnahmen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
|
||||
Me.btnSpedBuchEinnahmen.Image = Global.SDL.My.Resources.Resources.statistik_small
|
||||
Me.btnSpedBuchEinnahmen.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
|
||||
Me.btnSpedBuchEinnahmen.Location = New System.Drawing.Point(9, 120)
|
||||
Me.btnSpedBuchEinnahmen.Location = New System.Drawing.Point(9, 102)
|
||||
Me.btnSpedBuchEinnahmen.Margin = New System.Windows.Forms.Padding(0)
|
||||
Me.btnSpedBuchEinnahmen.Name = "btnSpedBuchEinnahmen"
|
||||
Me.btnSpedBuchEinnahmen.Size = New System.Drawing.Size(127, 41)
|
||||
@@ -1001,7 +1018,7 @@ Partial Class usrCntlSpeditionsBuchSuche
|
||||
Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KundenauswertungenToolStripMenuItem1})
|
||||
Me.MenuStrip1.Location = New System.Drawing.Point(322, 156)
|
||||
Me.MenuStrip1.Name = "MenuStrip1"
|
||||
Me.MenuStrip1.Size = New System.Drawing.Size(283, 27)
|
||||
Me.MenuStrip1.Size = New System.Drawing.Size(163, 27)
|
||||
Me.MenuStrip1.TabIndex = 89
|
||||
Me.MenuStrip1.Text = "Kundenauswertungen"
|
||||
'
|
||||
@@ -1015,18 +1032,25 @@ Partial Class usrCntlSpeditionsBuchSuche
|
||||
Me.KundenauswertungenToolStripMenuItem1.Size = New System.Drawing.Size(155, 23)
|
||||
Me.KundenauswertungenToolStripMenuItem1.Text = "Kundenauswertungen"
|
||||
'
|
||||
'ToolStripMenuItem3
|
||||
'
|
||||
Me.ToolStripMenuItem3.Image = CType(resources.GetObject("ToolStripMenuItem3.Image"), System.Drawing.Image)
|
||||
Me.ToolStripMenuItem3.Name = "ToolStripMenuItem3"
|
||||
Me.ToolStripMenuItem3.Size = New System.Drawing.Size(308, 24)
|
||||
Me.ToolStripMenuItem3.Text = "Kundenreport (Zeitraum auswählen)"
|
||||
'
|
||||
'ToolStripMenuItem2
|
||||
'
|
||||
Me.ToolStripMenuItem2.Image = CType(resources.GetObject("ToolStripMenuItem2.Image"), System.Drawing.Image)
|
||||
Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2"
|
||||
Me.ToolStripMenuItem2.Size = New System.Drawing.Size(316, 30)
|
||||
Me.ToolStripMenuItem2.Size = New System.Drawing.Size(308, 24)
|
||||
Me.ToolStripMenuItem2.Text = "Kanadevia (Zeitraum auswählen)"
|
||||
'
|
||||
'ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem
|
||||
'
|
||||
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Image = CType(resources.GetObject("ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Image"), System.Drawing.Image)
|
||||
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Name = "ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem"
|
||||
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(316, 30)
|
||||
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(308, 24)
|
||||
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Text = "ZF Passau (Zeitraum auswählen)"
|
||||
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Visible = False
|
||||
'
|
||||
@@ -1034,14 +1058,14 @@ Partial Class usrCntlSpeditionsBuchSuche
|
||||
'
|
||||
Me.ZFSteyrZeitraumAuswählenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.Excel_logo
|
||||
Me.ZFSteyrZeitraumAuswählenToolStripMenuItem.Name = "ZFSteyrZeitraumAuswählenToolStripMenuItem"
|
||||
Me.ZFSteyrZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(316, 30)
|
||||
Me.ZFSteyrZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(308, 24)
|
||||
Me.ZFSteyrZeitraumAuswählenToolStripMenuItem.Text = "ZF Steyr (Zeitraum auswählen)"
|
||||
'
|
||||
'ZFThyrnauZeitraumAuswählenToolStripMenuItem
|
||||
'
|
||||
Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.Excel_logo
|
||||
Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Name = "ZFThyrnauZeitraumAuswählenToolStripMenuItem"
|
||||
Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(316, 30)
|
||||
Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(308, 24)
|
||||
Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Text = "ZF Thyrnau (Zeitraum auswählen)"
|
||||
Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Visible = False
|
||||
'
|
||||
@@ -1049,7 +1073,7 @@ Partial Class usrCntlSpeditionsBuchSuche
|
||||
'
|
||||
Me.AuswertungDiversZeitraumAuswählenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.Excel_logo
|
||||
Me.AuswertungDiversZeitraumAuswählenToolStripMenuItem.Name = "AuswertungDiversZeitraumAuswählenToolStripMenuItem"
|
||||
Me.AuswertungDiversZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(316, 30)
|
||||
Me.AuswertungDiversZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(308, 24)
|
||||
Me.AuswertungDiversZeitraumAuswählenToolStripMenuItem.Text = "Flender Bocholt (Zeitraum auswählen)"
|
||||
Me.AuswertungDiversZeitraumAuswählenToolStripMenuItem.Visible = False
|
||||
'
|
||||
@@ -2993,13 +3017,6 @@ Partial Class usrCntlSpeditionsBuchSuche
|
||||
Me.SplitContainer.SplitterWidth = 2
|
||||
Me.SplitContainer.TabIndex = 3
|
||||
'
|
||||
'ToolStripMenuItem3
|
||||
'
|
||||
Me.ToolStripMenuItem3.Image = CType(resources.GetObject("ToolStripMenuItem3.Image"), System.Drawing.Image)
|
||||
Me.ToolStripMenuItem3.Name = "ToolStripMenuItem3"
|
||||
Me.ToolStripMenuItem3.Size = New System.Drawing.Size(316, 30)
|
||||
Me.ToolStripMenuItem3.Text = "Kundenreport (Zeitraum auswählen)"
|
||||
'
|
||||
'usrCntlSpeditionsBuchSuche
|
||||
'
|
||||
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None
|
||||
@@ -3236,4 +3253,5 @@ Partial Class usrCntlSpeditionsBuchSuche
|
||||
Friend WithEvents FlowLayoutPanel1 As FlowLayoutPanel
|
||||
Friend WithEvents CheckBox5 As CheckBox
|
||||
Friend WithEvents ToolStripMenuItem3 As ToolStripMenuItem
|
||||
Friend WithEvents btnnachLeistungsNr As Button
|
||||
End Class
|
||||
|
||||
@@ -126,6 +126,12 @@
|
||||
<metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>431, 17</value>
|
||||
</metadata>
|
||||
<metadata name="MenuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>546, 17</value>
|
||||
</metadata>
|
||||
<metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>431, 17</value>
|
||||
</metadata>
|
||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<data name="ToolStripMenuItem3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
Imports System.Globalization
|
||||
Imports System.Web.UI.WebControls.Expressions
|
||||
Imports GrapeCity.DataVisualization.TypeScript
|
||||
Imports VERAG_PROG_ALLGEMEIN
|
||||
|
||||
|
||||
@@ -574,6 +576,7 @@ Public Class usrCntlSpeditionsBuchSuche
|
||||
Button21.Visible = True
|
||||
Button16.Visible = True
|
||||
Button17.Visible = True
|
||||
btnnachLeistungsNr.Visible = True
|
||||
ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then
|
||||
pnlBerichte.Visible = True
|
||||
For Each p In pnlBerichte.Controls
|
||||
@@ -3767,7 +3770,7 @@ Public Class usrCntlSpeditionsBuchSuche
|
||||
Dim KdAtrNr = r("KDAuftragsNr")
|
||||
If kdnrsrch = 770931 Then ' Sonderfall Kanadevia
|
||||
If KdAtrNr.ToString.Contains("/") Then
|
||||
KdAtrNr = KdAtrNr.ToString.Split("/")(0) 'nur vorderer Teil nehmen
|
||||
KdAtrNr = KdAtrNr.ToString.split("/")(0) 'nur vorderer Teil nehmen
|
||||
End If
|
||||
End If
|
||||
|
||||
@@ -3820,7 +3823,7 @@ Public Class usrCntlSpeditionsBuchSuche
|
||||
Dim KdAtrNr = r("KDAuftragsNr")
|
||||
If kdnrsrch = 770931 Then ' Sonderfall Kanadevia
|
||||
If KdAtrNr.ToString.Contains("/") Then
|
||||
KdAtrNr = KdAtrNr.ToString.Split("/")(0) 'nur vorderer Teil nehmen
|
||||
KdAtrNr = KdAtrNr.ToString.split("/")(0) 'nur vorderer Teil nehmen
|
||||
End If
|
||||
End If
|
||||
|
||||
@@ -3924,7 +3927,7 @@ Public Class usrCntlSpeditionsBuchSuche
|
||||
Dim KdAtrNr = r("KDAuftragsNr")
|
||||
If kdnrsrch = 770931 Then ' Sonderfall Kanadevia
|
||||
If KdAtrNr.ToString.Contains("/") Then
|
||||
KdAtrNr = KdAtrNr.ToString.Split("/")(0) 'nur vorderer Teil nehmen
|
||||
KdAtrNr = KdAtrNr.ToString.split("/")(0) 'nur vorderer Teil nehmen
|
||||
End If
|
||||
End If
|
||||
|
||||
@@ -3983,7 +3986,47 @@ Public Class usrCntlSpeditionsBuchSuche
|
||||
Me.Cursor = Cursors.Default
|
||||
End Sub
|
||||
|
||||
Function getJahrString() As String
|
||||
getJahrString = ""
|
||||
For j = Now.Year To 2010 Step -1
|
||||
getJahrString &= "[" & j & "],"
|
||||
Next
|
||||
getJahrString = getJahrString.Substring(0, getJahrString.Length - 1)
|
||||
End Function
|
||||
|
||||
Private Sub btnnachLeistungsNr_Click(sender As Object, e As EventArgs) Handles btnnachLeistungsNr.Click
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZOLL_Auswertungen", "SDL") Then
|
||||
Me.Cursor = Cursors.WaitCursor
|
||||
Dim sqlstr As String = ""
|
||||
Dim year As String = "2026"
|
||||
If CDate(txtAbfertDat._value).Year = CDate(txtAbfertDatBis._value).Year Then
|
||||
year = "[" & CDate(txtAbfertDatBis._value).Year.ToString & "]"
|
||||
|
||||
Else
|
||||
year = "[" & CDate(txtAbfertDatBis._value).Year.ToString & "]"
|
||||
year &= "," & "[" & CDate(txtAbfertDatBis._value).Year.ToString & "]"
|
||||
End If
|
||||
sqlstr &= " SELECT * FROM ( SELECT RechnungsKundenNr, KundenNrZentrale,Leistungsnummer, LeistungsBez,YEAR(Speditionsbuch.Abfertigungsdatum) as [Year], ([tblTrdinProduct].[SteuerpflichtigerBetragLokal]+[tblTrdinProduct].[SteuerfreierBetragLokal] )
|
||||
AS [Der Wert] FROM tblTrdinInvoice
|
||||
INNER JOIN (tblTrdinProduct LEFT JOIN Leistungen ON Leistungsnummer = LeistungsNr) ON (tblTrdinInvoice.Rechnungsnummer = tblTrdinProduct.Rechnungsnummer)
|
||||
INNER JOIN Speditionsbuch on Speditionsbuch.FilialenNr = tblTrdinInvoice.FilialenNr and Speditionsbuch.AbfertigungsNr = tblTrdinInvoice.AbfertigungsNr and tblTrdinInvoice.UnterNr = Speditionsbuch.UnterNr
|
||||
AND (tblTrdinInvoice.Rechnungsdatum = tblTrdinProduct.Rechnungsdatum)
|
||||
WHERE 1=1 "
|
||||
sqlstr &= getSpedBuchWhere()
|
||||
sqlstr &= " ) AS Rg PIVOT( SUM([Der Wert]) FOR [Year] IN (" & year & ")) AS MNamePivot order by Leistungsnummer"
|
||||
|
||||
Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL", , getSpedbuchList())
|
||||
|
||||
cProgramFunctions.genExcelFromDT_NEW(dt)
|
||||
Me.Cursor = Cursors.Default
|
||||
|
||||
|
||||
End If
|
||||
|
||||
|
||||
|
||||
End Sub
|
||||
End Class
|
||||
Class cSpeditionsbuchReport
|
||||
|
||||
|
||||
@@ -6,6 +6,8 @@ Public Class rptKundeUebersicht
|
||||
Dim Firma_ID = "1"
|
||||
Dim Firma = "1"
|
||||
Dim KdNr As Integer
|
||||
Dim AufteilungNach As String
|
||||
Dim aufteilungsKnr As New List(Of Integer)
|
||||
|
||||
Sub New(KdNr, Optional Firma_ID = "1", Optional Firma = "VERAG")
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ Public Class subRptLeistungen
|
||||
Dim Kdnr As Integer
|
||||
Dim [Firma_ID] = "1"
|
||||
|
||||
Sub New(Kdnr As Integer, Optional Firma_ID As String = "1")
|
||||
Sub New(Kdnr As Integer, Optional Firma_ID As String = "1", Optional aufteilungNach As String = "", Optional aufteilungsKdNr As Integer = -1)
|
||||
|
||||
' Dieser Aufruf ist f<>r den Designer erforderlich.
|
||||
InitializeComponent()
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
Imports System.Data.OleDb
|
||||
Imports System.IO
|
||||
Imports com.sun.xml.internal.rngom
|
||||
Imports itextsharp.text.pdf
|
||||
Imports jdk.nashorn.internal.objects.annotations
|
||||
Imports MDM_Worker
|
||||
Imports VERAG_PROG_ALLGEMEIN
|
||||
|
||||
@@ -4918,7 +4920,7 @@ LEFT JOIN VERAG.dbo.tbl_IDS_Länder land
|
||||
End Sub
|
||||
|
||||
Sub setBillingDateCompleted(Lieferant_ As String, date_ As Date)
|
||||
SQL.doSQL("UPDATE tblMDMEinarbeitung SET billingdate ='" & date_.ToShortDateString & "' WHERE supplier = '" & Lieferant_ & "' AND billingdate is null ", "FMZOLL")
|
||||
SQL.doSQL("UPDATE tblMDMEinarbeitung SET billingdate ='" & date_.ToShortDateString & "', WHERE supplier = '" & Lieferant_ & "' AND billingdate is null ", "FMZOLL")
|
||||
End Sub
|
||||
|
||||
|
||||
@@ -5545,5 +5547,49 @@ RabattBerechnen:
|
||||
|
||||
Private Sub btnImportdet_Click(sender As Object, e As EventArgs) Handles btnImportdet.Click
|
||||
|
||||
Dim SQLWHere As String = "where 1 = 1 "
|
||||
|
||||
Dim rechnungsdatumVon As Date = Nothing
|
||||
Dim rechnungsdatumBis As Date = Nothing
|
||||
|
||||
Select Case Me.LIEFERANT
|
||||
Case "ASFINAG"
|
||||
rechnungsdatumVon = CDate(DateTimePicker2.Value).AddDays(-1)
|
||||
'SQLWHere = "where cast(invoicedate as Date) = '" & rechnungsdatumVon.ToShortDateString & "' supplier like '" & Me.LIEFERANT & "%' "
|
||||
Case "PLOSE"
|
||||
rechnungsdatumVon = CDate(DateTimePicker2.Value)
|
||||
rechnungsdatumBis = CDate(dat_Sum_Bis.Value)
|
||||
'SQLWHere &= "and cast(invoicedate as Date) between '" & rechnungsdatumVon.ToShortDateString & "' and '" & rechnungsdatumBis.ToShortDateString & "' supplier like '" & Me.LIEFERANT & "%' "
|
||||
Case Else
|
||||
rechnungsdatumVon = CDate(DateTimePicker2.Value)
|
||||
'SQLWHere &= "and cast(invoicedate as Date) = '" & rechnungsdatumVon.ToShortDateString & "' supplier like '" & Me.LIEFERANT & "%' "
|
||||
End Select
|
||||
|
||||
SQLWHere &= " and isnull(billing_completed,0) <> 1 and supplier <> 'UTA_VERAG' "
|
||||
|
||||
Dim sqlStr = "Select [supplier], [completed], sum(ds_total) As DS, sum(ds_count) As DS_importiert FROM [VERAG].[dbo].[tblMDMEinarbeitung]
|
||||
" & SQLWHere & "
|
||||
group by [supplier], completed"
|
||||
|
||||
Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL")
|
||||
|
||||
|
||||
|
||||
|
||||
Using frm As New frmAbrechnungHandling(dt, Nothing, "importierte und nicht abgerechnete Lieferantendaten")
|
||||
|
||||
|
||||
frm.btnPreisliste.Visible = False
|
||||
frm.Button2.Visible = False
|
||||
Button1.Visible = False
|
||||
|
||||
If frm.ShowDialog() = DialogResult.OK Then
|
||||
|
||||
|
||||
End If
|
||||
|
||||
|
||||
End Using
|
||||
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
@@ -2335,8 +2335,9 @@ Public Class usrcntlFakturierung
|
||||
End Select
|
||||
|
||||
If setAbschlossen Then
|
||||
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
|
||||
If SQL.doSQL("Update tblMDMEinarbeitung set billing_completed = 1, billing_completed_user = '" & cAllgemein.USRKURZNAME & "' where cast(billingdate as Date) = '" & rechnungsdatum.ToShortDateString & "' and isnull(billing_completed,0) = 0 ", "FMZOLL") Then
|
||||
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL '
|
||||
'ASFINAG WIRD IMMER 1 Tag SPÄTER verrechnet???!!!
|
||||
If SQL.doSQL("Update tblMDMEinarbeitung set billing_completed = 1, billing_completed_user = '" & cAllgemein.USRKURZNAME & "', billing_completed_datetime = getDate() where (cast(billingdate as Date) = '" & rechnungsdatum.ToShortDateString & "' and isnull(billing_completed,0) = 0) OR (cast(billingdate as Date) = '" & rechnungsdatum.AddDays(1).ToShortDateString & "' and isnull(billing_completed,0) = 0 and supplier = 'ASFINAG') ", "FMZOLL") Then
|
||||
showPic(True, PictureBox11)
|
||||
If rechnungsdatum.Day = Date.DaysInMonth(rechnungsdatum.Year, rechnungsdatum.Month) Then
|
||||
If Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
|
||||
|
||||
Reference in New Issue
Block a user