diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index b9bcf2a9..1249e27b 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -122,10 +122,8 @@ Public Class frmMDM_USTVAntrag Select Case If(r.Cells("UStVPo_SchnittstellenNr").Value, -1) Case 6, 0 : da_id = SQL.getValueTxtBySql("SELECT TOP(1) [plInv_daId] FROM [tblPLOSE_Inv_Data] where plInv_SupplierRechnungsDatum='" & r.Cells("UStVPo_ReDat").Value & "' and plInv_SupplierRechnungsNr='" & r.Cells("UStVPo_ReNr").Value & "' and plInv_SupplierCountry='" & Antrag_LandKz & "' AND [plInv_daId] is not null", "FMZOLL",,, -1) - Case 4 : da_id = SQL.getValueTxtBySql("SELECT TOP(1) [daId] FROM [tblMSEInvoices] as inv inner join tblMSECustomers on inv.customer_number = customer_id where invoice_date='" & r.Cells("UStVPo_ReDat").Value & "' and country='" & Antrag_LandKz & "' AND partner_customer_number = " & USTV_ANTRAG.UStVAn_KuNr & " AND daId is not null", "FMZOLL",,, -1) Case 5 : da_id = SQL.getValueTxtBySql("SELECT TOP(1) [daId] FROM [tblUTAImportNew] where Rechnungsdatum='" & r.Cells("UStVPo_ReDat").Value & "' and Abrechnungsnummer='" & r.Cells("UStVPo_ReNr").Value & "' and Lieferland_ISO2='" & Antrag_LandKz & "' AND daId is not null", "FMZOLL",,, -1) - Case 7 : da_id = SQL.getValueTxtBySql("SELECT TOP(1) [rmc_daId] FROM [tblRMCImport] where rmc_reDatum='" & r.Cells("UStVPo_ReDat").Value & "' and rmc_reNr='" & r.Cells("UStVPo_ReNr").Value & "' and rmc_landKZ='" & Antrag_LandKz & "' AND [rmc_daId] is not null", "FMZOLL",,, -1) End Select diff --git a/SDL/USTV/usrCntlUSTV.Designer.vb b/SDL/USTV/usrCntlUSTV.Designer.vb index dd33bfb2..1c36a91c 100644 --- a/SDL/USTV/usrCntlUSTV.Designer.vb +++ b/SDL/USTV/usrCntlUSTV.Designer.vb @@ -23,11 +23,12 @@ Partial Class usrCntlUSTV Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.pnlFilter = New System.Windows.Forms.Panel() Me.dgvUSTV = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Label1 = New System.Windows.Forms.Label() Me.Panel1 = New System.Windows.Forms.Panel() + Me.btnKundendatenaktualisieren = New System.Windows.Forms.Button() Me.txtVZBetrag = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label8 = New System.Windows.Forms.Label() Me.txt3470Betrag = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -60,7 +61,6 @@ Partial Class usrCntlUSTV Me.Button8 = New System.Windows.Forms.Button() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.btnKundendatenaktualisieren = New System.Windows.Forms.Button() CType(Me.dgvUSTV, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() Me.Panel2.SuspendLayout() @@ -82,8 +82,8 @@ Partial Class usrCntlUSTV Me.dgvUSTV.AKTUALISIERUNGS_INTERVALL = -1 Me.dgvUSTV.AllowUserToAddRows = False Me.dgvUSTV.AllowUserToDeleteRows = False - DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUSTV.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUSTV.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.dgvUSTV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvUSTV.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvUSTV.Location = New System.Drawing.Point(0, 84) @@ -132,6 +132,19 @@ Partial Class usrCntlUSTV Me.Panel1.Size = New System.Drawing.Size(1627, 84) Me.Panel1.TabIndex = 0 ' + 'btnKundendatenaktualisieren + ' + Me.btnKundendatenaktualisieren.Enabled = False + Me.btnKundendatenaktualisieren.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnKundendatenaktualisieren.ForeColor = System.Drawing.Color.Black + Me.btnKundendatenaktualisieren.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnKundendatenaktualisieren.Location = New System.Drawing.Point(1468, 6) + Me.btnKundendatenaktualisieren.Name = "btnKundendatenaktualisieren" + Me.btnKundendatenaktualisieren.Size = New System.Drawing.Size(127, 39) + Me.btnKundendatenaktualisieren.TabIndex = 33 + Me.btnKundendatenaktualisieren.Text = "Kundendaten aktualisieren" + Me.btnKundendatenaktualisieren.UseVisualStyleBackColor = True + ' 'txtVZBetrag ' Me.txtVZBetrag._DateTimeOnly = False @@ -557,7 +570,7 @@ Partial Class usrCntlUSTV Me.btnMail.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnMail.ForeColor = System.Drawing.Color.Black Me.btnMail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnMail.Location = New System.Drawing.Point(750, 5) + Me.btnMail.Location = New System.Drawing.Point(972, 5) Me.btnMail.Name = "btnMail" Me.btnMail.Size = New System.Drawing.Size(75, 39) Me.btnMail.TabIndex = 25 @@ -617,19 +630,6 @@ Partial Class usrCntlUSTV Me.ContextMenuStrip2.Name = "ContextMenuStrip1" Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4) ' - 'btnKundendatenaktualisieren - ' - Me.btnKundendatenaktualisieren.Enabled = False - Me.btnKundendatenaktualisieren.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnKundendatenaktualisieren.ForeColor = System.Drawing.Color.Black - Me.btnKundendatenaktualisieren.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnKundendatenaktualisieren.Location = New System.Drawing.Point(1468, 6) - Me.btnKundendatenaktualisieren.Name = "btnKundendatenaktualisieren" - Me.btnKundendatenaktualisieren.Size = New System.Drawing.Size(127, 39) - Me.btnKundendatenaktualisieren.TabIndex = 33 - Me.btnKundendatenaktualisieren.Text = "Kundendaten aktualisieren" - Me.btnKundendatenaktualisieren.UseVisualStyleBackColor = True - ' 'usrCntlUSTV ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/SDL/USTV/ustCntlUSTV_AntragPosition.vb b/SDL/USTV/ustCntlUSTV_AntragPosition.vb index 0bc91288..f9541ace 100644 --- a/SDL/USTV/ustCntlUSTV_AntragPosition.vb +++ b/SDL/USTV/ustCntlUSTV_AntragPosition.vb @@ -30,8 +30,6 @@ Public Class ustCntlUSTV_AntragPosition Sub setValues(kdnr As Integer, UStV_POS As VERAG_PROG_ALLGEMEIN.cUStVPositionen, Antrag_LandKz As String, UStV_Leitender As VERAG_PROG_ALLGEMEIN.cUStVLeistender) - - gridAktiv = False picSave.Visible = False Me.Antrag_LandKz = Antrag_LandKz