diff --git a/SDL/Classes/cFiskaltrustClient_chilkat.vb b/SDL/Classes/cFiskaltrustClient_chilkat.vb index ef1de0e9..a9ff87db 100644 --- a/SDL/Classes/cFiskaltrustClient_chilkat.vb +++ b/SDL/Classes/cFiskaltrustClient_chilkat.vb @@ -432,7 +432,7 @@ Public Class cFiskaltrustClient_chilkat Dim receiptCaseValue As Long - If _receiptCase = "Storno" Then + If _receiptCase = ReceiptCaseIntern.STORNO Then ' Neue Referenz für den Stornobeleg json.UpdateString("cbReceiptReference", Guid.NewGuid().ToString()) @@ -444,6 +444,7 @@ Public Class cFiskaltrustClient_chilkat Else receiptCaseValue = FtReceiptCases.PosReceipt Or FtReceiptCases.ReversalReceipt Or FtReceiptCases.FailedReceipt Or FtReceiptCases.ImplicitTransaction End If + json.UpdateString("cbUser", VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME) ElseIf _receiptCase = ReceiptCaseIntern.WIEDERHOLUNG Then @@ -456,7 +457,7 @@ Public Class cFiskaltrustClient_chilkat receiptCaseValue = FtReceiptCases.PosReceipt Or FtReceiptCases.ReceiptRequest ' Kasseneinzahlung (ohne Positionen) / Kassenauszahlung (ohne Positionen) - ElseIf (_receiptCase = ReceiptCaseIntern.EINGANG OrElse _receiptCase = ReceiptCaseIntern.AUSGANG) AndAlso POS.Count = 0 Then + ElseIf (_receiptCase = ReceiptCaseIntern.EINGANG OrElse _receiptCase = ReceiptCaseIntern.AUSGANG) Then kindOfPayment = PayItemCasesIntern.Kasseneinzahlungen_Auszahlungen json.UpdateString("cbReceiptReference", Guid.NewGuid().ToString()) @@ -482,6 +483,7 @@ Public Class cFiskaltrustClient_chilkat json.UpdateString("ftReceiptCase", receiptCaseValue.ToString()) + Dim chargeItems = json.AppendArray("cbChargeItems") If POS.Count > 0 Then @@ -495,7 +497,7 @@ Public Class cFiskaltrustClient_chilkat Dim unitPrice As Double = p.Preis Dim lineAmount As Double = p.Betrag - 'bei Storno negieren (BEI DE nur einen Teil)! + 'bei Storno negieren (BEI DE nur einen Teil)! -> im V1 Beispiel sind beide negativ!!! 'To cancel a receipt, resend it with this flag added to the ftReceiptCase and inverse the cbPayItems OR cbChargeItems (This is not the same behavior as described in the general part — in Germany, this flag requires only one of cbPayItems or cbChargeItems to be negative, and both must not be negative at the same time)' 'https://docs.fiskaltrust.cloud/docs/poscreators/middleware-doc/germany/reference-tables/ftreceiptcase @@ -535,11 +537,32 @@ Public Class cFiskaltrustClient_chilkat End If + + Dim paidAmount As Double = amount + Dim paidQuantity As Integer = 1 + + 'bei Storno negieren (BEI DE nur einen Teil)! -> im V1 Beispiel sind beide negativ!!! + 'To cancel a receipt, resend it with this flag added to the ftReceiptCase and inverse the cbPayItems OR cbChargeItems (This is not the same behavior as described in the general part — in Germany, this flag requires only one of cbPayItems or cbChargeItems to be negative, and both must not be negative at the same time)' + 'https://docs.fiskaltrust.cloud/docs/poscreators/middleware-doc/germany/reference-tables/ftreceiptcase + + If PayItemCasesIntern.Kasseneinzahlungen_Auszahlungen Then + + End If + + + + If _receiptCase = ReceiptCaseIntern.STORNO Then + paidAmount = paidAmount * -1 + paidQuantity = paidQuantity * -1 + End If + + + Dim payItems = json.AppendArray("cbPayItems") payItems.AddObjectAt(-1) Dim pay As Chilkat.JsonObject = payItems.ObjectAt(payItems.Size - 1) - pay.UpdateInt("Quantity", 1) - pay.UpdateNumber("Amount", amount.ToString().Replace(",", ".")) + pay.UpdateInt("Quantity", paidQuantity) + pay.UpdateNumber("Amount", paidAmount) Dim Description As String = "" Select Case kindOfPayment diff --git a/SDL/kunden/Newsletter/frmNewsletter.Designer.vb b/SDL/kunden/Newsletter/frmNewsletter.Designer.vb index 2a94f416..bb53f2a2 100644 --- a/SDL/kunden/Newsletter/frmNewsletter.Designer.vb +++ b/SDL/kunden/Newsletter/frmNewsletter.Designer.vb @@ -53,6 +53,7 @@ Partial Class frmNewsletter Me.EmpfängerName = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.ListBox1 = New System.Windows.Forms.ListBox() Me.Label8 = New System.Windows.Forms.Label() + Me.Button8 = New System.Windows.Forms.Button() CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -290,6 +291,7 @@ Partial Class frmNewsletter Me.MyDatagridview1.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.Email, Me.EmailCC, Me.EmailBCC, Me.EmpfängerTitel, Me.EmpfängerName}) Me.MyDatagridview1.Location = New System.Drawing.Point(892, 119) Me.MyDatagridview1.Name = "MyDatagridview1" + Me.MyDatagridview1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.MyDatagridview1.Size = New System.Drawing.Size(537, 498) Me.MyDatagridview1.TabIndex = 0 ' @@ -338,6 +340,15 @@ Partial Class frmNewsletter Me.Label8.TabIndex = 24 Me.Label8.Text = "Anhänge:" ' + 'Button8 + ' + Me.Button8.Location = New System.Drawing.Point(1230, 90) + Me.Button8.Name = "Button8" + Me.Button8.Size = New System.Drawing.Size(105, 23) + Me.Button8.TabIndex = 25 + Me.Button8.Text = "aus Clipboard imp." + Me.Button8.UseVisualStyleBackColor = True + ' 'frmNewsletter ' Me.AllowDrop = True @@ -345,6 +356,7 @@ Partial Class frmNewsletter Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White Me.ClientSize = New System.Drawing.Size(1441, 720) + Me.Controls.Add(Me.Button8) Me.Controls.Add(Me.Label8) Me.Controls.Add(Me.ListBox1) Me.Controls.Add(Me.MyTextBox2) @@ -408,4 +420,5 @@ Partial Class frmNewsletter Friend WithEvents EmpfängerName As DataGridViewTextBoxColumn Friend WithEvents ListBox1 As ListBox Friend WithEvents Label8 As Label + Friend WithEvents Button8 As Button End Class diff --git a/SDL/kunden/Newsletter/frmNewsletter.vb b/SDL/kunden/Newsletter/frmNewsletter.vb index b951c360..364e11e8 100644 --- a/SDL/kunden/Newsletter/frmNewsletter.vb +++ b/SDL/kunden/Newsletter/frmNewsletter.vb @@ -14,12 +14,12 @@ Public Class frmNewsletter Try ProgressBar1.Minimum = 0 - ProgressBar1.Maximum = MyDatagridview1.SelectedRows.Count + ProgressBar1.Maximum = MyDataGridView1.SelectedRows.Count ProgressBar1.Value = 0 ProgressBar1.Visible = True ProgressBar1.Style = ProgressBarStyle.Continuous - If MyDatagridview1.SelectedRows.Count = 0 Then + If MyDataGridView1.SelectedRows.Count = 0 Then MsgBox("Bitte mindestens einen Eintrag auswählen.") Exit Sub End If @@ -29,10 +29,10 @@ Public Class frmNewsletter Dim Absender = getAbsender() Dim Subject = getSubject() - If MsgBox("Wirklich " & MyDatagridview1.SelectedRows.Count & " Mails senden?", vbYesNoCancel) = vbYes Then + If MsgBox("Wirklich " & MyDataGridView1.SelectedRows.Count & " Mails senden?", vbYesNoCancel) = vbYes Then VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Absender, Subject, mailText, Absender,, False, "", "", ANHAENGE) - For Each row As DataGridViewRow In MyDatagridview1.SelectedRows + For Each row As DataGridViewRow In MyDataGridView1.SelectedRows Dim mail As String = getValidEmail(If(row.Cells("Email").Value, "").ToString()) Dim mailCC As String = getValidEmail(If(row.Cells("EmailCC").Value, "").ToString()) Dim mailBCC As String = getValidEmail(If(row.Cells("EmailBCC").Value, "").ToString()) @@ -305,18 +305,343 @@ Public Class frmNewsletter End Sub Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click - MyDatagridview1.Rows.Clear() + MyDataGridView1.Rows.Clear() End Sub Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click - MyDatagridview1.SelectAll() + MyDataGridView1.SelectAll() End Sub Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click - MyDatagridview1.ClearSelection() + MyDataGridView1.ClearSelection() + End Sub + + Private Sub MyDatagridview1_KeyDown(sender As Object, e As KeyEventArgs) Handles MyDataGridView1.KeyDown + If e.Control AndAlso e.KeyCode = Keys.C Then + CopyEntireDGV() + e.SuppressKeyPress = True + + ElseIf e.Control AndAlso e.KeyCode = Keys.V Then + PasteIntoDGV() + e.SuppressKeyPress = True + End If + End Sub + Private Sub CopyEntireDGV() + + Dim sb As New Text.StringBuilder() + + 'Headers + For col As Integer = 0 To MyDataGridView1.ColumnCount - 1 + If col > 0 Then sb.Append(vbTab) + + sb.Append(MyDataGridView1.Columns(col).HeaderText) + Next + + sb.AppendLine() + + 'All rows + For row As Integer = 0 To MyDataGridView1.Rows.Count - 1 + + 'Skip the "new row" at the bottom + If MyDataGridView1.Rows(row).IsNewRow Then Continue For + + For col As Integer = 0 To MyDataGridView1.ColumnCount - 1 + + If col > 0 Then sb.Append(vbTab) + + Dim value = MyDataGridView1.Rows(row).Cells(col).Value + + If value IsNot Nothing Then + sb.Append(value.ToString()) + End If + + Next + + sb.AppendLine() + Next + + Clipboard.SetText(sb.ToString()) + + End Sub + + + Private Sub PasteIntoDGV() + If Not Clipboard.ContainsText() Then Return + + Dim text As String = Clipboard.GetText() + + If String.IsNullOrWhiteSpace(text) Then Return + + Dim lines() As String = + text.Split({vbCrLf, vbLf}, StringSplitOptions.RemoveEmptyEntries) + + '========================================================== + ' IMMER bei Zeile 0 beginnen + '========================================================== + + Dim targetRow As Integer = 0 + Dim startCol As Integer = 0 + + + '========================================================== + ' Prüfen auf Pipe-/Markdown-Tabelle + '========================================================== + + Dim isPipeTable As Boolean = False + + If lines.Length >= 2 Then + + If lines(0).Trim().StartsWith("|") Then + isPipeTable = True + End If + + End If + + + '========================================================== + ' PIPE-TABELLE + '========================================================== + + If isPipeTable Then + + For i As Integer = 0 To lines.Length - 1 + + Dim line As String = lines(i).Trim() + + If String.IsNullOrWhiteSpace(line) Then + Continue For + End If + + + '-------------------------------------------------- + ' Header überspringen + '-------------------------------------------------- + + If i = 0 Then + Continue For + End If + + + '-------------------------------------------------- + ' Trennzeile überspringen + '-------------------------------------------------- + + If IsMarkdownSeparator(line) Then + Continue For + End If + + + '-------------------------------------------------- + ' | entfernen + '-------------------------------------------------- + + If line.StartsWith("|") Then + line = line.Substring(1) + End If + + If line.EndsWith("|") Then + line = line.Substring(0, line.Length - 1) + End If + + + '-------------------------------------------------- + ' Spalten zerlegen + '-------------------------------------------------- + + Dim values() As String = + line.Split("|"c) + + + '-------------------------------------------------- + ' Sicherstellen, dass eine beschreibbare Zeile + ' vorhanden ist + '-------------------------------------------------- + + Dim row As DataGridViewRow = + GetWritableRow(targetRow) + + If row Is Nothing Then + Exit For + End If + + + '-------------------------------------------------- + ' Werte schreiben + '-------------------------------------------------- + + For col As Integer = 0 To values.Length - 1 + + Dim targetCol As Integer = + startCol + col + + If targetCol >= MyDataGridView1.ColumnCount Then + Exit For + End If + + + Dim value As String = + values(col).Trim() + + ' \@ aus deinem Clipboard entfernen + value = value.Replace("\@", "@") + + + row.Cells(targetCol).Value = value + + Next + + + targetRow += 1 + + Next + + Return + + End If + + + '========================================================== + ' NORMALES EXCEL / TAB-SEPARATED + '========================================================== + + For Each line As String In lines + + If String.IsNullOrEmpty(line) Then + Continue For + End If + + + Dim values() As String = + line.Split(ControlChars.Tab) + + + Dim row As DataGridViewRow = + GetWritableRow(targetRow) + + If row Is Nothing Then + Exit For + End If + + + For col As Integer = 0 To values.Length - 1 + + Dim targetCol As Integer = + startCol + col + + If targetCol >= MyDataGridView1.ColumnCount Then + Exit For + End If + + + row.Cells(targetCol).Value = + values(col) + + Next + + + targetRow += 1 + + Next + + + End Sub + + Private Function GetWritableRow(rowIndex As Integer) _ + As DataGridViewRow + + '---------------------------------------------------------- + ' Gibt es die Zeile bereits? + '---------------------------------------------------------- + + If rowIndex < MyDataGridView1.Rows.Count Then + + Dim row As DataGridViewRow = + MyDataGridView1.Rows(rowIndex) + + 'Normale Zeile + If Not row.IsNewRow Then + Return row + End If + + End If + + + '---------------------------------------------------------- + ' Neue Zeile hinzufügen + '---------------------------------------------------------- + + If MyDataGridView1.AllowUserToAddRows Then + + Dim newIndex As Integer = + MyDatagridview1.Rows.Add() + + Return MyDatagridview1.Rows(newIndex) + + End If + + + Return Nothing + +End Function + + + + Private Function IsMarkdownSeparator(line As String) As Boolean + + Dim value As String = line.Trim() + + If value.StartsWith("|") Then + value = value.Substring(1) + End If + + If value.EndsWith("|") Then + value = value.Substring(0, value.Length - 1) + End If + + + Dim columns() As String = + value.Split("|"c) + + + For Each column As String In columns + + Dim cell As String = + column.Trim() + + If cell = "" Then + Continue For + End If + + + cell = cell.Replace(":", "").Trim() + + + If cell.Length = 0 Then + Continue For + End If + + + For Each ch As Char In cell + + If ch <> "-" Then + Return False + End If + + Next + + Next + + + Return True + +End Function + + Private Sub Button8_Click(sender As Object, e As EventArgs) Handles Button8.Click + PasteIntoDGV() + End Sub End Class diff --git a/SDL/kunden/frmKundenblatt.vb b/SDL/kunden/frmKundenblatt.vb index 6fefa980..ae95d5ca 100644 --- a/SDL/kunden/frmKundenblatt.vb +++ b/SDL/kunden/frmKundenblatt.vb @@ -469,23 +469,28 @@ Public Class frmKundenblatt End Sub Private Sub initFIBU() + + txtZinsbelastungTolInTagen.Enabled = False + txtZinsbelastungNew.Enabled = False + + If kdNr > 0 Then + rtbGespreachsbericht.Text = checkNullStr(KUNDE.Gesprächsbericht) + txtFIBUKuerzel.Text = checkNullStr(KUNDE_ERW.kde_BezFIBU) + txtZinsbelastungNew.Text = checkNullStr(KUNDE_ERW.kde_zinssatz) + txtZinsbelastungTolInTagen.Text = checkNullStr(KUNDE_ERW.kde_abwToleranzTage) + + initZNB() + + End If + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG("BH_Hauptmenü", Me) = 0 Then - If kdNr > 0 Then - rtbGespreachsbericht.Text = checkNullStr(KUNDE.Gesprächsbericht) - txtFIBUKuerzel.Text = checkNullStr(KUNDE_ERW.kde_BezFIBU) - txtZinsbelastungNew.Text = checkNullStr(KUNDE_ERW.kde_zinssatz) - txtZinsbelastungTolInTagen.Text = checkNullStr(KUNDE_ERW.kde_abwToleranzTage) + txtZinsbelastungTolInTagen.Enabled = True + txtZinsbelastungNew.Enabled = True - initZNB() - - End If - - Else - - setInfo("info", "Sie sind für den Bereich FIBU nicht freigeschaltet.", 3) - tbcntrMain.SelectedIndex = 0 End If + + End Sub Sub initTABLKW(Optional kz As String = "") diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb index 12faa4a8..5fed6893 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb @@ -61,10 +61,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.cboFremdspedition = New System.Windows.Forms.ComboBox() Me.cbxVerzolltBei = New System.Windows.Forms.CheckBox() Me.cbxBesonderheitenNEU = New System.Windows.Forms.CheckBox() - Me.UsrCntlKundenBesonderheiten1 = New SDL.usrCntlKundenBesonderheiten() Me.tbcntrAbf = New System.Windows.Forms.TabControl() Me.TabPage4 = New System.Windows.Forms.TabPage() - Me.UsrCntlKundenAvisoMailBenachrichtigung1 = New SDL.usrCntlKundenAvisoMailBenachrichtigung() Me.rtbLKWFreigabeSenden = New System.Windows.Forms.RichTextBox() Me.Label18 = New System.Windows.Forms.Label() Me.TabPage3 = New System.Windows.Forms.TabPage() @@ -78,7 +76,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.cboAbfVerb_Abfertigungsverbot = New System.Windows.Forms.CheckBox() Me.txtAbfVerb_AbfertigungsverbotSeit = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.tbAufschub = New System.Windows.Forms.TabPage() - Me.usrCntlAufschubkonten = New SDL.usrCntlAufschubkonten() Me.TabPage1 = New System.Windows.Forms.TabPage() Me.Label78 = New System.Windows.Forms.Label() Me.cbxAbf_ZollVM = New System.Windows.Forms.CheckBox() @@ -103,7 +100,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.rtbAbf_Besonderheiten = New System.Windows.Forms.RichTextBox() Me.Panel1 = New System.Windows.Forms.Panel() Me.tbFiskal = New System.Windows.Forms.TabPage() - Me.UsrCntlKundeFiskaldaten1 = New SDL.usrCntlKundeFiskaldaten() Me.tbVerrechnung = New System.Windows.Forms.TabPage() Me.cbxHR_autoselect = New System.Windows.Forms.CheckBox() Me.cbxPDFMerge = New System.Windows.Forms.CheckBox() @@ -291,6 +287,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtUSt_GVAusgestelltAm = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtUSt_GVAngefordertAm = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.tbSonstiges = New System.Windows.Forms.TabPage() + Me.cbxIDSMautberichtNachOrt = New System.Windows.Forms.CheckBox() Me.txtSonst_weitereKdNrWOELFL = New System.Windows.Forms.TextBox() Me.lblIDS_Rabatte = New System.Windows.Forms.Label() Me.PictureBox7 = New System.Windows.Forms.PictureBox() @@ -422,7 +419,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbKontakt = New System.Windows.Forms.TabControl() Me.TabPage10 = New System.Windows.Forms.TabPage() Me.TabPage11 = New System.Windows.Forms.TabPage() - Me.ucKundenKontakte = New SDL.usrCntlKundenKontakte() Me.Label50 = New System.Windows.Forms.Label() Me.Label68 = New System.Windows.Forms.Label() Me.pnlNeukunde = New System.Windows.Forms.Panel() @@ -448,6 +444,11 @@ Partial Class usrcntlKundeBearbeitenFull Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cboAuswahl = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.ucKundenKontakte = New SDL.usrCntlKundenKontakte() + Me.UsrCntlKundenBesonderheiten1 = New SDL.usrCntlKundenBesonderheiten() + Me.UsrCntlKundenAvisoMailBenachrichtigung1 = New SDL.usrCntlKundenAvisoMailBenachrichtigung() + Me.usrCntlAufschubkonten = New SDL.usrCntlAufschubkonten() + Me.UsrCntlKundeFiskaldaten1 = New SDL.usrCntlKundeFiskaldaten() Me.tbcntrDetails.SuspendLayout() Me.tbAbfertigung.SuspendLayout() Me.tbcntrAbf.SuspendLayout() @@ -642,16 +643,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.cbxBesonderheitenNEU.Text = "Besonderheiten NEU" Me.cbxBesonderheitenNEU.UseVisualStyleBackColor = True ' - 'UsrCntlKundenBesonderheiten1 - ' - Me.UsrCntlKundenBesonderheiten1.BackColor = System.Drawing.Color.White - Me.UsrCntlKundenBesonderheiten1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.UsrCntlKundenBesonderheiten1.Location = New System.Drawing.Point(6, 25) - Me.UsrCntlKundenBesonderheiten1.Name = "UsrCntlKundenBesonderheiten1" - Me.UsrCntlKundenBesonderheiten1.Size = New System.Drawing.Size(107, 52) - Me.UsrCntlKundenBesonderheiten1.TabIndex = 235 - Me.UsrCntlKundenBesonderheiten1.Visible = False - ' 'tbcntrAbf ' Me.tbcntrAbf.Controls.Add(Me.TabPage4) @@ -678,15 +669,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.TabPage4.Text = " Aviso / E-Mail Benachrichtigung" Me.TabPage4.UseVisualStyleBackColor = True ' - 'UsrCntlKundenAvisoMailBenachrichtigung1 - ' - Me.UsrCntlKundenAvisoMailBenachrichtigung1.AutoScroll = True - Me.UsrCntlKundenAvisoMailBenachrichtigung1.BackColor = System.Drawing.Color.White - Me.UsrCntlKundenAvisoMailBenachrichtigung1.Location = New System.Drawing.Point(0, 6) - Me.UsrCntlKundenAvisoMailBenachrichtigung1.Name = "UsrCntlKundenAvisoMailBenachrichtigung1" - Me.UsrCntlKundenAvisoMailBenachrichtigung1.Size = New System.Drawing.Size(479, 172) - Me.UsrCntlKundenAvisoMailBenachrichtigung1.TabIndex = 6 - ' 'rtbLKWFreigabeSenden ' Me.rtbLKWFreigabeSenden.Location = New System.Drawing.Point(485, 33) @@ -855,14 +837,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbAufschub.Text = "Aufschubkonten" Me.tbAufschub.UseVisualStyleBackColor = True ' - 'usrCntlAufschubkonten - ' - Me.usrCntlAufschubkonten.Dock = System.Windows.Forms.DockStyle.Fill - Me.usrCntlAufschubkonten.Location = New System.Drawing.Point(3, 3) - Me.usrCntlAufschubkonten.Name = "usrCntlAufschubkonten" - Me.usrCntlAufschubkonten.Size = New System.Drawing.Size(652, 172) - Me.usrCntlAufschubkonten.TabIndex = 0 - ' 'TabPage1 ' Me.TabPage1.Controls.Add(Me.Label78) @@ -1168,15 +1142,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbFiskal.Text = "Fiskal" Me.tbFiskal.UseVisualStyleBackColor = True ' - 'UsrCntlKundeFiskaldaten1 - ' - Me.UsrCntlKundeFiskaldaten1.BackColor = System.Drawing.Color.White - Me.UsrCntlKundeFiskaldaten1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlKundeFiskaldaten1.Location = New System.Drawing.Point(0, 0) - Me.UsrCntlKundeFiskaldaten1.Name = "UsrCntlKundeFiskaldaten1" - Me.UsrCntlKundeFiskaldaten1.Size = New System.Drawing.Size(672, 495) - Me.UsrCntlKundeFiskaldaten1.TabIndex = 0 - ' 'tbVerrechnung ' Me.tbVerrechnung.Controls.Add(Me.cbxHR_autoselect) @@ -4162,6 +4127,7 @@ Partial Class usrcntlKundeBearbeitenFull ' 'tbSonstiges ' + Me.tbSonstiges.Controls.Add(Me.cbxIDSMautberichtNachOrt) Me.tbSonstiges.Controls.Add(Me.txtSonst_weitereKdNrWOELFL) Me.tbSonstiges.Controls.Add(Me.lblIDS_Rabatte) Me.tbSonstiges.Controls.Add(Me.PictureBox7) @@ -4212,6 +4178,16 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbSonstiges.Text = "Sonstiges" Me.tbSonstiges.UseVisualStyleBackColor = True ' + 'cbxIDSMautberichtNachOrt + ' + Me.cbxIDSMautberichtNachOrt.AutoSize = True + Me.cbxIDSMautberichtNachOrt.Location = New System.Drawing.Point(119, 194) + Me.cbxIDSMautberichtNachOrt.Name = "cbxIDSMautberichtNachOrt" + Me.cbxIDSMautberichtNachOrt.Size = New System.Drawing.Size(164, 17) + Me.cbxIDSMautberichtNachOrt.TabIndex = 149 + Me.cbxIDSMautberichtNachOrt.Text = "IDS-Mautbericht AT nach Ort" + Me.cbxIDSMautberichtNachOrt.UseVisualStyleBackColor = True + ' 'txtSonst_weitereKdNrWOELFL ' Me.txtSonst_weitereKdNrWOELFL.Location = New System.Drawing.Point(179, 53) @@ -4597,9 +4573,9 @@ Partial Class usrcntlKundeBearbeitenFull Me.cbxSonst_CsvMautbericht.AutoSize = True Me.cbxSonst_CsvMautbericht.Location = New System.Drawing.Point(428, 141) Me.cbxSonst_CsvMautbericht.Name = "cbxSonst_CsvMautbericht" - Me.cbxSonst_CsvMautbericht.Size = New System.Drawing.Size(82, 17) + Me.cbxSonst_CsvMautbericht.Size = New System.Drawing.Size(106, 17) Me.cbxSonst_CsvMautbericht.TabIndex = 2 - Me.cbxSonst_CsvMautbericht.Text = "Mautbericht" + Me.cbxSonst_CsvMautbericht.Text = "CSV-Mautbericht" Me.cbxSonst_CsvMautbericht.UseVisualStyleBackColor = True ' 'txtSonst_KdNrUTA @@ -5863,14 +5839,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.TabPage11.Text = "Spezifisch" Me.TabPage11.UseVisualStyleBackColor = True ' - 'ucKundenKontakte - ' - Me.ucKundenKontakte.Dock = System.Windows.Forms.DockStyle.Fill - Me.ucKundenKontakte.Location = New System.Drawing.Point(3, 3) - Me.ucKundenKontakte.Name = "ucKundenKontakte" - Me.ucKundenKontakte.Size = New System.Drawing.Size(439, 169) - Me.ucKundenKontakte.TabIndex = 0 - ' 'Label50 ' Me.Label50.AutoSize = True @@ -6151,6 +6119,50 @@ Partial Class usrcntlKundeBearbeitenFull Me.DataGridViewTextBoxColumn2.HeaderText = "E-Mail" Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" ' + 'ucKundenKontakte + ' + Me.ucKundenKontakte.Dock = System.Windows.Forms.DockStyle.Fill + Me.ucKundenKontakte.Location = New System.Drawing.Point(3, 3) + Me.ucKundenKontakte.Name = "ucKundenKontakte" + Me.ucKundenKontakte.Size = New System.Drawing.Size(439, 169) + Me.ucKundenKontakte.TabIndex = 0 + ' + 'UsrCntlKundenBesonderheiten1 + ' + Me.UsrCntlKundenBesonderheiten1.BackColor = System.Drawing.Color.White + Me.UsrCntlKundenBesonderheiten1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.UsrCntlKundenBesonderheiten1.Location = New System.Drawing.Point(6, 25) + Me.UsrCntlKundenBesonderheiten1.Name = "UsrCntlKundenBesonderheiten1" + Me.UsrCntlKundenBesonderheiten1.Size = New System.Drawing.Size(107, 52) + Me.UsrCntlKundenBesonderheiten1.TabIndex = 235 + Me.UsrCntlKundenBesonderheiten1.Visible = False + ' + 'UsrCntlKundenAvisoMailBenachrichtigung1 + ' + Me.UsrCntlKundenAvisoMailBenachrichtigung1.AutoScroll = True + Me.UsrCntlKundenAvisoMailBenachrichtigung1.BackColor = System.Drawing.Color.White + Me.UsrCntlKundenAvisoMailBenachrichtigung1.Location = New System.Drawing.Point(0, 6) + Me.UsrCntlKundenAvisoMailBenachrichtigung1.Name = "UsrCntlKundenAvisoMailBenachrichtigung1" + Me.UsrCntlKundenAvisoMailBenachrichtigung1.Size = New System.Drawing.Size(479, 172) + Me.UsrCntlKundenAvisoMailBenachrichtigung1.TabIndex = 6 + ' + 'usrCntlAufschubkonten + ' + Me.usrCntlAufschubkonten.Dock = System.Windows.Forms.DockStyle.Fill + Me.usrCntlAufschubkonten.Location = New System.Drawing.Point(3, 3) + Me.usrCntlAufschubkonten.Name = "usrCntlAufschubkonten" + Me.usrCntlAufschubkonten.Size = New System.Drawing.Size(652, 172) + Me.usrCntlAufschubkonten.TabIndex = 0 + ' + 'UsrCntlKundeFiskaldaten1 + ' + Me.UsrCntlKundeFiskaldaten1.BackColor = System.Drawing.Color.White + Me.UsrCntlKundeFiskaldaten1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlKundeFiskaldaten1.Location = New System.Drawing.Point(0, 0) + Me.UsrCntlKundeFiskaldaten1.Name = "UsrCntlKundeFiskaldaten1" + Me.UsrCntlKundeFiskaldaten1.Size = New System.Drawing.Size(672, 495) + Me.UsrCntlKundeFiskaldaten1.TabIndex = 0 + ' 'usrcntlKundeBearbeitenFull ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -6661,4 +6673,5 @@ Partial Class usrcntlKundeBearbeitenFull Friend WithEvents cbxSammelrechnung_IM_EX As CheckBox Friend WithEvents cbxPDFMerge As CheckBox Friend WithEvents cbxHR_autoselect As CheckBox + Friend WithEvents cbxIDSMautberichtNachOrt As CheckBox End Class diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index eeb51e8e..23de4ee1 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -402,6 +402,7 @@ Public Class usrcntlKundeBearbeitenFull cbxSonst_CsvMautbericht.Checked = loadValue(ADRESSE.ExportMautberichtCSV, False) cbxSonst_CsvMSE.Checked = loadValue(ADRESSE.MSEExportCSV, False) cbxSonst_CsvUTA.Checked = loadValue(ADRESSE.UTAExportCSV, False) + cbxSonst_CsvUTA.Checked = loadValue(ADRESSE.UTAExportCSV, False) cbxUIDMehrfachverwendung.Checked = KUNDE_ERW.kde_UIDMehrfachverwendung cbxkeineMWSt.Checked = loadValue(KUNDE_ERW.kde_keineMWSt, False) @@ -860,6 +861,7 @@ Public Class usrcntlKundeBearbeitenFull ADRESSE.ExportMautberichtCSV = cbxSonst_CsvMautbericht.Checked ADRESSE.MSEExportCSV = cbxSonst_CsvMSE.Checked ADRESSE.UTAExportCSV = cbxSonst_CsvUTA.Checked + ADRESSE.IDSMautbericht_nachOrt = cbxIDSMautberichtNachOrt.Checked KUNDE_ERW.kde_betreuer = isLeerNothing(cbxBetreuer.Text) @@ -2369,7 +2371,7 @@ Public Class usrcntlKundeBearbeitenFull lblIDS_Rabatte.Text = "IDS-Rabatte/Preise" & IIf(KundeOhneRabatt > 0, " - KUNDE OHNE RABATT", "") - Dim dt_IDS As DataTable = sql.loadDgvBySql("SELECT P.ProductDescription, C.OutletCountry,S.OutletCode, S.OutletName, RW.Rechenwert, Kz, RW.KategorieNr as KatNr FROM [VERAG].[dbo].[tbl_IDS_Rechenwerte] as RW + Dim dt_IDS As DataTable = sql.loadDgvBySql("SELECT P.ProductDescription, C.OutletCountry,S.OutletCode, S.OutletName,S.OutletOrt, RW.Rechenwert, Kz, RW.KategorieNr as KatNr FROM [VERAG].[dbo].[tbl_IDS_Rechenwerte] as RW left join [VERAG].[dbo].[tbl_IDS_Produkte] as P on P.ProductTypeCode = RW.ProductTypeCode left join [VERAG].[dbo].[tbl_IDS_Länder] as C on C.OutletCountryCode = RW.OutletCountryCode left join [VERAG].[dbo].[tbl_IDS_Stationen] as S on S.[OutletCode] = RW.OutletCode and S.OutletCountryCode = RW.OutletCountryCode where CustomerCode is null order by KZ", "FMZOLL") @@ -2387,8 +2389,10 @@ Public Class usrcntlKundeBearbeitenFull .Columns(2).HeaderText = "S-Nr" .Columns(2).Width = 50 .Columns(3).HeaderText = "Station" - .Columns(4).HeaderText = "Rab-/Pr." - .Columns(6).Width = 50 + .Columns(4).HeaderText = "Ort" + .Columns(4).Width = 50 + .Columns(5).HeaderText = "Rab-/Pr." + .Columns(7).Width = 50 .Columns(3).AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill End With diff --git a/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb b/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb index daf4027c..e174fa5f 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb @@ -25,6 +25,7 @@ Partial Class frmMDMDatenverarbetiung Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMDMDatenverarbetiung)) Me.pnl = New System.Windows.Forms.Panel() + Me.btnImportdet = New System.Windows.Forms.Button() Me.pb_importOK = New System.Windows.Forms.PictureBox() Me.cbxIDSmitVerag = New System.Windows.Forms.CheckBox() Me.Panel5 = New System.Windows.Forms.Panel() @@ -52,7 +53,7 @@ Partial Class frmMDMDatenverarbetiung Me.pnlAsfinag = New System.Windows.Forms.Panel() Me.bntDatumzuruecksetzen = New System.Windows.Forms.Button() Me.bntDatumsetzen = New System.Windows.Forms.Button() - Me.Panel3 = New System.Windows.Forms.Panel() + Me.pnlMDMDetailberichte = New System.Windows.Forms.Panel() Me.Button6 = New System.Windows.Forms.Button() Me.pnlIDS = New System.Windows.Forms.Panel() Me.Button10 = New System.Windows.Forms.Button() @@ -85,7 +86,6 @@ Partial Class frmMDMDatenverarbetiung Me.Button2 = New System.Windows.Forms.Button() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.btnImportdet = New System.Windows.Forms.Button() Me.pnl.SuspendLayout() CType(Me.pb_importOK, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel5.SuspendLayout() @@ -94,7 +94,7 @@ Partial Class frmMDMDatenverarbetiung Me.FlowLayoutPanel.SuspendLayout() Me.Panel1.SuspendLayout() Me.pnlAsfinag.SuspendLayout() - Me.Panel3.SuspendLayout() + Me.pnlMDMDetailberichte.SuspendLayout() Me.pnlIDS.SuspendLayout() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() @@ -124,6 +124,17 @@ Partial Class frmMDMDatenverarbetiung Me.pnl.Size = New System.Drawing.Size(1163, 100) Me.pnl.TabIndex = 1 ' + 'btnImportdet + ' + Me.btnImportdet.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnImportdet.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnImportdet.Location = New System.Drawing.Point(985, 8) + Me.btnImportdet.Name = "btnImportdet" + Me.btnImportdet.Size = New System.Drawing.Size(166, 23) + Me.btnImportdet.TabIndex = 132 + Me.btnImportdet.Text = "Einarbeitungsdetails" + Me.btnImportdet.UseVisualStyleBackColor = True + ' 'pb_importOK ' Me.pb_importOK.BackgroundImage = Global.SDL.My.Resources.Resources.ok @@ -371,7 +382,7 @@ Partial Class frmMDMDatenverarbetiung 'Panel1 ' Me.Panel1.Controls.Add(Me.pnlAsfinag) - Me.Panel1.Controls.Add(Me.Panel3) + Me.Panel1.Controls.Add(Me.pnlMDMDetailberichte) Me.Panel1.Controls.Add(Me.pnlIDS) Me.Panel1.Controls.Add(Me.lblTTRSum) Me.Panel1.Controls.Add(Me.txtTTRSum) @@ -427,14 +438,14 @@ Partial Class frmMDMDatenverarbetiung Me.bntDatumsetzen.Text = "Abr-datum setzen" Me.bntDatumsetzen.UseVisualStyleBackColor = True ' - 'Panel3 + 'pnlMDMDetailberichte ' - Me.Panel3.BackColor = System.Drawing.Color.White - Me.Panel3.Controls.Add(Me.Button6) - Me.Panel3.Location = New System.Drawing.Point(603, 9) - Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(313, 139) - Me.Panel3.TabIndex = 48 + Me.pnlMDMDetailberichte.BackColor = System.Drawing.Color.White + Me.pnlMDMDetailberichte.Controls.Add(Me.Button6) + Me.pnlMDMDetailberichte.Location = New System.Drawing.Point(603, 9) + Me.pnlMDMDetailberichte.Name = "pnlMDMDetailberichte" + Me.pnlMDMDetailberichte.Size = New System.Drawing.Size(313, 139) + Me.pnlMDMDetailberichte.TabIndex = 48 ' 'Button6 ' @@ -826,17 +837,6 @@ Partial Class frmMDMDatenverarbetiung Me.MyDatagridview1.Size = New System.Drawing.Size(1163, 547) Me.MyDatagridview1.TabIndex = 0 ' - 'btnImportdet - ' - Me.btnImportdet.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnImportdet.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnImportdet.Location = New System.Drawing.Point(985, 8) - Me.btnImportdet.Name = "btnImportdet" - Me.btnImportdet.Size = New System.Drawing.Size(166, 23) - Me.btnImportdet.TabIndex = 132 - Me.btnImportdet.Text = "Einarbeitungsdetails" - Me.btnImportdet.UseVisualStyleBackColor = True - ' 'frmMDMDatenverarbetiung ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -862,7 +862,7 @@ Partial Class frmMDMDatenverarbetiung Me.Panel1.ResumeLayout(False) Me.Panel1.PerformLayout() Me.pnlAsfinag.ResumeLayout(False) - Me.Panel3.ResumeLayout(False) + Me.pnlMDMDetailberichte.ResumeLayout(False) Me.pnlIDS.ResumeLayout(False) CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit() @@ -905,7 +905,7 @@ Partial Class frmMDMDatenverarbetiung Friend WithEvents btnKunde As Button Friend WithEvents Button1 As Button Friend WithEvents Button5 As Button - Friend WithEvents Panel3 As Panel + Friend WithEvents pnlMDMDetailberichte As Panel Friend WithEvents PictureBox1 As PictureBox Friend WithEvents pic As PictureBox Friend WithEvents Button6 As Button diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index 919dc00e..61fc1262 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -1239,7 +1239,7 @@ Public Class frmMDMDatenverarbetiung Sub initLieferant(l As String, btn As Button) MyDatagridview1.DataSource = Nothing Me.LIEFERANT = l - Panel3.Controls.Clear() + pnlMDMDetailberichte.Controls.Clear() For Each c As Button In FlowLayoutPanel.Controls If c Is btn Then @@ -1264,12 +1264,12 @@ Public Class frmMDMDatenverarbetiung Case "PLOSE" Panel4.Visible = True Dim c As New usrCntlMDMDatenverarbeitungAuswertungen_divers(Me, Me.LIEFERANT) - Panel3.Controls.Add(c) + pnlMDMDetailberichte.Controls.Add(c) c.Dock = DockStyle.Fill Case "UTA" Panel5.Visible = True Dim c As New usrCntlMDMDatenverarbeitungAuswertungen_divers(Me, Me.LIEFERANT) - Panel3.Controls.Add(c) + pnlMDMDetailberichte.Controls.Add(c) c.Dock = DockStyle.Fill Case "ASFINAG" cbxASFINAGAbgerechnet.Visible = True @@ -1280,7 +1280,7 @@ Public Class frmMDMDatenverarbetiung Case "IDS" Panel5.Visible = True Dim c As New usrCntlMDMDatenverarbeitungAuswertungen_divers(Me, Me.LIEFERANT) - Panel3.Controls.Add(c) + pnlMDMDetailberichte.Controls.Add(c) c.Dock = DockStyle.Fill pnlIDS.Visible = True cbxKopie.Visible = True @@ -1289,7 +1289,7 @@ Public Class frmMDMDatenverarbetiung Case "MSE" Panel5.Visible = True Dim c As New usrCntlMDMDatenverarbeitungAuswertungen_divers(Me, Me.LIEFERANT) - Panel3.Controls.Add(c) + pnlMDMDetailberichte.Controls.Add(c) c.Dock = DockStyle.Fill End Select @@ -1686,7 +1686,8 @@ Public Class frmMDMDatenverarbetiung distinct(tblIDSTransactionsNew.KdNrVERAG), tblIDSTransactionsNew.CustomerCode, Adressen.Rechnungsdruck, - isNULL(tblIDSInvoicesNew.daId,0) as InvoiceID + isNULL(tblIDSInvoicesNew.daId,0) as InvoiceID, + isnull(IDSMautbericht_nachOrt,0) as IDSMautbericht_nachOrt FROM tblIDSTransactionsNew INNER JOIN @@ -1737,7 +1738,7 @@ Public Class frmMDMDatenverarbetiung If IDS("Rechnungsdruck") = 2 Then - Dim pathfile = genIDSAttachmentByKdNr(IDS("KdNrVERAG"), IDS("CustomerCode"), dir, datPloseAnhang.Value, art) + Dim pathfile = genIDSAttachmentByKdNr(IDS("KdNrVERAG"), IDS("CustomerCode"), dir, datPloseAnhang.Value, art, IDS("IDSMautbericht_nachOrt")) If Not AddAttachementToRE(pathfile, IDS("KdNrVERAG"), RECHNUNG, "IDS") Then verarbOK = False End If @@ -3126,35 +3127,47 @@ LEFT JOIN VERAG.dbo.tbl_IDS_Länder land End Function - Function genIDSAttachmentByKdNr(KdNr As String, IDSKdNr As String, dir As String, von As Date, art As String) + Function genIDSAttachmentByKdNr(KdNr As String, IDSKdNr As String, dir As String, von As Date, art As String, Gruppierung_nach_Ort As Boolean) Try Dim displayFilter = False Dim sqlstr As String = "" - Dim sqlWhere As String = "" - Dim sqlSelect As String = "" - Dim sqlGroup As String = "" + + Dim sqljoin_nachOrt As String = "" + Dim sqlgroup_nachOrt = "" + Dim sqlselect_nachOrt = "" + If Gruppierung_nach_Ort Then + sqljoin_nachOrt = "INNER JOIN tbl_IDS_Stationen ON tblIDSTransactionsNew.OutletCountryCode = tbl_IDS_Stationen.OutletCountryCode and tblIDSTransactionsNew.OutletCode = tbl_IDS_Stationen.OutletCode and tbl_IDS_Stationen.[OutletCountryCode]=740543" + sqlgroup_nachOrt = ",tbl_IDS_Stationen.OutletOrt" + sqlselect_nachOrt = "tbl_IDS_Stationen.OutletOrt," + End If + Select Case art Case "IDS" 'Offert17 - sqlWhere = " AND tblIDSTransactionsNew.[OutletCountryCode]<>740543" - sqlSelect = " tblIDSTransactionsNew.[OutletCountry]" - sqlGroup = " tblIDSTransactionsNew.[OutletCountry]" + + sqlstr = "SELECT Adressen.AdressenNr, Adressen.[Name 1], Adressen.[Name 2], Adressen.Straße, Adressen.LandKz, Adressen.PLZ, Adressen.Ort, Adressen.UstIdKz, Adressen.UstIdNr, tblIDSTransactionsNew.[CustomerCode], tblIDSTransactionsNew.[OutletCountry], tbl_IDS_Produkte.ProductDescription, tbl_IDS_Länder.Steuersatz, tblIDSTransactionsNew.Rechenwert, tblIDSTransactionsNew.Kz, Sum(tblIDSTransactionsNew.[TransactionVolume]) AS Liter, Sum(tblIDSTransactionsNew.[TotalNetAmount]) AS Nettobetrag, Sum(tblIDSTransactionsNew.[VATAmount]) AS Steuerbetrag, + Case when Sum([TransactionVolume]) =0 THEN 0 ELSE Sum([TotalNetAmount])/Sum([TransactionVolume]) END AS NettopreisProLiter, + Sum(tblIDSTransactionsNew.Rabattbetrag) As [SummevonRabattbetrag], + Case when Sum([TransactionVolume]) =0 THEN 0 ELSE Sum([Rabattbetrag])/Sum([TransactionVolume]) END AS RabattbetragProLiter + FROM((tblIDSTransactionsNew INNER JOIN tbl_IDS_Länder ON tblIDSTransactionsNew.[OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode) INNER JOIN tbl_IDS_Produkte On tblIDSTransactionsNew.[ProductTypeCode] = tbl_IDS_Produkte.ProductTypeCode ) INNER JOIN Adressen On tblIDSTransactionsNew.KdNrVERAG = Adressen.AdressenNr + Where cast(tblIDSTransactionsNew.YearMonthDay As Date) = '" & DateTimePicker2.Text & "' AND tblIDSTransactionsNew.[OutletCountryCode]<>740543 AND tblIDSTransactionsNew.KdNrVERAG = " & KdNr & " + GROUP BY Adressen.AdressenNr, Adressen.[Name 1], Adressen.[Name 2], Adressen.Straße, Adressen.LandKz, Adressen.PLZ, Adressen.Ort, Adressen.UstIdKz, Adressen.UstIdNr, tblIDSTransactionsNew.[CustomerCode], tblIDSTransactionsNew.[OutletCountry], tbl_IDS_Produkte.ProductDescription, tbl_IDS_Länder.Steuersatz, tblIDSTransactionsNew.Rechenwert, tblIDSTransactionsNew.Kz" + + Case "IDS_AT" 'Offert21 - sqlWhere = " AND tblIDSTransactionsNew.[OutletCountryCode]=740543" - sqlSelect = " CASE WHEN tblIDSTransactionsNew.OutletCode BETWEEN 4473 AND 4474 THEN 'Austria Suben' ELSE tblIDSTransactionsNew.OutletCountry END AS OutletCountry" - sqlGroup = " CASE WHEN tblIDSTransactionsNew.OutletCode BETWEEN 4473 AND 4474 THEN 'Austria Suben' ELSE tblIDSTransactionsNew.OutletCountry END" + + sqlstr = " SELECT Adressen.AdressenNr, Adressen.[Name 1], Adressen.[Name 2], Adressen.Straße, Adressen.LandKz, Adressen.PLZ, Adressen.Ort, Adressen.UstIdKz, Adressen.UstIdNr, tblIDSTransactionsNew.[CustomerCode], CASE WHEN tblIDSTransactionsNew.OutletCode BETWEEN 4473 And 4474 THEN 'Austria Suben' ELSE tblIDSTransactionsNew.OutletCountry END AS OutletCountry, tbl_IDS_Produkte.ProductDescription," & sqlselect_nachOrt & " tbl_IDS_Länder.Steuersatz, tblIDSTransactionsNew.Rechenwert, tblIDSTransactionsNew.Kz, Sum(tblIDSTransactionsNew.[TransactionVolume]) AS Liter, Sum(tblIDSTransactionsNew.[TotalNetAmount]) AS Nettobetrag, Sum(tblIDSTransactionsNew.[VATAmount]) AS Steuerbetrag, + Case when Sum([TransactionVolume]) =0 THEN 0 ELSE Sum([TotalNetAmount])/Sum([TransactionVolume]) END AS NettopreisProLiter, + Sum(tblIDSTransactionsNew.Rabattbetrag) As [SummevonRabattbetrag], + Case when Sum([TransactionVolume]) =0 THEN 0 ELSE Sum([Rabattbetrag])/Sum([TransactionVolume]) END AS RabattbetragProLiter + FROM tblIDSTransactionsNew INNER JOIN tbl_IDS_Länder ON tblIDSTransactionsNew.[OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode INNER JOIN tbl_IDS_Produkte On tblIDSTransactionsNew.[ProductTypeCode] = tbl_IDS_Produkte.ProductTypeCode " & sqljoin_nachOrt & " INNER JOIN Adressen On tblIDSTransactionsNew.KdNrVERAG = Adressen.AdressenNr + Where cast(tblIDSTransactionsNew.YearMonthDay As Date) = '" & DateTimePicker2.Text & "' And tblIDSTransactionsNew.[OutletCountryCode]=740543 AND tblIDSTransactionsNew.KdNrVERAG = " & KdNr & " + GROUP BY Adressen.AdressenNr, Adressen.[Name 1], Adressen.[Name 2], Adressen.Straße, Adressen.LandKz, Adressen.PLZ, Adressen.Ort, Adressen.UstIdKz, Adressen.UstIdNr, tblIDSTransactionsNew.[CustomerCode], CASE WHEN tblIDSTransactionsNew.OutletCode BETWEEN 4473 AND 4474 THEN 'Austria Suben' ELSE tblIDSTransactionsNew.OutletCountry END, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Länder.Steuersatz, tblIDSTransactionsNew.Rechenwert, tblIDSTransactionsNew.Kz" & sqlgroup_nachOrt + End Select - sqlstr &= " SELECT Adressen.AdressenNr, Adressen.[Name 1], Adressen.[Name 2], Adressen.Straße, Adressen.LandKz, Adressen.PLZ, Adressen.Ort, Adressen.UstIdKz, Adressen.UstIdNr, tblIDSTransactionsNew.[CustomerCode], " & sqlSelect & ", tbl_IDS_Produkte.ProductDescription,tbl_IDS_Stationen.OutletName, tbl_IDS_Länder.Steuersatz, tblIDSTransactionsNew.Rechenwert, tblIDSTransactionsNew.Kz, Sum(tblIDSTransactionsNew.[TransactionVolume]) AS Liter, Sum(tblIDSTransactionsNew.[TotalNetAmount]) AS Nettobetrag, Sum(tblIDSTransactionsNew.[VATAmount]) AS Steuerbetrag, - case when Sum([TransactionVolume]) =0 THEN 0 ELSE Sum([TotalNetAmount])/Sum([TransactionVolume]) END AS NettopreisProLiter, - Sum(tblIDSTransactionsNew.Rabattbetrag) AS [SummevonRabattbetrag], - case when Sum([TransactionVolume]) =0 THEN 0 ELSE Sum([Rabattbetrag])/Sum([TransactionVolume]) END AS RabattbetragProLiter - FROM ((tblIDSTransactionsNew INNER JOIN tbl_IDS_Länder ON tblIDSTransactionsNew.[OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode) INNER JOIN tbl_IDS_Produkte ON tblIDSTransactionsNew.[ProductTypeCode] = tbl_IDS_Produkte.ProductTypeCode INNER JOIN tbl_IDS_Stationen ON tblIDSTransactionsNew.OutletCountryCode = tbl_IDS_Stationen.OutletCountryCode and tblIDSTransactionsNew.OutletCode = tbl_IDS_Stationen.OutletCode) INNER JOIN Adressen ON tblIDSTransactionsNew.KdNrVERAG = Adressen.AdressenNr - WHERE cast(tblIDSTransactionsNew.YearMonthDay as Date) = '" & DateTimePicker2.Text & "' AND tblIDSTransactionsNew.KdNrVERAG = " & KdNr & sqlWhere & " - GROUP BY Adressen.AdressenNr, Adressen.[Name 1], Adressen.[Name 2], Adressen.Straße, Adressen.LandKz, Adressen.PLZ, Adressen.Ort, Adressen.UstIdKz, Adressen.UstIdNr, tblIDSTransactionsNew.[CustomerCode], " & sqlGroup & ", tbl_IDS_Produkte.ProductDescription, tbl_IDS_Länder.Steuersatz, tblIDSTransactionsNew.Rechenwert, tblIDSTransactionsNew.Kz,tbl_IDS_Stationen.OutletName; - " Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL") If dt Is DBNull.Value Then Return "" @@ -3210,11 +3223,15 @@ LEFT JOIN VERAG.dbo.tbl_IDS_Länder land rpt.txtKunde.Text = SQL.isDbnullEmpty(rpt.Fields.Item("AdressenNr").Value, "") rpt.txtKunde.Text &= " " & SQL.isDbnullEmpty(rpt.Fields.Item("Name 1").Value, "") - Dim Station As String = SQL.isDbnullEmpty(rpt.Fields.Item("OutletName").Value, "") - If Station <> "" Then - Station = " (" & Station & ")" + Dim Station As String = "" + If Gruppierung_nach_Ort Then + Station = SQL.isDbnullEmpty(rpt.Fields.Item("OutletOrt").Value, "") + If Station <> "" Then + Station = " (" & Station & ")" + End If End If + rpt.txtProduktBeschreibung.Text = SQL.isDbnullEmpty(rpt.Fields.Item("ProductDescription").Value, "") & Station rpt.txtLiter.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Liter").Value, "") @@ -4720,6 +4737,27 @@ LEFT JOIN VERAG.dbo.tbl_IDS_Länder land + + Dim IDSfehlendeStationen_AUSTRIA As Integer = 0 + + IDSfehlendeStationen_AUSTRIA = CInt((New SQL).getValueTxtBySql("select COUNT(*) from ( + select tblIDSTransactionsNew.OutletCode, tblIDSTransactionsNew.OutletCountry, tblIDSTransactionsNew.OutletName + from tblIDSTransactionsNew where cast(tblIDSTransactionsNew.YearMonthDay As Date) = '" & DateTimePicker2.Text & "' and OutletCountry = 'Austria' and tblIDSTransactionsNew.OutletCode not in (select tbl_IDS_Stationen.OutletCode from tbl_IDS_Stationen) + group by tblIDSTransactionsNew.OutletCode, tblIDSTransactionsNew.OutletCountry, tblIDSTransactionsNew.OutletName ) as temp", "FMZOLL")) + + If IDSfehlendeStationen_AUSTRIA >= 1 Then + pruefData_IDS = False + Dim hint As String = "" + ' If IDSfehlendeStationen_AUSTRIA <= 10 Then + ' hint &= SQL.getValueTxtBySql("select tblIDSTransactionsNew.OutletCode, tblIDSTransactionsNew.OutletCountry + 'from tblIDSTransactionsNew where cast(tblIDSTransactionsNew.YearMonthDay As Date) = '" & DateTimePicker2.Text & "' and OutletCountry = 'Austria' and tblIDSTransactionsNew.OutletCode not in (select tbl_IDS_Stationen.OutletCode from tbl_IDS_Stationen) + 'group by tblIDSTransactionsNew.OutletCode, tblIDSTransactionsNew.OutletCountry ", "FMZOLL") + ' End If + MsgBox("Es befinden sich unter den Transaktionen " & IDSfehlendeStationen_AUSTRIA & " österrreichische Stationen, die nicht in der Tabelle IDS_STATIONEN angelegt wurden " & vbNewLine & "Diese STATIONEN müssen nachgetragen werden, um den AT Mautbericht korrekt zu erstellen (bitte an Administrator wenden)." & IIf(hint <> "", vbNewLine & hint, "")) + End If + + + Dim fehlendeRechnungen As Integer = 0 fehlendeRechnungen = CInt((New SQL).getValueTxtBySql("select count(*) from tblIDSInvoicesNew where DocumentName is null and cast(YearMonthDay as Date) = '" & DateTimePicker2.Text & "'", "FMZOLL")) @@ -4846,7 +4884,7 @@ LEFT JOIN VERAG.dbo.tbl_IDS_Länder land If Not vbYes = MsgBox("Aktuell ist der Testlauf aktiviert, wirklich fortfahren?", vbYesNoCancel) Then Exit Sub End If - If vbYes = MsgBox("Möchten Sie den Vorgang wirklich manuell ausgeführen (wird bei Rechnungserstellung automatisch ausgeführt)", vbYesNoCancel) Then + If vbYes = MsgBox("Möchten Sie den Vorgang wirklich manuell ausführen (wird bei Rechnungserstellung automatisch ausgeführt)", vbYesNoCancel) Then If Not checkAbrechnungsdatum(datPloseAnhang.Value) Then Exit Sub diff --git a/SDL/mdm/usrCntlMDMDatenverarbeitungAuswertungen_divers.Designer.vb b/SDL/mdm/usrCntlMDMDatenverarbeitungAuswertungen_divers.Designer.vb index aaf70db4..d957d703 100644 --- a/SDL/mdm/usrCntlMDMDatenverarbeitungAuswertungen_divers.Designer.vb +++ b/SDL/mdm/usrCntlMDMDatenverarbeitungAuswertungen_divers.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class usrCntlMDMDatenverarbeitungAuswertungen_divers Inherits System.Windows.Forms.UserControl 'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,9 +20,9 @@ Partial Class usrCntlMDMDatenverarbeitungAuswertungen_divers 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ + Private Sub InitializeComponent() - Me.Button6 = New System.Windows.Forms.Button() + Me.Button4 = New System.Windows.Forms.Button() Me.Button1 = New System.Windows.Forms.Button() Me.cbxNurEULander = New System.Windows.Forms.CheckBox() Me.Button2 = New System.Windows.Forms.Button() @@ -30,19 +30,19 @@ Partial Class usrCntlMDMDatenverarbeitungAuswertungen_divers Me.Button3 = New System.Windows.Forms.Button() Me.SuspendLayout() ' - 'Button6 + 'Button4 ' - Me.Button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button6.Image = Global.SDL.My.Resources.Resources.statistik_small - Me.Button6.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button6.Location = New System.Drawing.Point(6, 3) - Me.Button6.Name = "Button6" - Me.Button6.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0) - Me.Button6.Size = New System.Drawing.Size(149, 41) - Me.Button6.TabIndex = 48 - Me.Button6.Text = "Auswertung IT Maut " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(Konsortium)" - Me.Button6.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button6.UseVisualStyleBackColor = True + Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button4.Image = Global.SDL.My.Resources.Resources.statistik_small + Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button4.Location = New System.Drawing.Point(6, 3) + Me.Button4.Name = "Button4" + Me.Button4.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0) + Me.Button4.Size = New System.Drawing.Size(149, 41) + Me.Button4.TabIndex = 48 + Me.Button4.Text = "Auswertung IT Maut " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(Konsortium)" + Me.Button4.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button4.UseVisualStyleBackColor = True ' 'Button1 ' @@ -120,15 +120,15 @@ Partial Class usrCntlMDMDatenverarbeitungAuswertungen_divers Me.Controls.Add(Me.Button2) Me.Controls.Add(Me.cbxNurEULander) Me.Controls.Add(Me.Button1) - Me.Controls.Add(Me.Button6) + Me.Controls.Add(Me.Button4) Me.Name = "usrCntlMDMDatenverarbeitungAuswertungen_divers" - Me.Size = New System.Drawing.Size(295, 104) + Me.Size = New System.Drawing.Size(295, 114) Me.ResumeLayout(False) Me.PerformLayout() End Sub - Friend WithEvents Button6 As Button + Friend WithEvents Button4 As Button Friend WithEvents Button1 As Button Friend WithEvents cbxNurEULander As CheckBox Friend WithEvents Button2 As Button diff --git a/SDL/mdm/usrCntlMDMDatenverarbeitungAuswertungen_divers.vb b/SDL/mdm/usrCntlMDMDatenverarbeitungAuswertungen_divers.vb index 736f032c..9dc1ee18 100644 --- a/SDL/mdm/usrCntlMDMDatenverarbeitungAuswertungen_divers.vb +++ b/SDL/mdm/usrCntlMDMDatenverarbeitungAuswertungen_divers.vb @@ -27,41 +27,81 @@ Public Class usrCntlMDMDatenverarbeitungAuswertungen_divers Sub init() + Button1.Visible = True + Button2.Visible = True + Button3.Visible = True + Button4.Visible = True + + Select Case Lieferant Case "PLOSE" - Button6.Text = "Auswertung IT Maut (Konsortium)" - Button2.Text = "Auswert. Kunden (Konsortium)" - Button1.Text = "Auswertung nach Länder EU Kunden" + + Button1.Text = "nach Länder EU Kunden" + Button1.Image = My.Resources.statistik_small Button1.Visible = False + + Button2.Text = "Kunden (Konsortium)" + Button2.Image = My.Resources.statistik_small + + Button3.Visible = False + + Button4.Text = "IT Maut (Konsortium)" + Button4.Image = My.Resources.statistik_small + cbxConsFakt.Visible = True cbxNurEULander.Visible = True - Case "UTA" + Case "UTA" 'alles excel + + Button4.Text = "fehl. KdNr" + Button4.Image = My.Resources.Excel_logo + + Button2.Text = "fehl. Fakt-warenart" + Button2.Image = My.Resources.Excel_logo + + + + Button1.Text = "fehl Offertenpos." + Button1.Image = My.Resources.Excel_logo + - Button6.Text = "fehlende KdNr" - Button2.Text = "fehlende Fakt.warenart" - Button1.Text = "fehlende Offertenpos." Button3.Text = "Vergleich Bericht" - Button3.Visible = True + Button3.Image = My.Resources.Excel_logo - Case "MSE" - Button6.Text = "Nach Spezifikation" - Button2.Text = "Leistungsnummern" + Case "MSE" 'alles excel + Button1.Text = "Kunden" - Button3.Text = "fehlende Transakt." - Button3.Visible = True + Button1.Image = My.Resources.Excel_logo + + Button2.Text = "Leistung-Nr." + Button2.Image = My.Resources.Excel_logo + + Button3.Text = "fehl. Transakt." + Button3.Image = My.Resources.Excel_logo + + Button4.Text = "Nach Spezifikation" + Button4.Image = My.Resources.Excel_logo + + + + + Case "IDS" 'alles excel - Case "IDS" - Button2.Visible = False - Button6.Visible = True - Button2.Text = "Nach Spezifikation" - Button6.Text = "fehl. Offerten" Button1.Text = "Kunden" + Button1.Image = My.Resources.Excel_logo + + Button2.Text = "fehl. Stationen AT" + Button2.Image = My.Resources.Excel_logo + Button3.Text = "Ländercodes" - Button3.Visible = True + Button3.Image = My.Resources.Excel_logo + + Button4.Text = "fehl. Offerten" + Button4.Image = My.Resources.Excel_logo + Case Else @@ -87,7 +127,7 @@ Public Class usrCntlMDMDatenverarbeitungAuswertungen_divers End Function - Private Sub Button6_Click(sender As Object, e As EventArgs) Handles Button6.Click + Private Sub Button6_Click(sender As Object, e As EventArgs) Handles Button4.Click Select Case Lieferant @@ -154,6 +194,9 @@ Public Class usrCntlMDMDatenverarbeitungAuswertungen_divers Case "MSE" genMSEBericht("LENR") + Case "IDS" + genIDSBericht("STATIONEN_AT") + End Select @@ -608,6 +651,14 @@ Public Class usrCntlMDMDatenverarbeitungAuswertungen_divers ORDER BY tblIDSTransactionsNew.[CustomerCode];" + + Case "STATIONEN_AT" + + sqlstr = "select tblIDSTransactionsNew.OutletCode, tblIDSTransactionsNew.OutletCountry, tblIDSTransactionsNew.OutletName + from tblIDSTransactionsNew where cast(tblIDSTransactionsNew.YearMonthDay As Date) = '" & MAIN.DateTimePicker2.Text & "' and OutletCountry = 'Austria' and tblIDSTransactionsNew.OutletCode not in (select tbl_IDS_Stationen.OutletCode from tbl_IDS_Stationen) + group by tblIDSTransactionsNew.OutletCode, tblIDSTransactionsNew.OutletCountry, tblIDSTransactionsNew.OutletName " + + Case "OFFERTEN" Dim dtKunden = SQL.loadDgvBySql("Select distinct(tblIDSTransactionsNew.KdNrVERAG) from tblIDSTransactionsNew where cast(tblIDSTransactionsNew.YearMonthDay As Date) = '" & MAIN.DateTimePicker2.Text & "'", "FMZOLL") diff --git a/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb b/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb index 13071916..076cf153 100644 --- a/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb +++ b/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb @@ -271,6 +271,10 @@ Partial Class usrCntlZOLLAuswertungen Me.Label96 = New System.Windows.Forms.Label() Me.von_CBAM = New System.Windows.Forms.DateTimePicker() Me.pnl = New System.Windows.Forms.Panel() + Me.Label101 = New System.Windows.Forms.Label() + Me.Button2 = New System.Windows.Forms.Button() + Me.Label102 = New System.Windows.Forms.Label() + Me.Label103 = New System.Windows.Forms.Label() Me.GroupBox1.SuspendLayout() Me.grpDurmaz.SuspendLayout() CType(Me.picDurmaz, System.ComponentModel.ISupportInitialize).BeginInit() @@ -1314,7 +1318,7 @@ Partial Class usrCntlZOLLAuswertungen Me.tbcntr.Location = New System.Drawing.Point(0, 57) Me.tbcntr.Name = "tbcntr" Me.tbcntr.SelectedIndex = 0 - Me.tbcntr.Size = New System.Drawing.Size(1109, 1829) + Me.tbcntr.Size = New System.Drawing.Size(1092, 1829) Me.tbcntr.TabIndex = 22 ' 'TabPage1 @@ -1357,7 +1361,7 @@ Partial Class usrCntlZOLLAuswertungen Me.TabPage1.Location = New System.Drawing.Point(4, 22) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(1101, 1803) + Me.TabPage1.Size = New System.Drawing.Size(1084, 1803) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Bürgschaften" Me.TabPage1.UseVisualStyleBackColor = True @@ -2584,7 +2588,7 @@ Partial Class usrCntlZOLLAuswertungen Me.TabPage3.Location = New System.Drawing.Point(4, 22) Me.TabPage3.Name = "TabPage3" Me.TabPage3.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage3.Size = New System.Drawing.Size(1118, 1803) + Me.TabPage3.Size = New System.Drawing.Size(1101, 1803) Me.TabPage3.TabIndex = 2 Me.TabPage3.Text = "Fiskalvertretung / EV-Veranlagung" Me.TabPage3.UseVisualStyleBackColor = True @@ -2619,7 +2623,7 @@ Partial Class usrCntlZOLLAuswertungen Me.TabPage4.Controls.Add(Me.UsrCntlAuswertungenAufschub_Abgabenliste1) Me.TabPage4.Location = New System.Drawing.Point(4, 22) Me.TabPage4.Name = "TabPage4" - Me.TabPage4.Size = New System.Drawing.Size(1118, 1803) + Me.TabPage4.Size = New System.Drawing.Size(1101, 1803) Me.TabPage4.TabIndex = 3 Me.TabPage4.Text = "Aufschubdaten" Me.TabPage4.UseVisualStyleBackColor = True @@ -2648,7 +2652,7 @@ Partial Class usrCntlZOLLAuswertungen Me.TabPage5.Location = New System.Drawing.Point(4, 22) Me.TabPage5.Name = "TabPage5" Me.TabPage5.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage5.Size = New System.Drawing.Size(1118, 1803) + Me.TabPage5.Size = New System.Drawing.Size(1084, 1803) Me.TabPage5.TabIndex = 4 Me.TabPage5.Text = "UNISPED" Me.TabPage5.UseVisualStyleBackColor = True @@ -2852,6 +2856,10 @@ Partial Class usrCntlZOLLAuswertungen ' 'TabPage6 ' + Me.TabPage6.Controls.Add(Me.Label103) + Me.TabPage6.Controls.Add(Me.Label102) + Me.TabPage6.Controls.Add(Me.Button2) + Me.TabPage6.Controls.Add(Me.Label101) Me.TabPage6.Controls.Add(Me.cbxCBAM_Detaildaten) Me.TabPage6.Controls.Add(Me.Label100) Me.TabPage6.Controls.Add(Me.cbxcbamQuelle) @@ -2863,7 +2871,7 @@ Partial Class usrCntlZOLLAuswertungen Me.TabPage6.Controls.Add(Me.von_CBAM) Me.TabPage6.Location = New System.Drawing.Point(4, 22) Me.TabPage6.Name = "TabPage6" - Me.TabPage6.Size = New System.Drawing.Size(1118, 1803) + Me.TabPage6.Size = New System.Drawing.Size(1084, 1803) Me.TabPage6.TabIndex = 5 Me.TabPage6.Text = "CBAM" Me.TabPage6.UseVisualStyleBackColor = True @@ -2871,7 +2879,7 @@ Partial Class usrCntlZOLLAuswertungen 'cbxCBAM_Detaildaten ' Me.cbxCBAM_Detaildaten.AutoSize = True - Me.cbxCBAM_Detaildaten.Location = New System.Drawing.Point(13, 80) + Me.cbxCBAM_Detaildaten.Location = New System.Drawing.Point(13, 102) Me.cbxCBAM_Detaildaten.Name = "cbxCBAM_Detaildaten" Me.cbxCBAM_Detaildaten.Size = New System.Drawing.Size(126, 17) Me.cbxCBAM_Detaildaten.TabIndex = 29 @@ -2881,7 +2889,7 @@ Partial Class usrCntlZOLLAuswertungen 'Label100 ' Me.Label100.AutoSize = True - Me.Label100.Location = New System.Drawing.Point(10, 37) + Me.Label100.Location = New System.Drawing.Point(10, 59) Me.Label100.Name = "Label100" Me.Label100.Size = New System.Drawing.Size(37, 13) Me.Label100.TabIndex = 28 @@ -2897,7 +2905,7 @@ Partial Class usrCntlZOLLAuswertungen Me.cbxcbamQuelle.DropDownWidth = 100 Me.cbxcbamQuelle.FormattingEnabled = True Me.cbxcbamQuelle.IntegralHeight = False - Me.cbxcbamQuelle.Location = New System.Drawing.Point(13, 53) + Me.cbxcbamQuelle.Location = New System.Drawing.Point(13, 75) Me.cbxcbamQuelle.Name = "cbxcbamQuelle" Me.cbxcbamQuelle.Size = New System.Drawing.Size(85, 21) Me.cbxcbamQuelle.TabIndex = 27 @@ -2905,7 +2913,7 @@ Partial Class usrCntlZOLLAuswertungen 'Label99 ' Me.Label99.AutoSize = True - Me.Label99.Location = New System.Drawing.Point(224, 56) + Me.Label99.Location = New System.Drawing.Point(224, 78) Me.Label99.Name = "Label99" Me.Label99.Size = New System.Drawing.Size(23, 13) Me.Label99.TabIndex = 26 @@ -2914,7 +2922,7 @@ Partial Class usrCntlZOLLAuswertungen 'bis_CBAM ' Me.bis_CBAM.Format = System.Windows.Forms.DateTimePickerFormat.[Short] - Me.bis_CBAM.Location = New System.Drawing.Point(253, 53) + Me.bis_CBAM.Location = New System.Drawing.Point(253, 75) Me.bis_CBAM.Name = "bis_CBAM" Me.bis_CBAM.Size = New System.Drawing.Size(93, 20) Me.bis_CBAM.TabIndex = 25 @@ -2936,7 +2944,7 @@ Partial Class usrCntlZOLLAuswertungen Me.excelCbam.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) Me.excelCbam.Image = Global.SDL.My.Resources.Resources.Excel_logo Me.excelCbam.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.excelCbam.Location = New System.Drawing.Point(13, 103) + Me.excelCbam.Location = New System.Drawing.Point(13, 125) Me.excelCbam.Name = "excelCbam" Me.excelCbam.Padding = New System.Windows.Forms.Padding(0, 0, 25, 0) Me.excelCbam.Size = New System.Drawing.Size(121, 38) @@ -2948,7 +2956,7 @@ Partial Class usrCntlZOLLAuswertungen 'Label96 ' Me.Label96.AutoSize = True - Me.Label96.Location = New System.Drawing.Point(114, 37) + Me.Label96.Location = New System.Drawing.Point(114, 59) Me.Label96.Name = "Label96" Me.Label96.Size = New System.Drawing.Size(38, 13) Me.Label96.TabIndex = 21 @@ -2957,7 +2965,7 @@ Partial Class usrCntlZOLLAuswertungen 'von_CBAM ' Me.von_CBAM.Format = System.Windows.Forms.DateTimePickerFormat.[Short] - Me.von_CBAM.Location = New System.Drawing.Point(117, 53) + Me.von_CBAM.Location = New System.Drawing.Point(117, 75) Me.von_CBAM.Name = "von_CBAM" Me.von_CBAM.Size = New System.Drawing.Size(93, 20) Me.von_CBAM.TabIndex = 20 @@ -2968,9 +2976,53 @@ Partial Class usrCntlZOLLAuswertungen Me.pnl.Dock = System.Windows.Forms.DockStyle.Top Me.pnl.Location = New System.Drawing.Point(0, 0) Me.pnl.Name = "pnl" - Me.pnl.Size = New System.Drawing.Size(1109, 57) + Me.pnl.Size = New System.Drawing.Size(1092, 57) Me.pnl.TabIndex = 23 ' + 'Label101 + ' + Me.Label101.AutoSize = True + Me.Label101.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label101.ForeColor = System.Drawing.SystemColors.ControlDarkDark + Me.Label101.Location = New System.Drawing.Point(10, 176) + Me.Label101.Name = "Label101" + Me.Label101.Size = New System.Drawing.Size(154, 17) + Me.Label101.TabIndex = 30 + Me.Label101.Text = "CBAM Kundenstatus" + ' + 'Button2 + ' + Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button2.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button2.Image = Global.SDL.My.Resources.Resources.Excel_logo + Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button2.Location = New System.Drawing.Point(13, 229) + Me.Button2.Name = "Button2" + Me.Button2.Padding = New System.Windows.Forms.Padding(0, 0, 25, 0) + Me.Button2.Size = New System.Drawing.Size(121, 38) + Me.Button2.TabIndex = 31 + Me.Button2.Text = "Excel" + Me.Button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button2.UseVisualStyleBackColor = True + ' + 'Label102 + ' + Me.Label102.AutoSize = True + Me.Label102.Location = New System.Drawing.Point(10, 200) + Me.Label102.Name = "Label102" + Me.Label102.Size = New System.Drawing.Size(192, 13) + Me.Label102.TabIndex = 32 + Me.Label102.Text = "Kundenliste mit aktuellem CBAM-Status" + ' + 'Label103 + ' + Me.Label103.AutoSize = True + Me.Label103.Location = New System.Drawing.Point(10, 35) + Me.Label103.Name = "Label103" + Me.Label103.Size = New System.Drawing.Size(225, 13) + Me.Label103.TabIndex = 33 + Me.Label103.Text = "Liste der Kunden mit CBAM-pflichtigen Waren " + ' 'usrCntlZOLLAuswertungen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -2980,7 +3032,7 @@ Partial Class usrCntlZOLLAuswertungen Me.Controls.Add(Me.tbcntr) Me.Controls.Add(Me.pnl) Me.Name = "usrCntlZOLLAuswertungen" - Me.Size = New System.Drawing.Size(1109, 1174) + Me.Size = New System.Drawing.Size(1092, 1174) Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.PerformLayout() Me.grpDurmaz.ResumeLayout(False) @@ -3295,4 +3347,8 @@ Partial Class usrCntlZOLLAuswertungen Friend WithEvents Label96 As Label Friend WithEvents von_CBAM As DateTimePicker Friend WithEvents cbxCBAM_Detaildaten As CheckBox + Friend WithEvents Button2 As Button + Friend WithEvents Label101 As Label + Friend WithEvents Label102 As Label + Friend WithEvents Label103 As Label End Class diff --git a/SDL/zoll/usrCntlZOLLAuswertungen.vb b/SDL/zoll/usrCntlZOLLAuswertungen.vb index f769b24b..52b0fbda 100644 --- a/SDL/zoll/usrCntlZOLLAuswertungen.vb +++ b/SDL/zoll/usrCntlZOLLAuswertungen.vb @@ -1,4 +1,5 @@ -Imports System.IO +Imports System.Data.SqlTypes +Imports System.IO Imports GrapeCity.DataVisualization.Chart Public Class usrCntlZOLLAuswertungen @@ -1218,6 +1219,22 @@ and End Function + Private Sub Button2_Click_2(sender As Object, e As EventArgs) Handles Button2.Click + + Dim sqlString = + "select Adressen.Auswahl as Aktiv,KundenNr, [Name 1] as Name, isnull(Adressen.[E-Mail],'') as Mail, isnull(Adressen.[E-Mail2],'') as Mail2 ,isnull(Anrede,'') as Anrede ,isnull(Ansprechpartner,'') as Ansprechpartner, isnull(Adressen.Telefon,'') as Telefon, kde_CBAM_Status as CBAM_Status from Adressen + inner join Kunden on Kunden.KundenNr = Adressen.AdressenNr + inner join tblKundenErweitert on kde_KundenNr = Adressen.AdressenNr + where isnull(kde_CBAM_Status,'') <> ''" + + Dim dt As DataTable = SQL.loadDgvBySql(SqlString, "FMZOLL", 700) + If dt IsNot Nothing Then + cProgramFunctions.genExcelFromDT_NEW(dt) + End If + + + End Sub + diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cAdressen.vb b/VERAG_PROG_ALLGEMEIN/Classes/cAdressen.vb index d3bbb16d..bffc9784 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cAdressen.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cAdressen.vb @@ -45,8 +45,8 @@ Public Class cAdressen 'Property SSMA_TimeStamp As Object = Nothing Property MWSTVorauszahlung As Object = Nothing Property PLOSEKundenNr As Object = Nothing - Property weitereWölflKundenNr As Object = Nothing + Property IDSMautbericht_nachOrt As Object = Nothing Public hasEntry = False @@ -143,6 +143,7 @@ Public Class cAdressen list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("MWSTVorauszahlung", MWSTVorauszahlung)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("PLOSEKundenNr", PLOSEKundenNr)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("weitereWölflKundenNr", weitereWölflKundenNr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("IDSMautbericht_nachOrt", IDSMautbericht_nachOrt)) Return list End Function diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/MIC/cMIC.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/MIC/cMIC.vb index 0d3d0d4a..901b830b 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/MIC/cMIC.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/MIC/cMIC.vb @@ -252,5 +252,13 @@ End Function + Public Class Paramter + + Shared SQL As New VERAG_PROG_ALLGEMEIN.SQL + Shared Function GET_PARAM_ByName(tcParam_name, TESTSYSTEM) As String + Return SQL.getValueTxtBySql("SELECT TOP 1 [Param_value] FROM [tblPartnersystem_Paramter] WHERE Param_system='MIC' AND [Param_name]='" & tcParam_name & "' AND Param_testsystem = " & IIf(TESTSYSTEM, 1, 0), , , SQL.GetNewOpenConnectionFMZOLL_SYSTEM(TESTSYSTEM)) + End Function + End Class + End Class diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb index 8161d527..abae6fa0 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb @@ -242,7 +242,7 @@ Public Class cSyska_Interface If dt_Stamm IsNot Nothing AndAlso dt_Stamm.Rows.Count > 0 Then If FiBuSchnittstelleNr = 19 Then postfix = "MDM_" Dim fileKD As System.IO.StreamWriter - Dim DateinameKD = "AVISO_DEBI_" & postfix & Now.ToString("ddMMyyyy_HHmm") & ".txt" + Dim DateinameKD = "AVISO_DEBI_" & Now.ToString("ddMMyyyy_HHmm") & postfix & ".txt" fileKD = My.Computer.FileSystem.OpenTextFileWriter(pathKD & DateinameKD, True, System.Text.Encoding.GetEncoding("iso-8859-15"))