diff --git a/SDL/Classes/cEORIWebService.vb b/SDL/Classes/cEORIWebService.vb index 4a6a4d04..977238f6 100644 --- a/SDL/Classes/cEORIWebService.vb +++ b/SDL/Classes/cEORIWebService.vb @@ -229,12 +229,16 @@ Public Class cEORIWebService Shared Sub setEORIEntry(kdnr As Integer, SendungsID As Integer, EORI_ERG As EoriResponseModel) Dim EORIPruefung = New cEORIPruefung() + Dim kdErw = New VERAG_PROG_ALLGEMEIN.cKundenErweitert(kdnr) Select Case EORI_ERG.Result(0).Status Case 0 : EORIPruefung.eori_valid = 1 Case 1 : EORIPruefung.eori_valid = 0 End Select + kdErw.kde_EORIgeprueftAm = Now() + kdErw.SAVE() + EORIPruefung.eori_datum = Now() EORIPruefung.eori_KdNr = kdnr EORIPruefung.eori_maid = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID diff --git a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb index 744f4e27..ccfa083d 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb @@ -3031,7 +3031,7 @@ Partial Class usrCntlKundenuebersicht Me.lblEORI.ReadOnly = True Me.lblEORI.Size = New System.Drawing.Size(322, 16) Me.lblEORI.TabIndex = 8 - Me.lblEORI.Text = "AT000000000000000" + Me.lblEORI.Text = "AT000000000000000 , gepr. am: 01.01.2000" ' 'lblEORINr ' diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index 90939600..2a7741df 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -426,6 +426,9 @@ Public Class usrCntlKundenuebersicht lblEORI.Text = "" If checkNullStr(KUNDE.EORITIN) <> "" Then lblEORI.Text = (checkNullStr(KUNDE.EORITIN) & " " & checkNullStr(KUNDE.EORITIN_NL)).Trim + If checkNullStr(KUNDE_ERW.kde_EORIgeprueftAm) <> "" Then + lblEORI.Text &= " , geprüft: " & checkNullStr(KUNDE_ERW.kde_EORIgeprueftAm) + End If End If If lblEORI.Text = "" Then Button4.Visible = False : Button3.Visible = False : Button2.Visible = False If lblUid.Text = "" Then Button1.Visible = False : Button5.Visible = False : Button10.Visible = False diff --git a/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb b/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb index b168715a..7c4fbd11 100644 --- a/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb +++ b/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb @@ -22,7 +22,6 @@ Partial Class usrcntlFiskaluebersicht 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() - Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrcntlFiskaluebersicht)) Me.btn = New System.Windows.Forms.Button() Me.lblFiskaluebersicht = New System.Windows.Forms.Label() @@ -32,16 +31,19 @@ Partial Class usrcntlFiskaluebersicht Me.Button4 = New System.Windows.Forms.Button() Me.picLocked = New System.Windows.Forms.PictureBox() Me.cbxFiskalart = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) + Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel() Me.btnOK = New System.Windows.Forms.Button() Me.btnSave = New System.Windows.Forms.Button() Me.btnPDFReport = New System.Windows.Forms.Button() - Me.dgvFiskaluebersicht = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.MyPanel2 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) + Me.dgvFiskaluebersicht = New VERAG_PROG_ALLGEMEIN.MyDatagridview() + Me.MyPanel2 = New VERAG_PROG_ALLGEMEIN.MyPanel() + Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label5 = New System.Windows.Forms.Label() + Me.Label4 = New System.Windows.Forms.Label() Me.lblAbschluss = New System.Windows.Forms.Label() - Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.dgvEmpfaenger = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.dgvLieferanten = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.cbxBeurteilung = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.dgvEmpfaenger = New VERAG_PROG_ALLGEMEIN.MyDatagridview() + Me.dgvLieferanten = New VERAG_PROG_ALLGEMEIN.MyDatagridview() Me.Button3 = New System.Windows.Forms.Button() Me.lblBeurteilung = New System.Windows.Forms.Label() Me.Label3 = New System.Windows.Forms.Label() @@ -51,10 +53,6 @@ Partial Class usrcntlFiskaluebersicht Me.Button2 = New System.Windows.Forms.Button() Me.picEORIOK = New System.Windows.Forms.PictureBox() Me.picOK = New System.Windows.Forms.PictureBox() - Me.scanHandelsreg = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() - Me.scanPass = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() - Me.scanFB = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() - Me.scanInfo = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() Me.usrcntlUnterlagen = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() Me.Button1 = New System.Windows.Forms.Button() Me.cbxVollmacht = New System.Windows.Forms.CheckBox() @@ -66,9 +64,11 @@ Partial Class usrcntlFiskaluebersicht Me.cbxHomepage = New System.Windows.Forms.CheckBox() Me.txtEORI = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtHomepage = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.dgvUnterlagen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.dgvUnterlagen = New VERAG_PROG_ALLGEMEIN.MyDatagridview() Me.cbxUID = New System.Windows.Forms.CheckBox() Me.txtUID = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.cbxAttachmentArt = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.btnAddAttachments = New System.Windows.Forms.Button() CType(Me.picLocked, System.ComponentModel.ISupportInitialize).BeginInit() Me.MyPanel1.SuspendLayout() CType(Me.dgvFiskaluebersicht, System.ComponentModel.ISupportInitialize).BeginInit() @@ -246,14 +246,20 @@ Partial Class usrcntlFiskaluebersicht ' 'MyPanel2 ' - Me.MyPanel2.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.MyPanel2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.MyPanel2.AutoScroll = True Me.MyPanel2.AutoScrollMargin = New System.Drawing.Size(0, 10) Me.MyPanel2.AutoScrollMinSize = New System.Drawing.Size(0, 10) Me.MyPanel2.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.MyPanel2.BackColor = System.Drawing.Color.White + Me.MyPanel2.Controls.Add(Me.btnAddAttachments) + Me.MyPanel2.Controls.Add(Me.cbxAttachmentArt) + Me.MyPanel2.Controls.Add(Me.MyTextBox1) + Me.MyPanel2.Controls.Add(Me.Label5) + Me.MyPanel2.Controls.Add(Me.Label4) Me.MyPanel2.Controls.Add(Me.lblAbschluss) - Me.MyPanel2.Controls.Add(Me.MyComboBox1) + Me.MyPanel2.Controls.Add(Me.cbxBeurteilung) Me.MyPanel2.Controls.Add(Me.dgvEmpfaenger) Me.MyPanel2.Controls.Add(Me.dgvLieferanten) Me.MyPanel2.Controls.Add(Me.Button3) @@ -265,10 +271,6 @@ Partial Class usrcntlFiskaluebersicht Me.MyPanel2.Controls.Add(Me.Button2) Me.MyPanel2.Controls.Add(Me.picEORIOK) Me.MyPanel2.Controls.Add(Me.picOK) - Me.MyPanel2.Controls.Add(Me.scanHandelsreg) - Me.MyPanel2.Controls.Add(Me.scanPass) - Me.MyPanel2.Controls.Add(Me.scanFB) - Me.MyPanel2.Controls.Add(Me.scanInfo) Me.MyPanel2.Controls.Add(Me.usrcntlUnterlagen) Me.MyPanel2.Controls.Add(Me.Button1) Me.MyPanel2.Controls.Add(Me.cbxVollmacht) @@ -288,26 +290,68 @@ Partial Class usrcntlFiskaluebersicht Me.MyPanel2.Size = New System.Drawing.Size(721, 657) Me.MyPanel2.TabIndex = 110 ' + 'MyTextBox1 + ' + Me.MyTextBox1._DateTimeOnly = False + Me.MyTextBox1._numbersOnly = False + Me.MyTextBox1._numbersOnlyKommastellen = "" + Me.MyTextBox1._numbersOnlyTrennzeichen = True + Me.MyTextBox1._Prozent = False + Me.MyTextBox1._ShortDateNew = False + Me.MyTextBox1._ShortDateOnly = False + Me.MyTextBox1._TimeOnly = False + Me.MyTextBox1._TimeOnly_Seconds = False + Me.MyTextBox1._value = Nothing + Me.MyTextBox1._Waehrung = False + Me.MyTextBox1._WaehrungZeichen = True + Me.MyTextBox1.ForeColor = System.Drawing.Color.Black + Me.MyTextBox1.Location = New System.Drawing.Point(144, 593) + Me.MyTextBox1.MaxLineLength = -1 + Me.MyTextBox1.MaxLines_Warning = "" + Me.MyTextBox1.MaxLines_Warning_Label = Nothing + Me.MyTextBox1.Name = "MyTextBox1" + Me.MyTextBox1.Size = New System.Drawing.Size(500, 20) + Me.MyTextBox1.TabIndex = 141 + ' + 'Label5 + ' + Me.Label5.AutoSize = True + Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label5.Location = New System.Drawing.Point(4, 591) + Me.Label5.Name = "Label5" + Me.Label5.Size = New System.Drawing.Size(61, 20) + Me.Label5.TabIndex = 140 + Me.Label5.Text = "Waren" + ' + 'Label4 + ' + Me.Label4.AutoSize = True + Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label4.Location = New System.Drawing.Point(4, 430) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(0, 20) + Me.Label4.TabIndex = 139 + ' 'lblAbschluss ' Me.lblAbschluss.AutoSize = True Me.lblAbschluss.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAbschluss.Location = New System.Drawing.Point(584, 739) + Me.lblAbschluss.Location = New System.Drawing.Point(508, 741) Me.lblAbschluss.Name = "lblAbschluss" Me.lblAbschluss.Size = New System.Drawing.Size(0, 20) Me.lblAbschluss.TabIndex = 138 Me.lblAbschluss.TextAlign = System.Drawing.ContentAlignment.TopRight ' - 'MyComboBox1 + 'cbxBeurteilung ' - Me.MyComboBox1._allowedValuesFreiText = Nothing - Me.MyComboBox1._allowFreiText = False - Me.MyComboBox1._value = "" - Me.MyComboBox1.FormattingEnabled = True - Me.MyComboBox1.Location = New System.Drawing.Point(271, 738) - Me.MyComboBox1.Name = "MyComboBox1" - Me.MyComboBox1.Size = New System.Drawing.Size(70, 21) - Me.MyComboBox1.TabIndex = 131 + Me.cbxBeurteilung._allowedValuesFreiText = Nothing + Me.cbxBeurteilung._allowFreiText = False + Me.cbxBeurteilung._value = "" + Me.cbxBeurteilung.FormattingEnabled = True + Me.cbxBeurteilung.Location = New System.Drawing.Point(150, 681) + Me.cbxBeurteilung.Name = "cbxBeurteilung" + Me.cbxBeurteilung.Size = New System.Drawing.Size(70, 21) + Me.cbxBeurteilung.TabIndex = 131 ' 'dgvEmpfaenger ' @@ -326,7 +370,6 @@ Partial Class usrcntlFiskaluebersicht Me.dgvEmpfaenger.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvEmpfaenger.Size = New System.Drawing.Size(255, 92) Me.dgvEmpfaenger.TabIndex = 137 - Me.dgvEmpfaenger.Visible = False ' 'dgvLieferanten ' @@ -345,7 +388,6 @@ Partial Class usrcntlFiskaluebersicht Me.dgvLieferanten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvLieferanten.Size = New System.Drawing.Size(239, 92) Me.dgvLieferanten.TabIndex = 136 - Me.dgvLieferanten.Visible = False ' 'Button3 ' @@ -364,7 +406,7 @@ Partial Class usrcntlFiskaluebersicht ' Me.lblBeurteilung.AutoSize = True Me.lblBeurteilung.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblBeurteilung.Location = New System.Drawing.Point(144, 739) + Me.lblBeurteilung.Location = New System.Drawing.Point(4, 682) Me.lblBeurteilung.Name = "lblBeurteilung" Me.lblBeurteilung.Size = New System.Drawing.Size(101, 20) Me.lblBeurteilung.TabIndex = 134 @@ -440,82 +482,7 @@ Partial Class usrcntlFiskaluebersicht Me.picOK.Size = New System.Drawing.Size(19, 17) Me.picOK.TabIndex = 127 Me.picOK.TabStop = False - ' - 'scanHandelsreg - ' - Me.scanHandelsreg._ARCHIV = False - Me.scanHandelsreg._DATENSERVER_KATEGORIE = "DOKUMENTE" - Me.scanHandelsreg._DATENSERVER_ORDNER = "" - Me.scanHandelsreg._DATENSERVER_UOrdner1 = "" - Me.scanHandelsreg._DATENSERVER_UOrdner2 = "" - Me.scanHandelsreg._DATENSERVER_UOrdner3 = "" - Me.scanHandelsreg._MULTI_FILES = True - Me.scanHandelsreg._TEXT_PDF = "Handelsregister" - Me.scanHandelsreg.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.scanHandelsreg.BackColor = System.Drawing.Color.White - Me.scanHandelsreg.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.scanHandelsreg.Cursor = System.Windows.Forms.Cursors.Hand - Me.scanHandelsreg.Location = New System.Drawing.Point(8, 227) - Me.scanHandelsreg.Name = "scanHandelsreg" - Me.scanHandelsreg.Size = New System.Drawing.Size(130, 24) - Me.scanHandelsreg.TabIndex = 126 - ' - 'scanPass - ' - Me.scanPass._ARCHIV = False - Me.scanPass._DATENSERVER_KATEGORIE = "DOKUMENTE" - Me.scanPass._DATENSERVER_ORDNER = "" - Me.scanPass._DATENSERVER_UOrdner1 = "" - Me.scanPass._DATENSERVER_UOrdner2 = "" - Me.scanPass._DATENSERVER_UOrdner3 = "" - Me.scanPass._MULTI_FILES = True - Me.scanPass._TEXT_PDF = "Pass" - Me.scanPass.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.scanPass.BackColor = System.Drawing.Color.White - Me.scanPass.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.scanPass.Cursor = System.Windows.Forms.Cursors.Hand - Me.scanPass.Location = New System.Drawing.Point(8, 197) - Me.scanPass.Name = "scanPass" - Me.scanPass.Size = New System.Drawing.Size(130, 24) - Me.scanPass.TabIndex = 125 - ' - 'scanFB - ' - Me.scanFB._ARCHIV = False - Me.scanFB._DATENSERVER_KATEGORIE = "DOKUMENTE" - Me.scanFB._DATENSERVER_ORDNER = "" - Me.scanFB._DATENSERVER_UOrdner1 = "" - Me.scanFB._DATENSERVER_UOrdner2 = "" - Me.scanFB._DATENSERVER_UOrdner3 = "" - Me.scanFB._MULTI_FILES = True - Me.scanFB._TEXT_PDF = "Firmenbuch" - Me.scanFB.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.scanFB.BackColor = System.Drawing.Color.White - Me.scanFB.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.scanFB.Cursor = System.Windows.Forms.Cursors.Hand - Me.scanFB.Location = New System.Drawing.Point(8, 163) - Me.scanFB.Name = "scanFB" - Me.scanFB.Size = New System.Drawing.Size(130, 24) - Me.scanFB.TabIndex = 124 - ' - 'scanInfo - ' - Me.scanInfo._ARCHIV = False - Me.scanInfo._DATENSERVER_KATEGORIE = "DOKUMENTE" - Me.scanInfo._DATENSERVER_ORDNER = "" - Me.scanInfo._DATENSERVER_UOrdner1 = "" - Me.scanInfo._DATENSERVER_UOrdner2 = "" - Me.scanInfo._DATENSERVER_UOrdner3 = "" - Me.scanInfo._MULTI_FILES = True - Me.scanInfo._TEXT_PDF = "Info" - Me.scanInfo.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.scanInfo.BackColor = System.Drawing.Color.White - Me.scanInfo.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.scanInfo.Cursor = System.Windows.Forms.Cursors.Hand - Me.scanInfo.Location = New System.Drawing.Point(8, 133) - Me.scanInfo.Name = "scanInfo" - Me.scanInfo.Size = New System.Drawing.Size(130, 24) - Me.scanInfo.TabIndex = 123 + Me.picOK.Visible = False ' 'usrcntlUnterlagen ' @@ -759,6 +726,30 @@ Partial Class usrcntlFiskaluebersicht Me.txtUID.Size = New System.Drawing.Size(83, 20) Me.txtUID.TabIndex = 106 ' + 'cbxAttachmentArt + ' + Me.cbxAttachmentArt._allowedValuesFreiText = Nothing + Me.cbxAttachmentArt._allowFreiText = False + Me.cbxAttachmentArt._value = "" + Me.cbxAttachmentArt.FormattingEnabled = True + Me.cbxAttachmentArt.Location = New System.Drawing.Point(8, 163) + Me.cbxAttachmentArt.Name = "cbxAttachmentArt" + Me.cbxAttachmentArt.Size = New System.Drawing.Size(76, 21) + Me.cbxAttachmentArt.TabIndex = 131 + ' + 'btnAddAttachments + ' + Me.btnAddAttachments.BackgroundImage = Global.SDL.My.Resources.Resources.plus + Me.btnAddAttachments.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnAddAttachments.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnAddAttachments.ForeColor = System.Drawing.Color.Black + Me.btnAddAttachments.Location = New System.Drawing.Point(90, 165) + Me.btnAddAttachments.Name = "btnAddAttachments" + Me.btnAddAttachments.Size = New System.Drawing.Size(29, 19) + Me.btnAddAttachments.TabIndex = 142 + Me.btnAddAttachments.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnAddAttachments.UseVisualStyleBackColor = True + ' 'usrcntlFiskaluebersicht ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -819,10 +810,6 @@ Partial Class usrcntlFiskaluebersicht Friend WithEvents lblWarning As Label Friend WithEvents Button4 As Button Friend WithEvents usrcntlUnterlagen As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList - Friend WithEvents scanHandelsreg As VERAG_PROG_ALLGEMEIN.usrcntlPDFScan - Friend WithEvents scanPass As VERAG_PROG_ALLGEMEIN.usrcntlPDFScan - Friend WithEvents scanFB As VERAG_PROG_ALLGEMEIN.usrcntlPDFScan - Friend WithEvents scanInfo As VERAG_PROG_ALLGEMEIN.usrcntlPDFScan Friend WithEvents picOK As PictureBox Friend WithEvents picEORIOK As PictureBox Friend WithEvents Button2 As Button @@ -835,6 +822,11 @@ Partial Class usrcntlFiskaluebersicht Friend WithEvents Button3 As Button Friend WithEvents dgvEmpfaenger As VERAG_PROG_ALLGEMEIN.MyDatagridview Friend WithEvents dgvLieferanten As VERAG_PROG_ALLGEMEIN.MyDatagridview - Friend WithEvents MyComboBox1 As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents cbxBeurteilung As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents lblAbschluss As Label + Friend WithEvents MyTextBox1 As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label5 As Label + Friend WithEvents Label4 As Label + Friend WithEvents btnAddAttachments As Button + Friend WithEvents cbxAttachmentArt As VERAG_PROG_ALLGEMEIN.MyComboBox End Class diff --git a/SDL/kunden/usrcntlFiskaluebersicht.vb b/SDL/kunden/usrcntlFiskaluebersicht.vb index a7aa944e..1efd8ad9 100644 --- a/SDL/kunden/usrcntlFiskaluebersicht.vb +++ b/SDL/kunden/usrcntlFiskaluebersicht.vb @@ -6,6 +6,9 @@ Imports java.rmi.dgc Imports VERAG_PROG_ALLGEMEIN Imports SDL.EORI Imports DocumentFormat.OpenXml.Vml.Spreadsheet +Imports DAKOSY_Worker.DEERRE +Imports DAKOSY_Worker.VERAG_KundenStamm_Export +Imports DAKOSY_Worker.VERAG_KundenStamm_Export_V2 Public Class usrcntlFiskaluebersicht @@ -20,9 +23,10 @@ Public Class usrcntlFiskaluebersicht Dim DS As VERAG_PROG_ALLGEMEIN.cDATENSERVER Sub initDGVFiskaluebersicht() - dgvFiskaluebersicht.Columns.Clear() + With dgvFiskaluebersicht + .Columns.Clear() .DataSource = SQL.loadDgvBySql("SELECT FK_Id , FK_Datum, FK_Art, FK_locked FROM tblFiskalkunden WHERE FK_Kdnr='" & kdNr & "' ORDER BY FK_Datum ", "FMZOLL") .Columns("FK_Datum").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill @@ -35,17 +39,46 @@ Public Class usrcntlFiskaluebersicht End Sub + Sub initdgv(year As Integer) + + Dim WHEREStatistik = "" + WHEREStatistik &= " YEAR(Abfertigungsdatum) = '" & year & "' AND " + + Label3.Text = "Top 5 Empfänger (" & year & ")" + With dgvEmpfaenger + .Columns.Clear() + .DataSource() = SQL.loadDgvBySql("SELECT Top(5) [EmpfängerKundenNr] as KdNr, CASE WHEN [EmpfängerKundenNr] IS NULL THEN '-' ELSE MAX(Empfänger) END as Firma, COUNT(*) as Anzahl FROM [Speditionsbuch] WHERE " & WHEREStatistik & " " & kdNr & " IN([AbsenderKundenNr],[EmpfängerKundenNr],[FrachtführerKundenNr],[VermittlerKundenNr],[EndempfängerKundenNr]) GROUP BY EmpfängerKundenNr ORDER BY Anzahl DESC ", "FMZOLL") + + + End With + + Label2.Text = "Top 5 Lieferanten (" & year & ")" + With dgvLieferanten + .Columns.Clear() + .DataSource() = SQL.loadDgvBySql("SELECT Top(5) [AbsenderKundenNr] as KdNr, CASE WHEN [AbsenderKundenNr] IS NULL THEN '-' ELSE MAX(Absender) END as Firma, COUNT(*) as Anzahl FROM [Speditionsbuch] WHERE " & WHEREStatistik & " " & kdNr & " IN([AbsenderKundenNr],[EmpfängerKundenNr],[FrachtführerKundenNr],[VermittlerKundenNr],[EndempfängerKundenNr]) GROUP BY AbsenderKundenNr ORDER BY Anzahl DESC ", "FMZOLL") + + + End With + + + End Sub + + + + + + Sub initDGVUnterlagen() - scanFB.INIT(kdNr, "FISKAL-" & fk.FK_Art, fk.FK_Kdnr, fk.FK_Datum) - scanInfo.INIT(kdNr, "FISKAL-" & fk.FK_Art, fk.FK_Kdnr, fk.FK_Datum) - scanPass.INIT(kdNr, "FISKAL-" & fk.FK_Art, fk.FK_Kdnr, fk.FK_Datum) - scanHandelsreg.INIT(kdNr, "FISKAL-" & fk.FK_Art, fk.FK_Kdnr, fk.FK_Datum) + 'scanFB.INIT(kdNr, "FISKAL-" & fk.FK_Art, fk.FK_Kdnr, fk.FK_Datum) + 'scanInfo.INIT(kdNr, "FISKAL-" & fk.FK_Art, fk.FK_Kdnr, fk.FK_Datum) + 'scanPass.INIT(kdNr, "FISKAL-" & fk.FK_Art, fk.FK_Kdnr, fk.FK_Datum) + 'scanHandelsreg.INIT(kdNr, "FISKAL-" & fk.FK_Art, fk.FK_Kdnr, fk.FK_Datum) usrcntlUnterlagen.INIT(kdNr, "FISKAL-" & fk.FK_Art, fk.FK_Kdnr, fk.FK_Datum) 'usrcntlUnterlagen.picAdd.Visible = False - If usrcntlUnterlagen.MyListBox1.Items.Count > 0 Then lblUnterlagen.Text &= " (" & usrcntlUnterlagen.MyListBox1.Items.Count & ")" + If usrcntlUnterlagen.MyListBox1.Items.Count > 0 Then lblUnterlagen.Text = "Unterlagen (" & usrcntlUnterlagen.MyListBox1.Items.Count & ")" Exit Sub With dgvUnterlagen .DataSource = SQL.loadDgvBySql("SELECT [da_id],[da_pfad],[da_name] FROM [tblDatenarchiv] " & @@ -76,13 +109,20 @@ Public Class usrcntlFiskaluebersicht cbxFiskalart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AT", "AT")) cbxFiskalart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DE", "DE")) + + cbxAttachmentArt.Items.Clear() + cbxAttachmentArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Passkopie", "Pass")) + cbxAttachmentArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Firmenbuchauszug", "FB")) + cbxAttachmentArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Handelsregister", "HR")) + cbxAttachmentArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Infoblatt", "Info")) + + kdNr = _kdnr KUNDE = New VERAG_PROG_ALLGEMEIN.cKunde(kdNr) ADRESSE = New VERAG_PROG_ALLGEMEIN.cAdressen(kdNr) lblUnterlagen.Text = "Unterlagen" initDGVFiskaluebersicht() - End Sub Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click @@ -163,6 +203,11 @@ Public Class usrcntlFiskaluebersicht If dgvFiskaluebersicht.SelectedRows.Count > 0 Then fk = New cFiskalkunden(dgvFiskaluebersicht.SelectedRows(0).Cells("FK_Id").Value) + + If checkNullStr(fk.FK_Datum) <> "" Then + initdgv(CDate(fk.FK_Datum).Year) + End If + Dim locked As Boolean = IIf(fk.FK_locked Is Nothing, False, fk.FK_locked) setFields() initDGVUnterlagen() @@ -172,7 +217,9 @@ Public Class usrcntlFiskaluebersicht setUIenabled(locked) Button4.Enabled = True If locked Then - lblAbschluss.Text = fk.FK_MaId & " " & fk.FK_Abschlussdatum + Dim mit = New VERAG_PROG_ALLGEMEIN.cMitarbeiter(fk.FK_MaId) + lblAbschluss.Text = mit.Fullname & " " & fk.FK_Abschlussdatum + Else lblAbschluss.Text = "" End If @@ -537,6 +584,26 @@ Public Class usrcntlFiskaluebersicht End Sub Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Speditionsbuch", "AVISO") Then + + For Each ft As Form In Application.OpenForms + If ft.GetType.ToString = "SDL.frmSpeditionsbuchSuche" Then + ft.BringToFront() + Exit Sub + End If + Next + Me.Cursor = Cursors.WaitCursor + Dim sped As New SDL.frmSpeditionsbuchSuche + sped.Show() + Me.Cursor = Cursors.Default + End If + End Sub + + Private Sub btnAddAttachments_Click(sender As Object, e As EventArgs) Handles btnAddAttachments.Click End Sub + + Private Sub cbxAttachmentArt_SelectedValueChanged(sender As Object, e As EventArgs) Handles cbxAttachmentArt.SelectedValueChanged + btnAddAttachments.Enabled = cbxAttachmentArt._value <> "" + End Sub End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb b/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb index 907c603c..774dea00 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb @@ -74,6 +74,7 @@ Public Class cKundenErweitert Property kde_TOBB_KundenNr As Object = Nothing Property kde_UIDMehrfachverwendung As Boolean = False Property kde_Abrechnung_SendungsdatenAusSTB As Boolean = False + Property kde_EORIgeprueftAm As Object = Nothing Dim SQL As New SQL @@ -149,6 +150,7 @@ Public Class cKundenErweitert list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_Abrechnung_SendungsdatenAusSTB", kde_Abrechnung_SendungsdatenAusSTB)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CreditSaveNo", kde_CreditSaveNo)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_UIDMehrfachverwendung", kde_UIDMehrfachverwendung)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_EORIgeprueftAm", kde_EORIgeprueftAm)) Return list End Function