edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'newMaster2024' of https://verag.visualstudio.com/SDL/_git/SDL into newMaster2024

Browse Source
This commit is contained in:
Andreas Luxbauer
2024-10-10 20:04:35 +02:00
parent 307b6f95ac bda299a576
commit 2a89c6c07c
30 changed files with 1348 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
SDL/kunden/frmKundenblatt.Designer.vb generated
View File

@@ -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"
'

5
SDL/kunden/usrcntlKundeBearbeitenFull.vb
View File

@@ -428,6 +428,7 @@ Public Class usrcntlKundeBearbeitenFull
cboKundenkreis.changeItem("3000000-3099990")
KUNDE.Zahlungsziel = 0
ADRESSE.Rechnungsdruck = 2
KUNDE.Vorkasse = True
Case "ATILLA"
cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 100000-199999: ATILLA", "100000-199999"))
cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 900000-999999: Sonstige", "900000-999999"))
@@ -835,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)