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

Merge branch 'newMaster2024' of https://dev.azure.com/VeragAG/_git/SDL into newMaster2024

Browse Source
This commit is contained in:
Andreas Luxbauer
2025-08-19 13:17:09 +02:00
parent 93b6dcdaba f156411fa2
commit 35fd4fbd99
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SDL/Fakturierung/usrCntlFaktAbrechnung.vb
View File

@@ -1189,8 +1189,8 @@ Public Class usrCntlFaktAbrechnung
Dim orderby As String = ""
If addFieldsBoolean Then
addFields = ", MDM_Land as Land, MDM_RMC as RMC, MDM_Fremd as Fremd, MDM_VZ as VZ, MDM_Staffelpreis as Staffelpreis"
orderby = ", MDM_Staffelpreis desc"
addFields = ", MDM_Land as Land, MDM_RMC as RMC, MDM_Fremd as Fremd, MDM_VZ as VZ, MDM_Preisstaffel as Staffelpreis"
orderby = ", MDM_Preisstaffel desc"
End If
With dgvOfferteDetailsUebersicht

2
SDL/kunden/usrCntlOfferte.vb
View File

@@ -1005,7 +1005,7 @@ Public Class usrCntlOfferte
Private Function addFieldsOffert(ByRef OffertenNr As Integer, ByRef fields As String)
If OffertenNr = 14 Or OffertenNr = 15 Or OffertenNr = 31 Then
fields = ", MDM_Land as Land, MDM_VZ as VZ, MDM_RMC as RMC, MDM_Fremd as Fremd, MDM_Staffelpreis as Staffelpreis "
fields = ", MDM_Land as Land, MDM_VZ as VZ, MDM_RMC as RMC, MDM_Fremd as Fremd, MDM_Preisstaffel as Staffelpreis "
Return True
End If
Return False

2
VERAG_PROG_ALLGEMEIN/Classes/cOfferte.vb
View File

@@ -517,8 +517,6 @@ Public Class cOffertPosition
Public Function UPDATE(LEISTUNGSBEZ_ORG As String) As Boolean
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList(True)
Return SQL.doSQLVarList(getUpdateCmd(LEISTUNGSBEZ_ORG), "FMZOLL", False, list)
End Function

4
VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb
View File

@@ -843,11 +843,9 @@ Public Class cSyska_Interface
Dim FiBuWährung = "EUR"
Dim ANTRAG As New cUSTVAntrag(row("UStVAn_ID"))
Dim KUNDE_ERW As New cKundenErweitert(ANTRAG.UStVAn_KuNr)
Dim MonthStart As String = IIf(CDate(ANTRAG.UStVAn_ReDatVon).Month < 10, "0", "") & CDate(ANTRAG.UStVAn_ReDatVon).Month
Dim MonthEnd As String = IIf(CDate(ANTRAG.UStVAn_ReDatBis).Month < 10, "0", "") & CDate(ANTRAG.UStVAn_ReDatBis).Month
@@ -902,7 +900,7 @@ Public Class cSyska_Interface
genBuchungsZeileVZ &= Format(CDbl(FiBuSteuersatz), fmt) & vbTab 'FiBuSteuersatz
genBuchungsZeileVZ &= FormatStringDbl(FiBuSteuerbetrag) & vbTab 'FiBuSteuerbetrag
genBuchungsZeileVZ &= FiBuWährung & vbTab
genBuchungsZeileVZ &= Format(CDbl(FiBuBruttobetrag), fmt) & vbTab
genBuchungsZeileVZ &= Format(CDbl(SummeBuchungen), fmt) & vbTab