diff --git a/SDL/Fakturierung/frmRechnungenSuche.Designer.vb b/SDL/Fakturierung/frmRechnungenSuche.Designer.vb
index 6759b761..efddf9c8 100644
--- a/SDL/Fakturierung/frmRechnungenSuche.Designer.vb
+++ b/SDL/Fakturierung/frmRechnungenSuche.Designer.vb
@@ -113,7 +113,6 @@ Partial Class frmRechnungenSuche
Me.Label10 = New System.Windows.Forms.Label()
Me.cboBerichtRgAbfArt = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Label31 = New System.Windows.Forms.Label()
- Me.Button8 = New System.Windows.Forms.Button()
Me.MenuStrip1 = New System.Windows.Forms.MenuStrip()
Me.KundenauswertungenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
@@ -132,8 +131,12 @@ Partial Class frmRechnungenSuche
Me.Label22 = New System.Windows.Forms.Label()
Me.Label4 = New System.Windows.Forms.Label()
Me.pnlTop = New System.Windows.Forms.Panel()
- Me.TestToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.PictureBox5 = New System.Windows.Forms.PictureBox()
+ Me.TestToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.MenuStrip2 = New System.Windows.Forms.MenuStrip()
+ Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem()
+ Me.NachZollabfertigungspreisenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainer.Panel1.SuspendLayout()
Me.SplitContainer.Panel2.SuspendLayout()
@@ -154,6 +157,7 @@ Partial Class frmRechnungenSuche
Me.ctxtRg.SuspendLayout()
Me.pnlTop.SuspendLayout()
CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
+ Me.MenuStrip2.SuspendLayout()
Me.SuspendLayout()
'
'SplitContainer
@@ -1535,12 +1539,12 @@ Partial Class frmRechnungenSuche
'
'pnlBerichte
'
+ Me.pnlBerichte.Controls.Add(Me.MenuStrip2)
Me.pnlBerichte.Controls.Add(Me.Button3)
Me.pnlBerichte.Controls.Add(Me.Button1)
Me.pnlBerichte.Controls.Add(Me.Label10)
Me.pnlBerichte.Controls.Add(Me.cboBerichtRgAbfArt)
Me.pnlBerichte.Controls.Add(Me.Label31)
- Me.pnlBerichte.Controls.Add(Me.Button8)
Me.pnlBerichte.Controls.Add(Me.MenuStrip1)
Me.pnlBerichte.Dock = System.Windows.Forms.DockStyle.Left
Me.pnlBerichte.Location = New System.Drawing.Point(233, 0)
@@ -1583,7 +1587,7 @@ Partial Class frmRechnungenSuche
Me.Label10.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.Label10.AutoSize = True
Me.Label10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Label10.Location = New System.Drawing.Point(149, 23)
+ Me.Label10.Location = New System.Drawing.Point(162, 9)
Me.Label10.Name = "Label10"
Me.Label10.Size = New System.Drawing.Size(50, 13)
Me.Label10.TabIndex = 40
@@ -1597,7 +1601,7 @@ Partial Class frmRechnungenSuche
Me.cboBerichtRgAbfArt.DropDownWidth = 250
Me.cboBerichtRgAbfArt.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cboBerichtRgAbfArt.FormattingEnabled = True
- Me.cboBerichtRgAbfArt.Location = New System.Drawing.Point(149, 39)
+ Me.cboBerichtRgAbfArt.Location = New System.Drawing.Point(162, 25)
Me.cboBerichtRgAbfArt.Name = "cboBerichtRgAbfArt"
Me.cboBerichtRgAbfArt.Size = New System.Drawing.Size(50, 22)
Me.cboBerichtRgAbfArt.TabIndex = 39
@@ -1613,21 +1617,6 @@ Partial Class frmRechnungenSuche
Me.Label31.TabIndex = 32
Me.Label31.Text = "Auswertungen:"
'
- 'Button8
- '
- Me.Button8.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
- Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat
- Me.Button8.Image = Global.SDL.My.Resources.Resources.statistik_small
- Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
- Me.Button8.Location = New System.Drawing.Point(9, 22)
- Me.Button8.Margin = New System.Windows.Forms.Padding(0)
- Me.Button8.Name = "Button8"
- Me.Button8.Size = New System.Drawing.Size(137, 39)
- Me.Button8.TabIndex = 5
- Me.Button8.Text = "Bericht nach Rechnungsanschrift"
- Me.Button8.TextAlign = System.Drawing.ContentAlignment.MiddleRight
- Me.Button8.UseVisualStyleBackColor = True
- '
'MenuStrip1
'
Me.MenuStrip1.Dock = System.Windows.Forms.DockStyle.None
@@ -1655,21 +1644,21 @@ 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(372, 24)
+ Me.ToolStripMenuItem1.Size = New System.Drawing.Size(376, 26)
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(372, 24)
+ Me.EVOLOGSammelrechnungAuswählenToolStripMenuItem.Size = New System.Drawing.Size(376, 26)
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(372, 24)
+ Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(376, 26)
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Text = "ZF Friedrichshafen AG (Zeitraum auswählen)"
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Visible = False
'
@@ -1805,12 +1794,6 @@ Partial Class frmRechnungenSuche
Me.pnlTop.Size = New System.Drawing.Size(1327, 48)
Me.pnlTop.TabIndex = 0
'
- 'TestToolStripMenuItem
- '
- Me.TestToolStripMenuItem.Name = "TestToolStripMenuItem"
- Me.TestToolStripMenuItem.Size = New System.Drawing.Size(150, 19)
- Me.TestToolStripMenuItem.Text = "test"
- '
'PictureBox5
'
Me.PictureBox5.BackgroundImage = Global.SDL.My.Resources.Resources.fragezeichen
@@ -1821,6 +1804,49 @@ Partial Class frmRechnungenSuche
Me.PictureBox5.TabIndex = 133
Me.PictureBox5.TabStop = False
'
+ 'TestToolStripMenuItem
+ '
+ Me.TestToolStripMenuItem.Name = "TestToolStripMenuItem"
+ Me.TestToolStripMenuItem.Size = New System.Drawing.Size(150, 19)
+ Me.TestToolStripMenuItem.Text = "test"
+ '
+ 'MenuStrip2
+ '
+ Me.MenuStrip2.Dock = System.Windows.Forms.DockStyle.None
+ Me.MenuStrip2.ImageScalingSize = New System.Drawing.Size(20, 20)
+ Me.MenuStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem2})
+ Me.MenuStrip2.Location = New System.Drawing.Point(3, 27)
+ Me.MenuStrip2.Name = "MenuStrip2"
+ Me.MenuStrip2.Padding = New System.Windows.Forms.Padding(5, 2, 0, 2)
+ Me.MenuStrip2.Size = New System.Drawing.Size(143, 28)
+ Me.MenuStrip2.TabIndex = 45
+ Me.MenuStrip2.Text = "Kundenauswertungen"
+ '
+ 'ToolStripMenuItem2
+ '
+ Me.ToolStripMenuItem2.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+ Me.ToolStripMenuItem2.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem3, Me.NachZollabfertigungspreisenToolStripMenuItem})
+ Me.ToolStripMenuItem2.Font = New System.Drawing.Font("Segoe UI", 10.0!)
+ Me.ToolStripMenuItem2.ForeColor = System.Drawing.Color.White
+ Me.ToolStripMenuItem2.Image = Global.SDL.My.Resources.Resources.statistik_small
+ Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2"
+ Me.ToolStripMenuItem2.Size = New System.Drawing.Size(136, 24)
+ Me.ToolStripMenuItem2.Text = "RE-Auswertung"
+ '
+ 'ToolStripMenuItem3
+ '
+ Me.ToolStripMenuItem3.Image = Global.SDL.My.Resources.Resources.statistik_small
+ Me.ToolStripMenuItem3.Name = "ToolStripMenuItem3"
+ Me.ToolStripMenuItem3.Size = New System.Drawing.Size(260, 26)
+ Me.ToolStripMenuItem3.Text = "Nach Rechnungsanschrift"
+ '
+ 'NachZollabfertigungspreisenToolStripMenuItem
+ '
+ Me.NachZollabfertigungspreisenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.Excel_logo
+ Me.NachZollabfertigungspreisenToolStripMenuItem.Name = "NachZollabfertigungspreisenToolStripMenuItem"
+ Me.NachZollabfertigungspreisenToolStripMenuItem.Size = New System.Drawing.Size(276, 26)
+ Me.NachZollabfertigungspreisenToolStripMenuItem.Text = "Nach Zollabf.-preisen (LNr: 340)"
+ '
'frmRechnungenSuche
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!)
@@ -1860,6 +1886,8 @@ Partial Class frmRechnungenSuche
Me.pnlTop.ResumeLayout(False)
Me.pnlTop.PerformLayout()
CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit()
+ Me.MenuStrip2.ResumeLayout(False)
+ Me.MenuStrip2.PerformLayout()
Me.ResumeLayout(False)
End Sub
@@ -1927,7 +1955,6 @@ Partial Class frmRechnungenSuche
Friend WithEvents Button5 As System.Windows.Forms.Button
Friend WithEvents btnExcel As System.Windows.Forms.Button
Friend WithEvents pnlBerichte As System.Windows.Forms.Panel
- Friend WithEvents Button8 As System.Windows.Forms.Button
Friend WithEvents Label31 As System.Windows.Forms.Label
Friend WithEvents pnl As System.Windows.Forms.Panel
Friend WithEvents Label33 As System.Windows.Forms.Label
@@ -1973,4 +2000,8 @@ Partial Class frmRechnungenSuche
Friend WithEvents DateiHochladenToolStripMenuItem As ToolStripMenuItem
Friend WithEvents lblunterschRe As Label
Friend WithEvents PictureBox5 As PictureBox
+ Friend WithEvents MenuStrip2 As MenuStrip
+ Friend WithEvents ToolStripMenuItem2 As ToolStripMenuItem
+ Friend WithEvents ToolStripMenuItem3 As ToolStripMenuItem
+ Friend WithEvents NachZollabfertigungspreisenToolStripMenuItem As ToolStripMenuItem
End Class
diff --git a/SDL/Fakturierung/frmRechnungenSuche.resx b/SDL/Fakturierung/frmRechnungenSuche.resx
index 2bac4988..4d075e41 100644
--- a/SDL/Fakturierung/frmRechnungenSuche.resx
+++ b/SDL/Fakturierung/frmRechnungenSuche.resx
@@ -123,8 +123,8 @@
17, 17
-
- 316, 17
+
+ 518, 17
316, 17
@@ -177,39 +177,40 @@
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
- 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
+ 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
+ AElFTkSuQmCC
@@ -259,39 +260,40 @@
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
- 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
+ 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
+ AElFTkSuQmCC
@@ -341,39 +343,40 @@
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
- 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
+ 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
+ AElFTkSuQmCC
diff --git a/SDL/Fakturierung/frmRechnungenSuche.vb b/SDL/Fakturierung/frmRechnungenSuche.vb
index 94c303b3..fbf196d2 100644
--- a/SDL/Fakturierung/frmRechnungenSuche.vb
+++ b/SDL/Fakturierung/frmRechnungenSuche.vb
@@ -567,69 +567,8 @@ Public Class frmRechnungenSuche
''Me.Cursor = Cursors.Default
End Sub
- Private Sub Button8_Click(sender As Object, e As EventArgs) Handles Button8.Click
- If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZOLL_Auswertungen", Me) Then
+ Private Sub Button8_Click(sender As Object, e As EventArgs)
- Dim sqlstr As String = ""
- sqlstr &= " SELECT COUNT(*) as Anzahl,RechnungsKundenNr,[RechnungsName 1] as RechnungAn,isnull(max(RechnungsLandKz),'') as RechnungsLandKz,isnull(max(RechnungsOrt),'') as RechnungsOrt,isnull(max(RechnungsStraße),'') as RechnungsStraße"
- sqlstr &= " FROM [Rechnungsausgang] INNER JOIN Speditionsbuch on Speditionsbuch.FilialenNr=Rechnungsausgang.FilialenNr and Speditionsbuch.AbfertigungsNr=Rechnungsausgang.AbfertigungsNr and Speditionsbuch.UnterNr=Rechnungsausgang.UnterNr"
- sqlstr &= " WHERE 1=1"
- sqlstr &= getRechnungsAusgangWhere().Replace("Rechnungsausgang.[Avisierer", "Speditionsbuch.[Avisierer")
- If cboBerichtRgAbfArt._value <> "" Then sqlstr &= " AND Speditionsbuch.Abfertigungsart=" & cboBerichtRgAbfArt._value
- sqlstr &= " group by RechnungsKundenNr, [RechnungsName 1]"
- sqlstr &= " order by COUNT(*) desc,[RechnungsName 1]"
-
-
- If cboBerichtRgAbfArt._value <> "" Then
-
- End If
- Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL", , getSpedbuchList())
- 'DataGridView.DataSource = dt
-
-
- Dim print As New frmPrintLayout
- print.Text = "Rechnungsempfänger Bericht"
-
- Dim rpt As New rptFaktRechnungAn
-
- rpt.DataSource = dt
-
- 'cProgramFunctions.genExcelFromDT_NEW(DataGridView.DataSource)
-
- If rpt.DataSource.rows.count = 0 Then
- rpt.Dispose() : print.Dispose()
- MsgBox("Keine Daten vorhanden!")
- Exit Sub
- End If
-
- Dim sum = 0
- rpt.lblUeberschrift.Text = "Rechnungsanschrift Bericht " & txtAbfertDat.Text & " bis " & txtAbfertDatBis.Text
- rpt.lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
- 'rpt.lblMandantNiederlassung.Text = PERSONAL.Mandant & " / " & PERSONAL.Niederlassung
-
- 'Dim cnt As Integer = 0
- rpt.lblDat.Text = Now.ToLongDateString
- Dim sumAnz As Double = 0
- For Each r In dt.Rows
- If r("Anzahl") Then sumAnz += r("Anzahl")
- Next
- rpt.lblGesAnzahl.Text = sumAnz
- AddHandler rpt.Detail.Format, Sub()
- rpt.lblAnzahl.Text = rpt.Fields.Item("Anzahl").Value
- rpt.lblKdNr.Text = rpt.Fields.Item("RechnungsKundenNr").Value
- rpt.lblRechnungsAn.Text = rpt.Fields.Item("RechnungAn").Value
- rpt.lblRechnungsadresse.Text = rpt.Fields.Item("RechnungsOrt").Value
- If IsNumeric(rpt.Fields.Item("Anzahl").Value) Then
- rpt.lblPercent.Text = CDbl(CDbl(rpt.Fields.Item("Anzahl").Value) / sumAnz).ToString("P1")
- Else
- rpt.lblPercent.Text = ""
- End If
- End Sub
-
- print.Viewer.LoadDocument(rpt)
- print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous
- print.Show()
- End If
End Sub
Private Sub Button9_Click(sender As Object, e As EventArgs)
@@ -885,4 +824,106 @@ Public Class frmRechnungenSuche
Dim webAddress As String = "https://wiki.verag.ag/de/abteilungen/verrechnung/xxxx"
Process.Start(webAddress)
End Sub
+
+ Private Sub ToolStripMenuItem3_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem3.Click
+ If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZOLL_Auswertungen", Me) Then
+
+ Dim sqlstr As String = ""
+ sqlstr &= " SELECT COUNT(*) as Anzahl,RechnungsKundenNr,[RechnungsName 1] as RechnungAn,isnull(max(RechnungsLandKz),'') as RechnungsLandKz,isnull(max(RechnungsOrt),'') as RechnungsOrt,isnull(max(RechnungsStraße),'') as RechnungsStraße"
+ sqlstr &= " FROM [Rechnungsausgang] INNER JOIN Speditionsbuch on Speditionsbuch.FilialenNr=Rechnungsausgang.FilialenNr and Speditionsbuch.AbfertigungsNr=Rechnungsausgang.AbfertigungsNr and Speditionsbuch.UnterNr=Rechnungsausgang.UnterNr"
+ sqlstr &= " WHERE 1=1"
+ sqlstr &= getRechnungsAusgangWhere().Replace("Rechnungsausgang.[Avisierer", "Speditionsbuch.[Avisierer")
+ If cboBerichtRgAbfArt._value <> "" Then sqlstr &= " AND Speditionsbuch.Abfertigungsart=" & cboBerichtRgAbfArt._value
+ sqlstr &= " group by RechnungsKundenNr, [RechnungsName 1]"
+ sqlstr &= " order by COUNT(*) desc,[RechnungsName 1]"
+
+
+ If cboBerichtRgAbfArt._value <> "" Then
+
+ End If
+ Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL", , getSpedbuchList())
+ 'DataGridView.DataSource = dt
+
+
+ Dim print As New frmPrintLayout
+ print.Text = "Rechnungsempfänger Bericht"
+
+ Dim rpt As New rptFaktRechnungAn
+
+ rpt.DataSource = dt
+
+ 'cProgramFunctions.genExcelFromDT_NEW(DataGridView.DataSource)
+
+ If rpt.DataSource.rows.count = 0 Then
+ rpt.Dispose() : print.Dispose()
+ MsgBox("Keine Daten vorhanden!")
+ Exit Sub
+ End If
+
+ Dim sum = 0
+ rpt.lblUeberschrift.Text = "Rechnungsanschrift Bericht " & txtAbfertDat.Text & " bis " & txtAbfertDatBis.Text
+ rpt.lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
+ 'rpt.lblMandantNiederlassung.Text = PERSONAL.Mandant & " / " & PERSONAL.Niederlassung
+
+ 'Dim cnt As Integer = 0
+ rpt.lblDat.Text = Now.ToLongDateString
+ Dim sumAnz As Double = 0
+ For Each r In dt.Rows
+ If r("Anzahl") Then sumAnz += r("Anzahl")
+ Next
+ rpt.lblGesAnzahl.Text = sumAnz
+ AddHandler rpt.Detail.Format, Sub()
+ rpt.lblAnzahl.Text = rpt.Fields.Item("Anzahl").Value
+ rpt.lblKdNr.Text = rpt.Fields.Item("RechnungsKundenNr").Value
+ rpt.lblRechnungsAn.Text = rpt.Fields.Item("RechnungAn").Value
+ rpt.lblRechnungsadresse.Text = rpt.Fields.Item("RechnungsOrt").Value
+ If IsNumeric(rpt.Fields.Item("Anzahl").Value) Then
+ rpt.lblPercent.Text = CDbl(CDbl(rpt.Fields.Item("Anzahl").Value) / sumAnz).ToString("P1")
+ Else
+ rpt.lblPercent.Text = ""
+ End If
+ End Sub
+
+ print.Viewer.LoadDocument(rpt)
+ print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous
+ print.Show()
+ End If
+ End Sub
+
+ Private Sub NachZollabfertigungspreisenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles NachZollabfertigungspreisenToolStripMenuItem.Click
+
+ If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZOLL_Auswertungen", Me) Then
+
+ Dim sqlstr As String = ""
+ sqlstr &= " SELECT COUNT(distinct(RechnungsNr)) as Anzahl,isnull(max(Offertenpositionen.Preis),0) as AbfKosten, MAX(Offertenpositionen.OffertenNr) as OffertenNr, RechnungsKundenNr,[RechnungsName 1] as RechnungAn,isnull(max(RechnungsLandKz),'') as RechnungsLandKz,isnull(max(RechnungsOrt),'') as RechnungsOrt,isnull(max(RechnungsStraße),'')as RechnungsStraße "
+ sqlstr &= " FROM [Rechnungsausgang] INNER JOIN RechnungsausgangPositionen on [Rechnungsausgang].RK_ID = RechnungsausgangPositionen.RK_ID INNER JOIN Speditionsbuch on Speditionsbuch.FilialenNr=Rechnungsausgang.FilialenNr and Speditionsbuch.AbfertigungsNr=Rechnungsausgang.AbfertigungsNr and Speditionsbuch.UnterNr=Rechnungsausgang.UnterNr LEFT JOIN Offertenpositionen on Offertenpositionen.KundenNr = RechnungsKundenNr and (Offertenpositionen.OffertenNr = 1 or Offertenpositionen.OffertenNr = 38)"
+ sqlstr &= " WHERE 1=1"
+ sqlstr &= getRechnungsAusgangWhere().Replace("Rechnungsausgang.[Avisierer", "Speditionsbuch.[Avisierer")
+ If cboBerichtRgAbfArt._value <> "" Then sqlstr &= " AND Speditionsbuch.Abfertigungsart=" & cboBerichtRgAbfArt._value & " And RechnungsausgangPositionen.LeistungsNr = 340"
+ sqlstr &= " group by RechnungsKundenNr, [RechnungsName 1] "
+ sqlstr &= " order by isnull(max(Offertenpositionen.Preis),0) desc,[RechnungsName 1]"
+
+ If cboBerichtRgAbfArt._value <> "" Then
+
+ End If
+ Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL", , getSpedbuchList())
+
+ Dim print As New frmPrintLayout
+ print.Text = "Zollabfertigungspreise Bericht"
+
+ Dim rpt As New rptFaktRechnungAn
+
+
+
+ If dt.Rows.Count = 0 Then
+ MsgBox("Keine Daten vorhanden!")
+ Exit Sub
+ End If
+
+ cProgramFunctions.genExcelFromDT_NEW(dt,,,,,, False)
+
+ End If
+
+
+ End Sub
End Class
\ No newline at end of file
diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb
index 3a843056..9ca8d08d 100644
--- a/SDL/My Project/AssemblyInfo.vb
+++ b/SDL/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
'
-
-
+
+
diff --git a/SDL/mdm/usrcntlFremdrechnungen.vb b/SDL/mdm/usrcntlFremdrechnungen.vb
index e52f2d13..9a996853 100644
--- a/SDL/mdm/usrcntlFremdrechnungen.vb
+++ b/SDL/mdm/usrcntlFremdrechnungen.vb
@@ -51,10 +51,7 @@ Public Class usrcntlFremdrechnungen
kdNr_WHERE = ""
End If
If kdNr_filter Then
- 'Dim dt As DataTable = SQL.loadDgvBySql("SELECT KundenSDL.SDLNr FROM KundenSDL INNER JOIN [Speditionsdienstleistungen] as S ON s.SDLNr=KundenSDL.sdlnr WHERE s.SDLTypNr IN (1,2) AND KundenSDL.KundenNr = '" & kdNr & "' group by KundenSDL.SDLNr ")
- 'If dt Is Nothing Then
- ' MsgBox("Es wurden noch keine Leistungen freigeschaltet.")
- 'Else
+
btnSDL_IDS.Visible = True ' dt.Select("SDLNr=100").Count > 0
btnSDL_UTA.Visible = True 'dt.Select("SDLNr=212").Count > 0
btnSDL_Hugo.Visible = False ' dt.Select("SDLNr=213").Count > 0
@@ -263,7 +260,7 @@ Public Class usrcntlFremdrechnungen
--RMC
SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'RMC' as Lieferant, [rmc_reDatum] as Rechnungsdatum,cast([rmc_reNr] as nvarchar) as Rechnungsnummer,rmc_kdNr as Kundennummer ,[rmc_betragBrutto] as Bruttobetrag,[rmc_betragNetto] as Nettobetrag,[rmc_betragMWST] as MWST, rmc_landKZ as Land, 'RE' as Art, [rmc_daId] as daId, cast(case when [rmc_daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM [VERAG].[dbo].[tblRMCImport] inner join Adressen on Adressen.WölflKundenNr = rmc_kdNr where 1 = 1 " & IIf(kdNr > 0, " AND AdressenNr=" & kdNr, "") & " and [rmc_reDatum] " & setSQLWhere(SDLNrTmp, "rmc_landKZ") & " order by rmc_reDatum, rmc_reNr
- ) as temp order by Rechnungsdatum desc"
+ ) as temp where 1=1 and temp.Rechnungsdatum" & setSQLWhere(SDLNrTmp, "temp.Land", True) & " order by Rechnungsdatum desc"
@@ -314,16 +311,42 @@ Public Class usrcntlFremdrechnungen
setPDFImages()
End Sub
- Private Function setSQLWhere(SDLNrTmp As Integer, land As String) As String
+ Private Function setSQLWhere(SDLNrTmp As Integer, land As String, Optional alle As Boolean = False) As String
Dim SQLWhere = " between '" & dat_Sum_Von.Value.ToShortDateString & "' and '" & dat_Sum_Bis.Value.ToShortDateString & "'"
If cbx.Checked AndAlso SDLNrTmp <> 100 AndAlso KUNDE IsNot Nothing Then
- Select Case KUNDE.LandKz
- Case "SRB", "BIH", "MK", "MNE", "TR"
- If land <> "" Then SQLWhere &= " AND " & land & " not in('AT','CH', 'CZ', 'DE', 'EE', 'ES', 'IE', 'LT', 'LV', 'NRW', 'NO', 'OT', 'RS', 'UA', " & IIf(KUNDE.LandKz = "SRB", "'BG', 'HU', 'RO', 'SI', 'SK'", "") & IIf(KUNDE.LandKz = "BIH", "'SK'", "") & IIf(KUNDE.LandKz = "TR", "'HU', 'SI', 'SK'", "") & IIf(KUNDE.LandKz = "MNE", "'PL', 'SI'", "") & IIf(KUNDE.LandKz = "MK", "'BG', 'PL','SI'", "") & ")"
+
+ 'ORIGINAL-RECHNUNG senden wenn:
+ '1. wenn die Rechnung in dem Land in dem er ansässig ist ausgestellt wurde (rumän. Kunde – Rechnung ausgestellt in Rumänien = z.B. IDS in RO getankt…)
+ If land <> "" Then SQLWhere &= " AND " & land & " not in ('" & KUNDE.LandKz & "')"
+
+ '2. wenn die Rechnung die Summe NULL aufweist
+
+ Select Case SDLNrTmp
+ Case 212 And Not alle : SQLWhere &= " AND Gesamtbetrag_Brutto_in_Darstellwährung <> 0" 'UTA
+ Case 214 And Not alle : SQLWhere &= " AND plInv_Bruttobetrag <> 0" 'PLOSE
+ Case 502 And Not alle : SQLWhere &= " AND (tblTrdinInvoice.SteuerpflichtigerBetragLokal + tblTrdinInvoice.SteuerfreierBetragLokal) <> 0" 'VERAG
+ Case 208 And Not alle : SQLWhere &= " AND total_amount_euro <> 0" 'MSE
+ Case 999 And Not alle : SQLWhere &= " AND rmc_betragBrutto <> 0" 'RMC
+ Case -1 And alle : SQLWhere &= " AND temp.Nettobetrag <> 0" 'ALLE
End Select
+
+ '3. Rechnungen der Länder in denen der Kunde keine MWST erstattet bekommt
+
+
+
+ '4. Rechnungen der Länder, in denen der Kunde selber MWST beantragt
+
+
+ 'nicht NOTWENDIG!
+ 'Select Case KUNDE.LandKz
+ ' Case "SRB", "BIH", "MK", "MNE", "TR"
+ ' If land <> "" Then SQLWhere &= " AND " & land & " not in('AT','CH', 'CZ', 'DE', 'EE', 'ES', 'IE', 'LT', 'LV', 'NRW', 'NO', 'OT', 'RS', 'UA', " & IIf(KUNDE.LandKz = "SRB", "'BG', 'HU', 'RO', 'SI', 'SK'", "") & IIf(KUNDE.LandKz = "BIH", "'SK'", "") & IIf(KUNDE.LandKz = "TR", "'HU', 'SI', 'SK'", "") & IIf(KUNDE.LandKz = "MNE", "'PL', 'SI'", "") & IIf(KUNDE.LandKz = "MK", "'BG', 'PL','SI'", "") & ")"
+ 'End Select
+
+
End If
Return SQLWhere