diff --git a/SDL/kunden/usrCntlIDSPreise.Designer.vb b/SDL/kunden/usrCntlIDSPreise.Designer.vb index 3157a204..cdbbc84c 100644 --- a/SDL/kunden/usrCntlIDSPreise.Designer.vb +++ b/SDL/kunden/usrCntlIDSPreise.Designer.vb @@ -23,7 +23,7 @@ Partial Class usrCntlIDSPreise Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.lblIDS = New System.Windows.Forms.TextBox() Me.dgvOfferteDetails = New System.Windows.Forms.DataGridView() Me.cntxtAddSdl = New System.Windows.Forms.ContextMenuStrip(Me.components) @@ -63,19 +63,19 @@ Partial Class usrCntlIDSPreise Me.dgvOfferteDetails.AllowUserToDeleteRows = False Me.dgvOfferteDetails.AllowUserToOrderColumns = True Me.dgvOfferteDetails.AllowUserToResizeRows = False - DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOfferteDetails.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOfferteDetails.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.dgvOfferteDetails.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.dgvOfferteDetails.BackgroundColor = System.Drawing.Color.White Me.dgvOfferteDetails.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - Me.dgvOfferteDetails.Location = New System.Drawing.Point(235, 63) + Me.dgvOfferteDetails.Location = New System.Drawing.Point(182, 63) Me.dgvOfferteDetails.MultiSelect = False Me.dgvOfferteDetails.Name = "dgvOfferteDetails" Me.dgvOfferteDetails.RowHeadersVisible = False Me.dgvOfferteDetails.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvOfferteDetails.Size = New System.Drawing.Size(928, 444) + Me.dgvOfferteDetails.Size = New System.Drawing.Size(981, 444) Me.dgvOfferteDetails.TabIndex = 5 ' 'cntxtAddSdl @@ -137,7 +137,7 @@ Partial Class usrCntlIDSPreise Me.dgvIDS.Name = "dgvIDS" Me.dgvIDS.ReadOnly = True Me.dgvIDS.RowHeadersVisible = False - Me.dgvIDS.Size = New System.Drawing.Size(228, 444) + Me.dgvIDS.Size = New System.Drawing.Size(176, 444) Me.dgvIDS.TabIndex = 30 ' 'cbxTypes @@ -207,7 +207,7 @@ Partial Class usrCntlIDSPreise Me.dgvFILTER.BorderStyle = System.Windows.Forms.BorderStyle.None Me.dgvFILTER.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvFILTER.ColumnHeadersVisible = False - Me.dgvFILTER.Location = New System.Drawing.Point(235, 35) + Me.dgvFILTER.Location = New System.Drawing.Point(182, 35) Me.dgvFILTER.Name = "dgvFILTER" Me.dgvFILTER.ScrollBars = System.Windows.Forms.ScrollBars.None Me.dgvFILTER.Size = New System.Drawing.Size(796, 22) diff --git a/SDL/kunden/usrCntlIDSPreise.vb b/SDL/kunden/usrCntlIDSPreise.vb index a7dbd503..4bfee0c3 100644 --- a/SDL/kunden/usrCntlIDSPreise.vb +++ b/SDL/kunden/usrCntlIDSPreise.vb @@ -214,6 +214,14 @@ Public Class usrCntlIDSPreise If .Columns.Contains("ID") Then .Columns("ID").Visible = False If .Columns.Contains("Kz") Then .Columns("Kz").Width = 25 + + 'If cbxTypes._value = "LS" Then + ' If .Columns.Contains("OutletName") Then .Columns("OutletName").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + 'Else + ' If .Columns.Contains("CustomerName") Then .Columns("CustomerName").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + 'End If + + loaded = True End With @@ -266,6 +274,9 @@ Public Class usrCntlIDSPreise ElseIf c.OwningColumn.Name.Contains("CustomerCode") Then filter &= andstr & " tbl_IDS_Rechenwerte.[" & c.OwningColumn.Name & "] = '" & srchstr & "' " + ElseIf c.OwningColumn.Name.Contains("CustomerName") Then + filter &= andstr & " Adressen.Ordnungsbegriff LIKE '%" & srchstr & "%' " + ElseIf IsNumeric(srchstr) Then If srchstr.ToLower = "ist null" Then