merge
This commit is contained in:
1
SDL/kunden/frmKundenblatt.Designer.vb
generated
1
SDL/kunden/frmKundenblatt.Designer.vb
generated
@@ -2241,7 +2241,6 @@ Partial Class frmKundenblatt
|
||||
'
|
||||
Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24)
|
||||
Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM"
|
||||
Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8
|
||||
Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4)
|
||||
Me.cntxtCntxtMDM.Text = "cntxtMDM"
|
||||
'
|
||||
|
||||
@@ -836,7 +836,9 @@ Public Class usrcntlKundeBearbeitenFull
|
||||
Private Sub loadControls()
|
||||
cboAbf_Waehrung.fillWithSQL("SELECT [Währungscode],[Land] FROM Währungstabelle ORDER BY Währungscode", , "FMZOLL", False)
|
||||
|
||||
cbxKapitalWaehrung.Items.AddRange(cboAbf_Waehrung.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray())
|
||||
cbxKapitalWaehrung.fillWithSQL("SELECT fw_iso3, fw_land FROM [VERAG].[dbo].[tblWahrungtabelleNEU] order by fw_land ", , "FMZOLL", False)
|
||||
|
||||
'cbxKapitalWaehrung.Items.AddRange(cboAbf_Waehrung.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray())
|
||||
|
||||
cboAbf_Steuerschluessel.fillWithSQL("SELECT [Steuerschlüssel], isnull(cast(cast( [Steuersatz %]*100 as decimal(2))as varchar(5)) + '% - ' +AuswahlSteuerbezeichnung,'') as Bezeichnung FROM [Steuertabelle] ORDER BY Steuerschlüssel", False, "FMZOLL", True)
|
||||
|
||||
@@ -872,7 +874,6 @@ Public Class usrcntlKundeBearbeitenFull
|
||||
cboFiliale.changeItem("5601")
|
||||
Case "AMBAR"
|
||||
cboFiliale.changeItem("5701")
|
||||
cboFiliale.changeItem("5701")
|
||||
Case "ATILLA"
|
||||
cboFiliale.changeItem("4801")
|
||||
Case Else
|
||||
|
||||
Reference in New Issue
Block a user