diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index 7283f981..85f16c82 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -1986,9 +1986,9 @@ Public Class FormularManagerNEU End If If usrCntl.cbxEinmaligeVollmacht.Checked Then - listTowrite = addEinmaligeVM(listTowrite, 0, top + 220, usrCntl.cboSprache._value, usrCntl.txtEinmalig_RgNr.Text, usrCntl.txtEinmalig_RgDat.Text) + listTowrite = addEinmaligeVM(listTowrite, 0, top + 250, usrCntl.cboSprache._value, usrCntl.txtEinmalig_RgNr.Text, usrCntl.txtEinmalig_RgDat.Text) ElseIf usrCntl.cbxEinmaligeVollmachtCarnetATA.Checked Then - listTowrite = addEinmaligeVMCarnetATA(listTowrite, 0, top + 220, usrCntl.cboSprache._value, usrCntl.txtEinmalig_CarnetATA.Text, "") + listTowrite = addEinmaligeVMCarnetATA(listTowrite, 0, top + 250, usrCntl.cboSprache._value, usrCntl.txtEinmalig_CarnetATA.Text, "") End If diff --git a/SDL/kunden/frmKundenUebersichtZOLL.Designer.vb b/SDL/kunden/frmKundenUebersichtZOLL.Designer.vb index 06298b5d..4ef79bf0 100644 --- a/SDL/kunden/frmKundenUebersichtZOLL.Designer.vb +++ b/SDL/kunden/frmKundenUebersichtZOLL.Designer.vb @@ -22,6 +22,7 @@ Partial Class frmKundenUebersichtZOLL 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() @@ -29,17 +30,19 @@ Partial Class frmKundenUebersichtZOLL Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmKundenUebersichtZOLL)) - Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip() + Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.KopierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.tabZolltarife = New System.Windows.Forms.TabPage() Me.pnlZollTarife = New System.Windows.Forms.Panel() Me.tabKundendaten = New System.Windows.Forms.TabPage() Me.rtbInfo = New System.Windows.Forms.RichTextBox() Me.lblAbfertigungsverbot = New System.Windows.Forms.Label() - Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip() + Me.usrcntlKundenuebersicht = New SDL.usrCntlKundenuebersicht() + Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem() Me.tbcntrKundenDaten = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() + Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte() Me.tbStatistik = New System.Windows.Forms.TabPage() Me.cboKundenblattFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Button1 = New System.Windows.Forms.Button() @@ -86,10 +89,10 @@ Partial Class frmKundenUebersichtZOLL Me.btnSpeichern = New System.Windows.Forms.Button() Me.Label35 = New System.Windows.Forms.Label() Me.tbRechnungen = New System.Windows.Forms.TabPage() - Me.dgvRg = New VERAG_PROG_ALLGEMEIN.MyDatagridview() - Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel() + Me.dgvRg = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) Me.btnRgPdf = New System.Windows.Forms.Button() - Me.ctxtRg = New System.Windows.Forms.ContextMenuStrip() + Me.ctxtRg = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DateiHochladenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.btnMonat = New System.Windows.Forms.Button() Me.Button10 = New System.Windows.Forms.Button() @@ -97,8 +100,9 @@ Partial Class frmKundenUebersichtZOLL Me.Label40 = New System.Windows.Forms.Label() Me.tbSpeditionsbuch = New System.Windows.Forms.TabPage() Me.tbFiskaluebersicht = New System.Windows.Forms.TabPage() + Me.UsrcntlFiskaluebersicht1 = New SDL.usrcntlFiskaluebersicht() Me.tbCBAM = New System.Windows.Forms.TabPage() - Me.NotifyIcon1 = New System.Windows.Forms.NotifyIcon() + Me.NotifyIcon1 = New System.Windows.Forms.NotifyIcon(Me.components) Me.Panel1 = New System.Windows.Forms.Panel() Me.MenuStripKunden = New System.Windows.Forms.MenuStrip() Me.mnueKunden = New System.Windows.Forms.ToolStripMenuItem() @@ -117,6 +121,7 @@ Partial Class frmKundenUebersichtZOLL Me.ToolStripMenuItem8 = New System.Windows.Forms.ToolStripMenuItem() Me.ZollvollmachtATEVToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.VollmachtFinanzamtToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ZollvollmachtDEIndirektToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem9 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem10 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem14 = New System.Windows.Forms.ToolStripMenuItem() @@ -145,8 +150,8 @@ Partial Class frmKundenUebersichtZOLL Me.lblTESTSystem = New System.Windows.Forms.Label() Me.pic = New System.Windows.Forms.PictureBox() Me.KdSearchBox1 = New VERAG_PROG_ALLGEMEIN.KdSearchBox() - Me.tmrFiskal = New System.Windows.Forms.Timer() - Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip() + Me.tmrFiskal = New System.Windows.Forms.Timer(Me.components) + Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem() Me.ÄndernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.HochladenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -154,10 +159,6 @@ Partial Class frmKundenUebersichtZOLL Me.PDFLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.usrcntlKundenuebersicht = New SDL.usrCntlKundenuebersicht() - Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte() - Me.UsrcntlFiskaluebersicht1 = New SDL.usrcntlFiskaluebersicht() - Me.ZollvollmachtDEIndirektToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ContextMenuStrip1.SuspendLayout() Me.tabZolltarife.SuspendLayout() Me.tabKundendaten.SuspendLayout() @@ -260,6 +261,17 @@ Partial Class frmKundenUebersichtZOLL Me.lblAbfertigungsverbot.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.lblAbfertigungsverbot.Visible = False ' + 'usrcntlKundenuebersicht + ' + Me.usrcntlKundenuebersicht.BackColor = System.Drawing.Color.White + Me.usrcntlKundenuebersicht.BER_STUFE = 0 + Me.usrcntlKundenuebersicht.Dock = System.Windows.Forms.DockStyle.Fill + Me.usrcntlKundenuebersicht.Location = New System.Drawing.Point(3, 3) + Me.usrcntlKundenuebersicht.Margin = New System.Windows.Forms.Padding(2) + Me.usrcntlKundenuebersicht.Name = "usrcntlKundenuebersicht" + Me.usrcntlKundenuebersicht.Size = New System.Drawing.Size(1176, 744) + Me.usrcntlKundenuebersicht.TabIndex = 0 + ' 'ContextMenuStrip2 ' Me.ContextMenuStrip2.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -305,6 +317,16 @@ Partial Class frmKundenUebersichtZOLL Me.TabPage1.TabIndex = 2 Me.TabPage1.Text = "Offerte" ' + 'UsrCntlOfferte1 + ' + Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White + Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlOfferte1.Location = New System.Drawing.Point(3, 3) + Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(2) + Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" + Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1176, 744) + Me.UsrCntlOfferte1.TabIndex = 0 + ' 'tbStatistik ' Me.tbStatistik.BackColor = System.Drawing.Color.White @@ -1027,6 +1049,15 @@ Partial Class frmKundenUebersichtZOLL Me.tbFiskaluebersicht.Text = "Fiskal-Analyse" Me.tbFiskaluebersicht.UseVisualStyleBackColor = True ' + 'UsrcntlFiskaluebersicht1 + ' + Me.UsrcntlFiskaluebersicht1.BackColor = System.Drawing.Color.White + Me.UsrcntlFiskaluebersicht1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrcntlFiskaluebersicht1.Location = New System.Drawing.Point(0, 0) + Me.UsrcntlFiskaluebersicht1.Name = "UsrcntlFiskaluebersicht1" + Me.UsrcntlFiskaluebersicht1.Size = New System.Drawing.Size(1182, 750) + Me.UsrcntlFiskaluebersicht1.TabIndex = 0 + ' 'tbCBAM ' Me.tbCBAM.Location = New System.Drawing.Point(4, 25) @@ -1225,6 +1256,12 @@ Partial Class frmKundenUebersichtZOLL Me.VollmachtFinanzamtToolStripMenuItem.Size = New System.Drawing.Size(215, 22) Me.VollmachtFinanzamtToolStripMenuItem.Text = "Vollmacht Finanzamt" ' + 'ZollvollmachtDEIndirektToolStripMenuItem + ' + Me.ZollvollmachtDEIndirektToolStripMenuItem.Name = "ZollvollmachtDEIndirektToolStripMenuItem" + Me.ZollvollmachtDEIndirektToolStripMenuItem.Size = New System.Drawing.Size(215, 22) + Me.ZollvollmachtDEIndirektToolStripMenuItem.Text = "Zollvollmacht DE - indirekt" + ' 'ToolStripMenuItem9 ' Me.ToolStripMenuItem9.Name = "ToolStripMenuItem9" @@ -1309,7 +1346,7 @@ Partial Class frmKundenUebersichtZOLL Me.mnueFiskaluebersicht.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnueFiskaluebersicht.Name = "mnueFiskaluebersicht" Me.mnueFiskaluebersicht.Size = New System.Drawing.Size(107, 64) - Me.mnueFiskaluebersicht.Text = "Fiskal-Analyse" + Me.mnueFiskaluebersicht.Text = "Due Diligence" Me.mnueFiskaluebersicht.TextAlign = System.Drawing.ContentAlignment.BottomCenter Me.mnueFiskaluebersicht.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText Me.mnueFiskaluebersicht.Visible = False @@ -1547,42 +1584,6 @@ Partial Class frmKundenUebersichtZOLL Me.DataGridViewTextBoxColumn2.HeaderText = "KundenNr" Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" ' - 'usrcntlKundenuebersicht - ' - Me.usrcntlKundenuebersicht.BackColor = System.Drawing.Color.White - Me.usrcntlKundenuebersicht.BER_STUFE = 0 - Me.usrcntlKundenuebersicht.Dock = System.Windows.Forms.DockStyle.Fill - Me.usrcntlKundenuebersicht.Location = New System.Drawing.Point(3, 3) - Me.usrcntlKundenuebersicht.Margin = New System.Windows.Forms.Padding(2) - Me.usrcntlKundenuebersicht.Name = "usrcntlKundenuebersicht" - Me.usrcntlKundenuebersicht.Size = New System.Drawing.Size(1176, 744) - Me.usrcntlKundenuebersicht.TabIndex = 0 - ' - 'UsrCntlOfferte1 - ' - Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White - Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlOfferte1.Location = New System.Drawing.Point(3, 3) - Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(2) - Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" - Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1176, 744) - Me.UsrCntlOfferte1.TabIndex = 0 - ' - 'UsrcntlFiskaluebersicht1 - ' - Me.UsrcntlFiskaluebersicht1.BackColor = System.Drawing.Color.White - Me.UsrcntlFiskaluebersicht1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrcntlFiskaluebersicht1.Location = New System.Drawing.Point(0, 0) - Me.UsrcntlFiskaluebersicht1.Name = "UsrcntlFiskaluebersicht1" - Me.UsrcntlFiskaluebersicht1.Size = New System.Drawing.Size(1182, 750) - Me.UsrcntlFiskaluebersicht1.TabIndex = 0 - ' - 'ZollvollmachtDEIndirektToolStripMenuItem - ' - Me.ZollvollmachtDEIndirektToolStripMenuItem.Name = "ZollvollmachtDEIndirektToolStripMenuItem" - Me.ZollvollmachtDEIndirektToolStripMenuItem.Size = New System.Drawing.Size(215, 22) - Me.ZollvollmachtDEIndirektToolStripMenuItem.Text = "Zollvollmacht DE - indirekt" - ' 'frmKundenUebersichtZOLL ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/SDL/kunden/usrCntlCBAM.vb b/SDL/kunden/usrCntlCBAM.vb index d000d927..5dd8b771 100644 --- a/SDL/kunden/usrCntlCBAM.vb +++ b/SDL/kunden/usrCntlCBAM.vb @@ -849,7 +849,8 @@ Public Class usrCntlCBAM ,isnull(max(Versender_CZ_EORI),'') as AbsenderEORI ,isnull(max(CZ_Name), '') as Absender ,'' as 'Rechnungsnummer' - ,'' as 'Rechnungsdatum'" + ,'' as 'Rechnungsdatum' + ,isnull(max(Anmelder_DT_EORI),'') as 'AnmelderEORI' " Dim SQLSTR = " FROM [tbl_DY_Zollmeldungen_Import] where diff --git a/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb b/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb index b347afb1..a009c7e2 100644 --- a/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb +++ b/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb @@ -25,14 +25,14 @@ Partial Class usrcntlFiskaluebersicht Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrcntlFiskaluebersicht)) Me.btnAdd = New System.Windows.Forms.Button() - Me.lblFiskaluebersicht = New System.Windows.Forms.Label() + Me.lblUebersicht = New System.Windows.Forms.Label() Me.lblCheckliste = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() Me.lblWarning = New System.Windows.Forms.Label() Me.Button4 = New System.Windows.Forms.Button() Me.picLocked = New System.Windows.Forms.PictureBox() Me.lblAbschluss = New System.Windows.Forms.Label() - Me.cbxFiskalart = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cbxLand = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) Me.btnOK = New System.Windows.Forms.Button() Me.btnSave = New System.Windows.Forms.Button() @@ -94,6 +94,8 @@ Partial Class usrcntlFiskaluebersicht Me.dgvUnterlagen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.cbxUID = New System.Windows.Forms.CheckBox() Me.txtUID = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label15 = New System.Windows.Forms.Label() + Me.cbxArt = New VERAG_PROG_ALLGEMEIN.MyComboBox() CType(Me.picLocked, System.ComponentModel.ISupportInitialize).BeginInit() Me.MyPanel1.SuspendLayout() CType(Me.dgvFiskaluebersicht, System.ComponentModel.ISupportInitialize).BeginInit() @@ -119,15 +121,15 @@ Partial Class usrcntlFiskaluebersicht Me.btnAdd.TabIndex = 96 Me.btnAdd.UseVisualStyleBackColor = True ' - 'lblFiskaluebersicht + 'lblUebersicht ' - Me.lblFiskaluebersicht.AutoSize = True - Me.lblFiskaluebersicht.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblFiskaluebersicht.Location = New System.Drawing.Point(8, 12) - Me.lblFiskaluebersicht.Name = "lblFiskaluebersicht" - Me.lblFiskaluebersicht.Size = New System.Drawing.Size(130, 20) - Me.lblFiskaluebersicht.TabIndex = 111 - Me.lblFiskaluebersicht.Text = "Fiskalübersicht" + Me.lblUebersicht.AutoSize = True + Me.lblUebersicht.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblUebersicht.Location = New System.Drawing.Point(8, 12) + Me.lblUebersicht.Name = "lblUebersicht" + Me.lblUebersicht.Size = New System.Drawing.Size(86, 20) + Me.lblUebersicht.TabIndex = 111 + Me.lblUebersicht.Text = "Übersicht" ' 'lblCheckliste ' @@ -143,18 +145,18 @@ Partial Class usrcntlFiskaluebersicht ' Me.Label1.AutoSize = True Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label1.Location = New System.Drawing.Point(319, 12) + Me.Label1.Location = New System.Drawing.Point(316, 12) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(94, 20) + Me.Label1.Size = New System.Drawing.Size(65, 20) Me.Label1.TabIndex = 118 - Me.Label1.Text = "Fiskalart - " + Me.Label1.Text = "Land - " ' 'lblWarning ' Me.lblWarning.AutoSize = True Me.lblWarning.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblWarning.ForeColor = System.Drawing.Color.Red - Me.lblWarning.Location = New System.Drawing.Point(502, 17) + Me.lblWarning.Location = New System.Drawing.Point(565, 15) Me.lblWarning.Name = "lblWarning" Me.lblWarning.Size = New System.Drawing.Size(0, 16) Me.lblWarning.TabIndex = 113 @@ -176,9 +178,9 @@ Partial Class usrcntlFiskaluebersicht Me.picLocked.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.picLocked.BackgroundImage = Global.SDL.My.Resources.Resources.locked Me.picLocked.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.picLocked.Location = New System.Drawing.Point(865, 3) + Me.picLocked.Location = New System.Drawing.Point(886, 3) Me.picLocked.Name = "picLocked" - Me.picLocked.Size = New System.Drawing.Size(56, 30) + Me.picLocked.Size = New System.Drawing.Size(35, 30) Me.picLocked.TabIndex = 130 Me.picLocked.TabStop = False Me.picLocked.Visible = False @@ -187,23 +189,23 @@ Partial Class usrcntlFiskaluebersicht ' Me.lblAbschluss.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) 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(559, 14) + Me.lblAbschluss.Location = New System.Drawing.Point(571, 3) Me.lblAbschluss.Name = "lblAbschluss" Me.lblAbschluss.RightToLeft = System.Windows.Forms.RightToLeft.Yes - Me.lblAbschluss.Size = New System.Drawing.Size(301, 20) + Me.lblAbschluss.Size = New System.Drawing.Size(309, 31) Me.lblAbschluss.TabIndex = 138 Me.lblAbschluss.TextAlign = System.Drawing.ContentAlignment.TopRight ' - 'cbxFiskalart + 'cbxLand ' - Me.cbxFiskalart._allowedValuesFreiText = Nothing - Me.cbxFiskalart._allowFreiText = False - Me.cbxFiskalart._value = "" - Me.cbxFiskalart.FormattingEnabled = True - Me.cbxFiskalart.Location = New System.Drawing.Point(419, 12) - Me.cbxFiskalart.Name = "cbxFiskalart" - Me.cbxFiskalart.Size = New System.Drawing.Size(53, 21) - Me.cbxFiskalart.TabIndex = 117 + Me.cbxLand._allowedValuesFreiText = Nothing + Me.cbxLand._allowFreiText = False + Me.cbxLand._value = "" + Me.cbxLand.FormattingEnabled = True + Me.cbxLand.Location = New System.Drawing.Point(385, 11) + Me.cbxLand.Name = "cbxLand" + Me.cbxLand.Size = New System.Drawing.Size(53, 21) + Me.cbxLand.TabIndex = 117 ' 'MyPanel1 ' @@ -1161,18 +1163,41 @@ Partial Class usrcntlFiskaluebersicht Me.txtUID.Size = New System.Drawing.Size(86, 20) Me.txtUID.TabIndex = 106 ' + 'Label15 + ' + Me.Label15.AutoSize = True + Me.Label15.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label15.Location = New System.Drawing.Point(444, 12) + Me.Label15.Name = "Label15" + Me.Label15.Size = New System.Drawing.Size(49, 20) + Me.Label15.TabIndex = 139 + Me.Label15.Text = "Art - " + ' + 'cbxArt + ' + Me.cbxArt._allowedValuesFreiText = Nothing + Me.cbxArt._allowFreiText = False + Me.cbxArt._value = "" + Me.cbxArt.FormattingEnabled = True + Me.cbxArt.Location = New System.Drawing.Point(489, 11) + Me.cbxArt.Name = "cbxArt" + Me.cbxArt.Size = New System.Drawing.Size(70, 21) + Me.cbxArt.TabIndex = 140 + ' 'usrcntlFiskaluebersicht ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White + Me.Controls.Add(Me.cbxArt) + Me.Controls.Add(Me.Label15) Me.Controls.Add(Me.picLocked) Me.Controls.Add(Me.Button4) Me.Controls.Add(Me.Label1) - Me.Controls.Add(Me.cbxFiskalart) + Me.Controls.Add(Me.cbxLand) Me.Controls.Add(Me.lblWarning) Me.Controls.Add(Me.lblCheckliste) - Me.Controls.Add(Me.lblFiskaluebersicht) + Me.Controls.Add(Me.lblUebersicht) Me.Controls.Add(Me.MyPanel1) Me.Controls.Add(Me.btnAdd) Me.Controls.Add(Me.dgvFiskaluebersicht) @@ -1213,14 +1238,14 @@ Partial Class usrcntlFiskaluebersicht Friend WithEvents btnOK As Button Friend WithEvents btnSave As Button Friend WithEvents btnPDFReport As Button - Friend WithEvents lblFiskaluebersicht As Label + Friend WithEvents lblUebersicht As Label Friend WithEvents lblCheckliste As Label Friend WithEvents lblUnterlagen As Label Friend WithEvents dgvUnterlagen As VERAG_PROG_ALLGEMEIN.MyDatagridview Friend WithEvents MyPanel2 As VERAG_PROG_ALLGEMEIN.MyPanel Friend WithEvents Button1 As Button Friend WithEvents Label1 As Label - Friend WithEvents cbxFiskalart As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents cbxLand As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents lblWarning As Label Friend WithEvents Button4 As Button Friend WithEvents picOK As PictureBox @@ -1269,4 +1294,6 @@ Partial Class usrcntlFiskaluebersicht Friend WithEvents Label14 As Label Friend WithEvents txtUmsatz As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents lblUmsatz As Label + Friend WithEvents Label15 As Label + Friend WithEvents cbxArt As VERAG_PROG_ALLGEMEIN.MyComboBox End Class diff --git a/SDL/kunden/usrcntlFiskaluebersicht.resx b/SDL/kunden/usrcntlFiskaluebersicht.resx index ca08742d..2e79f648 100644 --- a/SDL/kunden/usrcntlFiskaluebersicht.resx +++ b/SDL/kunden/usrcntlFiskaluebersicht.resx @@ -120,24 +120,25 @@ - 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 + rkJggg== diff --git a/SDL/kunden/usrcntlFiskaluebersicht.vb b/SDL/kunden/usrcntlFiskaluebersicht.vb index 79b974b6..2af0f989 100644 --- a/SDL/kunden/usrcntlFiskaluebersicht.vb +++ b/SDL/kunden/usrcntlFiskaluebersicht.vb @@ -24,14 +24,15 @@ Public Class usrcntlFiskaluebersicht With dgvFiskaluebersicht .Columns.Clear() - .DataSource = SQL.loadDgvBySql("SELECT FK_Id , FK_Datum, FK_Art, FK_locked, FK_Kdnr FROM tblFiskalkunden WHERE FK_Kdnr='" & kdNr & "' ORDER BY FK_Datum ", "FMZOLL") + .DataSource = SQL.loadDgvBySql("SELECT FK_Id , FK_Datum, FK_Art, FK_locked, FK_Kdnr, FK_Land FROM tblFiskalkunden WHERE FK_Kdnr='" & kdNr & "' ORDER BY FK_Datum ", "FMZOLL") .Columns("FK_Datum").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("FK_Datum").HeaderText = "Datum" - .Columns("FK_Art").Visible = False + .Columns("FK_Art").HeaderText = "Art" .Columns("FK_locked").Visible = False .Columns("FK_Id").Visible = False .Columns("FK_Kdnr").Visible = False + .Columns("FK_Land").Visible = False End With @@ -41,12 +42,14 @@ Public Class usrcntlFiskaluebersicht Dim where As String = "" - Select Case cbxFiskalart._value - Case "DE" - where = " And FilialenNr = 4811" - Case "AT" - where = " And FilialenNr = 4805" - End Select + If cbxArt._value = "FI" Then + Select Case cbxLand._value + Case "DE" + where = " And FilialenNr = 4811" + Case "AT" + where = " And FilialenNr = 4805" + End Select + End If Label2.Text = "Top 5 Lieferanten (" & year & ")" @@ -74,12 +77,14 @@ Public Class usrcntlFiskaluebersicht Dim where As String = "" - Select Case cbxFiskalart._value - Case "DE" - where = " And FilialenNr = 4811" - Case "AT" - where = " And FilialenNr = 4805" - End Select + If cbxArt._value = "FI" Then + Select Case cbxLand._value + Case "DE" + where = " And FilialenNr = 4811" + Case "AT" + where = " And FilialenNr = 4805" + End Select + End If Label3.Text = "Top 5 Empfänger (" & year & ")" With dgvEmpfaenger @@ -105,12 +110,15 @@ Public Class usrcntlFiskaluebersicht Dim where As String = "" - Select Case cbxFiskalart._value - Case "DE" - where = " And FilialenNr = 4811" - Case "AT" - where = " And FilialenNr = 4805" - End Select + If cbxArt._value = "FI" Then + Select Case cbxLand._value + Case "DE" + where = " And FilialenNr = 4811" + Case "AT" + where = " And FilialenNr = 4805" + End Select + End If + Label6.Text = "Top 5 Auftraggeber (" & year & ")" With dgvZwischenh @@ -167,10 +175,16 @@ Public Class usrcntlFiskaluebersicht Sub init(_kdnr As Integer) - cbxFiskalart.Items.Clear() - cbxFiskalart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AT", "AT")) - cbxFiskalart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DE", "DE")) - cbxFiskalart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) + cbxLand.Items.Clear() + cbxLand.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AT", "AT")) + cbxLand.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DE", "DE")) + cbxLand.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) + + + cbxArt.Items.Clear() + cbxArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("INDIREKT", "IN")) + cbxArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FISKAL", "FI")) + cbxArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) cbxAttachmentArt.Items.Clear() @@ -181,7 +195,6 @@ Public Class usrcntlFiskaluebersicht cbxAttachmentArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Website", "Website")) cbxAttachmentArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Website-Steuerberater", "Website-Steuerberater")) - kdNr = _kdnr KUNDE = New VERAG_PROG_ALLGEMEIN.cKunde(kdNr) KUNDE_ERW = New VERAG_PROG_ALLGEMEIN.cKundenErweitert(kdNr) @@ -209,42 +222,47 @@ Public Class usrcntlFiskaluebersicht Private Sub btnAdd_Click(sender As Object, e As EventArgs) Handles btnAdd.Click - If cbxFiskalart._value = "" Then - lblWarning.Text = "Fiskalart auswählen!" + lblWarning.Text = "" + + If cbxArt._value = "" Then + lblWarning.Text = "Art auswählen!" Exit Sub ElseIf ADRESSE.LandKz = "" Then lblWarning.Text = "Land im Kunden hinterlegen!" Exit Sub + ElseIf cbxArt._value = "FI" AndAlso cbxLand._value = "" Then + lblWarning.Text = "Land auswählen!" + Exit Sub + End If - If cbxFiskalart._value = "DE" And ADRESSE.LandKz = "D" Or cbxFiskalart._value = "AT" And ADRESSE.LandKz = "A" Then - lblWarning.Text = "Fiskalart " & cbxFiskalart._value & " für " & ADRESSE.LandKz & " nicht möglich!" + If cbxLand._value = "DE" And ADRESSE.LandKz = "D" Or cbxLand._value = "AT" And ADRESSE.LandKz = "A" Then + lblWarning.Text = "Fiskalart " & cbxLand._value & " für " & ADRESSE.LandKz & " nicht möglich!" Exit Sub End If lblWarning.Text = "" - Dim input = InputBox("Bitte geben Sie das Datum der neuen Fiskal-Übersicht ein: ", "Fiskal-Übersicht anlegen") - If input <> "" Then - Dim hint As String - If checkDateIsValid(input, hint) Then - fk = New VERAG_PROG_ALLGEMEIN.cFiskalkunden() - fk.FK_Datum = CDate(input) - fk.FK_Kdnr = kdNr - fk.FK_Art = cbxFiskalart._value - fk.SAVE() - dgvFiskaluebersicht.GetOrder() - initDGVFiskaluebersicht() - dgvFiskaluebersicht.SetOrder() - Else - MsgBox(hint) - End If + Dim f As New frmDatumsabfrage("Datum der neuen Due Diligence:", True) - Else - MsgBox("Kein Datum angegeben!") + f.ShowDialog() + If f.DialogResult = DialogResult.OK Then + Dim fisDate As Date = CDate(f.Datum) + + fk = New VERAG_PROG_ALLGEMEIN.cFiskalkunden() + fk.FK_Datum = fisDate + fk.FK_Kdnr = kdNr + fk.FK_Art = cbxArt._value + fk.FK_Land = cbxLand._value + fk.SAVE() + dgvFiskaluebersicht.GetOrder() + initDGVFiskaluebersicht() + dgvFiskaluebersicht.SetOrder() End If + + End Sub Private Function checkDateIsValid(ByRef checkDate As Date, ByRef hint As String) As Boolean @@ -367,17 +385,17 @@ Public Class usrcntlFiskaluebersicht getFields() - If checkEntries() Then - fk.FK_locked = True - fk.FK_Abschlussdatum = Now() - fk.FK_MaId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID - fk.SAVE() - initDGVFiskaluebersicht() - btnOK.Enabled = False - btnSave.Enabled = False - End If + If checkEntries() Then + fk.FK_locked = True + fk.FK_Abschlussdatum = Now() + fk.FK_MaId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID + fk.SAVE() + initDGVFiskaluebersicht() + btnOK.Enabled = False + btnSave.Enabled = False + End If - End If + End If End Sub Private Sub btnSave_Click(sender As Object, e As EventArgs) Handles btnSave.Click @@ -469,7 +487,8 @@ Public Class usrcntlFiskaluebersicht End If - cbxFiskalart._value = checkNullStr(fk.FK_Art) + cbxLand._value = checkNullStr(fk.FK_land) + cbxArt._value = checkNullStr(fk.FK_Art) txtHomepage.Text = checkNullStr(fk.FK_Website_URL) rtbAnmerkung.Text = checkNullStr(fk.FK_Anmerkung) rtfLieferanten.Text = checkNullStr(fk.FK_Lieferanten) @@ -487,7 +506,7 @@ Public Class usrcntlFiskaluebersicht txtUmsatz.Text = checkNullStr(fk.FK_Umsatz) If txtBon.Text = "" Then - Dim baid = SQL.getValueTxtBySql("SELECT TOP(1) ba_id FROM [tblBonitaetsauskunft] where ba_KundenNr=" & kdNr & " ORDER BY ba_Datum DESC", "FMZOLL") + Dim baid = SQL.getValueTxtBySql("Select TOP(1) ba_id FROM [tblBonitaetsauskunft] where ba_KundenNr=" & kdNr & " ORDER BY ba_Datum DESC", "FMZOLL") If baid <> "" Then BA = New cBonitaetsauskunft(baid) If BA IsNot Nothing Then @@ -503,9 +522,13 @@ Public Class usrcntlFiskaluebersicht If txtGeschaeftszweck.Text = "" Then txtGeschaeftszweck.Text = BA.ba_Geschaeftszweck - If txtAnzMA.Text = "" Then txtAnzMA.Text = BA.ba_Mitarbeiter + If txtAnzMA.Text = "" Then + If Not BA.ba_Mitarbeiter Is Nothing AndAlso IsNumeric(BA.ba_Mitarbeiter) AndAlso CInt(BA.ba_Mitarbeiter) <> 0 Then + txtAnzMA.Text = BA.ba_Mitarbeiter + End If + End If - If ADRESSE.LandKz = "AT" Or ADRESSE.LandKz = "A" Then + If ADRESSE.LandKz = "AT" Or ADRESSE.LandKz = "A" Then lblBon.Text = If(BA.ba_CreditSaveBonitaetsScore, "") Else If BA.ba_CreditSaveBonitaetsIndex = 0 Then @@ -519,7 +542,7 @@ Public Class usrcntlFiskaluebersicht End If If txtWaren.Text = "" Then - txtWaren.Text = SQL.getValueTxtBySql("SELECT Top(1) [Packstücke] as Bemerkungen FROM [Speditionsbuch] WHERE " & kdNr & " In([AbsenderKundenNr], [EmpfängerKundenNr], [FrachtführerKundenNr], [VermittlerKundenNr], [EndempfängerKundenNr]) AND ISNULL(CAST([Bemerkungen] as NVARCHAR(max)),'') <> '' Order by Abfertigungsdatum desc", "FMZOLL") + txtWaren.Text = SQL.getValueTxtBySql("Select Top(1) [Packstücke] As Bemerkungen FROM [Speditionsbuch] WHERE " & kdNr & " In([AbsenderKundenNr], [EmpfängerKundenNr], [FrachtführerKundenNr], [VermittlerKundenNr], [EndempfängerKundenNr]) And ISNULL(CAST([Bemerkungen] As NVARCHAR(max)),'') <> '' Order by Abfertigungsdatum desc", "FMZOLL") End If If txtUID.Text = "" Then @@ -536,32 +559,46 @@ Public Class usrcntlFiskaluebersicht End If - If txtVM.Text = "" And cbxFiskalart._value <> "" Then + If txtVM.Text = "" And cbxLand._value <> "" Then Dim vmArt As Integer = -1 Select Case FirmaTmp Case "VERAG" - If cbxFiskalart._value = "DE" Then - vmArt = 2 - ElseIf cbxFiskalart._value = "AT" Then - vmArt = 4 + If cbxArt._value = "FI" Then + If cbxLand._value = "DE" Then + vmArt = 2 + ElseIf cbxLand._value = "AT" Then + vmArt = 4 + End If + ElseIf cbxArt._value = "IN" Then + vmArt = 35 End If + Case "IMEX" - If cbxFiskalart._value = "DE" Then - vmArt = 8 - ElseIf cbxFiskalart._value = "AT" Then - vmArt = 9 + If cbxArt._value = "FI" Then + If cbxLand._value = "DE" Then + vmArt = 8 + ElseIf cbxLand._value = "AT" Then + vmArt = 9 + End If + ElseIf cbxArt._value = "IN" Then + vmArt = -1 End If Case "UNISPED" - If cbxFiskalart._value = "DE" Then - vmArt = 22 - ElseIf cbxFiskalart._value = "AT" Then - vmArt = 23 + If cbxArt._value = "FI" Then + If cbxLand._value = "DE" Then + vmArt = 22 + ElseIf cbxLand._value = "AT" Then + vmArt = 23 + End If + ElseIf cbxArt._value = "IN" Then + vmArt = -1 End If + End Select If vmArt = -1 Then @@ -577,7 +614,7 @@ Public Class usrcntlFiskaluebersicht End If End If - If txtUVM.Text = "" And cbxFiskalart._value <> "" Then + If txtUVM.Text = "" And cbxLand._value <> "" Then Dim uvmId = SQL.getValueTxtBySql("SELECT Top(1) abf.[kdvm_id] FROM [tblKundenVollmachtenArt] as art INNER Join(select * from [tblKundenVollmachten]) as abf on art.[kdvma_Id]=abf.[kdvm_kdvmaId] WHERE art.kdvma_visible = 1 And abf.kdvm_erhalten = 1 And ISNULL(abf.[kdvm_geloescht], 0)!= 1 And [kdvm_KundenNr] ='" & kdNr & "' AND [kdvm_kdvmaId]=6 Order BY abf.kdvm_erhalten_Datum desc", "FMZOLL") If uvmId <> "" Then @@ -641,7 +678,7 @@ Public Class usrcntlFiskaluebersicht End Sub Private Sub getFields() - fk.FK_Art = cbxFiskalart._value + fk.FK_Art = cbxLand._value If BA IsNot Nothing Then fk.FK_Bonitaet = BA.ba_id diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cFiskalkunden.vb b/VERAG_PROG_ALLGEMEIN/Classes/cFiskalkunden.vb index 118948df..8994c84b 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cFiskalkunden.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cFiskalkunden.vb @@ -30,6 +30,7 @@ Public Class cFiskalkunden Property FK_Geschaeftsfuehrer As Object = Nothing Property FK_Steuerberater As Object = Nothing Property FK_Umsatz As Object = Nothing + Property FK_Land As Object = Nothing Public hasEntry = False @@ -73,6 +74,7 @@ Public Class cFiskalkunden list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Geschaeftsfuehrer", FK_Geschaeftsfuehrer)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Steuerberater", FK_Steuerberater)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Umsatz", FK_Umsatz)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Land", FK_Land)) Return list End Function