neu

SDL/cProgramFunctions.vb

@@ -203,7 +203,8 @@ Public Class cProgramFunctions
                 If Not IsNumeric(docid) OrElse docid <= 0 Then docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1)  FROM [Therefore].[dbo].[TheCat395] WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON")
                 If Not IsNumeric(docid) OrElse docid <= 0 Then docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1)  FROM [Therefore].[dbo].[TheCat397] WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON")
             Else
-                docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1)  FROM [Therefore].[dbo].[TheCat291] WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON")
+                docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1)  FROM [Therefore].[dbo].TheCat398 WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON")
+                If Not IsNumeric(docid) OrElse docid <= 0 Then docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1)  FROM [Therefore].[dbo].[TheCat291] WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON")
                 If Not IsNumeric(docid) OrElse docid <= 0 Then docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1)  FROM [Therefore].[dbo].[TheCat153] WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON")
                 If Not IsNumeric(docid) OrElse docid <= 0 Then docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1)  FROM [Therefore].[dbo].[TheCat119] WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON")
                 If Not IsNumeric(docid) OrElse docid <= 0 Then docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1)  FROM [Therefore].[dbo].[TheCat109] WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON")
@@ -1104,7 +1105,7 @@ Public Class cProgramFunctions
         Return ""
     End Function
 
-    Public Shared Function genExcelFromDT_NEW(dt As DataTable, Optional rangeAsWaehrung() As String = Nothing, Optional ShowAutoFilter As Boolean = True, Optional HeaderTxt As String = "", Optional HeaderTxt2 As String = "") As String
+    Public Shared Function genExcelFromDT_NEW(dt As DataTable, Optional rangeAsWaehrung() As String = Nothing, Optional ShowAutoFilter As Boolean = True, Optional HeaderTxt As String = "", Optional HeaderTxt2 As String = "", Optional waehrungsZeichen As String = "€") As String
         Try
 
             Dim sPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\SDL\tmp\" ' My.Computer.FileSystem.GetTempFileName
@@ -1122,7 +1123,7 @@ Public Class cProgramFunctions
             If rangeAsWaehrung IsNot Nothing Then
                 For Each r In rangeAsWaehrung
                     Try
-                        wb.Worksheets(0).Range(r).Style.NumberFormat.SetFormat("###,###,##0.00 €")
+                        wb.Worksheets(0).Range(r).Style.NumberFormat.SetFormat("###,###,##0.00 " & waehrungsZeichen)
                     Catch ex As Exception
                         MsgBox(ex.Message & ex.StackTrace)
                     End Try
@@ -1230,7 +1231,7 @@ Public Class cProgramFunctions
                     clmns &= valueTmp
                 End If
             Next
-            MsgBox(clmns)
+            ' MsgBox(clmns)
             If replaceZeroDate Then ' DATUM Replace
                 outFile.WriteLine(clmns.Replace(" 00:00:00", ""))
             Else
@@ -1340,42 +1341,41 @@ Public Class cProgramFunctions
     End Sub
 
 
-    Public Shared Sub _TRANSLATE_RPT(rpt As GrapeCity.ActiveReports.SectionReport, o As GrapeCity.ActiveReports.SectionReportModel.ControlCollection, lan As String)
-    If lan = "" Then Exit Sub
-    If lan = "DE" Then Exit Sub
-    'o... Form
-    's... SubContainer
-    'c... Control
+    Public Shared Sub _TRANSLATE_RPT(rpt As GrapeCity.ActiveReports.SectionReport, o As GrapeCity.ActiveReports.SectionReportModel.ControlCollection, lan As String, reportName As String)
+        If lan = "" Then Exit Sub
+        If lan = "DE" Then Exit Sub
+        'o... Form
+        's... SubContainer
+        'c... Control 
+        Dim MEname = reportName 'rpt.Name (geht ned) '"rptRechnungDruck" 
+        Dim TextTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.TRANSLATE.list.FindAll(Function(x) x.trs_object = MEname And x.trs_sprache = lan)
 
-    Dim MEname = "rptRechnungDruck" 'rpt.Name
-    Dim TextTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.TRANSLATE.list.FindAll(Function(x) x.trs_object = MEname And x.trs_sprache = lan)
+        If TextTmp IsNot Nothing Then
+            For Each TXT As VERAG_PROG_ALLGEMEIN.cTranslate In TextTmp
+                Dim found As GrapeCity.ActiveReports.SectionReportModel.ARControl = Nothing
+                For Each search As GrapeCity.ActiveReports.SectionReportModel.ARControl In o
+                    If search.Name = TXT.trs_control Then
+                        found = search
+                    End If
+                Next
 
-    If TextTmp IsNot Nothing Then
-        For Each TXT As VERAG_PROG_ALLGEMEIN.cTranslate In TextTmp
-            Dim found As GrapeCity.ActiveReports.SectionReportModel.ARControl = Nothing
-            For Each search As GrapeCity.ActiveReports.SectionReportModel.ARControl In o
-                If search.Name = TXT.trs_control Then
-                    found = search
+                '   MsgBox(TXT.trs_control)
+                If found IsNot Nothing Then
+                    '   MsgBox("JA")
+                    Dim obj As GrapeCity.ActiveReports.SectionReportModel.ARControl = found
+                    If obj IsNot Nothing Then
+                        If (TypeOf obj Is GrapeCity.ActiveReports.SectionReportModel.Label) Then
+                            DirectCast(obj, GrapeCity.ActiveReports.SectionReportModel.Label).Text = TXT.trs_text
+                        End If
+                        If (TypeOf obj Is GrapeCity.ActiveReports.SectionReportModel.TextBox) Then
+                            DirectCast(obj, GrapeCity.ActiveReports.SectionReportModel.TextBox).Text = TXT.trs_text
+                        End If
+                    End If
                 End If
             Next
+        End If
 
-            '   MsgBox(TXT.trs_control)
-            If found IsNot Nothing Then
-                '   MsgBox("JA")
-                Dim obj As GrapeCity.ActiveReports.SectionReportModel.ARControl = found
-                If obj IsNot Nothing Then
-                    If (TypeOf obj Is GrapeCity.ActiveReports.SectionReportModel.Label) Then
-                        DirectCast(obj, GrapeCity.ActiveReports.SectionReportModel.Label).Text = TXT.trs_text
-                    End If
-                    If (TypeOf obj Is GrapeCity.ActiveReports.SectionReportModel.TextBox) Then
-                        DirectCast(obj, GrapeCity.ActiveReports.SectionReportModel.TextBox).Text = TXT.trs_text
-                    End If
-                End If
-            End If
-        Next
-    End If
-
-End Sub
+    End Sub
 
 End Class