diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb index caa0429c..ddd5016d 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb @@ -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 diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 8f4ace45..9d78f2c6 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/kunden/usrCntlOfferte.vb b/SDL/kunden/usrCntlOfferte.vb index 39b072de..c622ee4d 100644 --- a/SDL/kunden/usrCntlOfferte.vb +++ b/SDL/kunden/usrCntlOfferte.vb @@ -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 diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cOfferte.vb b/VERAG_PROG_ALLGEMEIN/Classes/cOfferte.vb index ad3a0647..f85df762 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cOfferte.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cOfferte.vb @@ -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 diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb index 699c0ef6..6c42b7e7 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb @@ -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