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

This commit is contained in:
2024-11-05 17:03:44 +01:00
4 changed files with 14 additions and 6 deletions

View File

@@ -3089,7 +3089,7 @@ Public Class frmMDMDatenverarbetiung
where bills.invoice_date = '" & DateTimePicker2.Text & "' and trans.charged = 0 and cust.[partner_customer_number] = " & KdNr & "
group by cust.[customer_id], trans.device_product_type, Offertenpositionen.LeistungsNr , Offertenpositionen.LeistungsBez ) as temp group by customer_id, LeistungsNr"
Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL", 1200)
For Each r In dt.Rows

View File

@@ -3,6 +3,7 @@ Imports System.Collections.Generic
Imports System.Data.SqlClient
Imports System.IO
Imports System.Reflection
Imports Therefore.API
Imports VERAG_PROG_ALLGEMEIN
Public Class cUTA
@@ -1051,7 +1052,12 @@ Public Class cUTA
.[Gesamtbetrag_in_Lieferlandwährung_Umsatzsteuer_informativ] = 0 - .[Gesamtbetrag_in_Lieferlandwährung_Umsatzsteuer_informativ]
End Select
.SAVE()
'nur KundenNr 100964 und 825040 speichern:
If .[Kundennummer] = 100964 Or .[Kundennummer] = 825040 Then
.SAVE()
End If
'Dim clfArchiv As New cUTA.UTAArchiv(.Belegdatum, .UTA_Beleg_ID)

View File

@@ -2273,9 +2273,9 @@ Public Class DATENVERVER_OPTIONS
list.Add(New KeyValuePair(Of String, String)("JVBERi0", "pdf"))
list.Add(New KeyValuePair(Of String, String)("R0lGODdh", "gif"))
list.Add(New KeyValuePair(Of String, String)("iVBORw0KGgo", "png"))
list.Add(New KeyValuePair(Of String, String)("TU0AK", "tiff"))
list.Add(New KeyValuePair(Of String, String)("UEs", "gif"))
list.Add(New KeyValuePair(Of String, String)("PK", "zip"))
'list.Add(New KeyValuePair(Of String, String)("TU0AK", "tiff"))
'list.Add(New KeyValuePair(Of String, String)("UEs", "gif"))
'list.Add(New KeyValuePair(Of String, String)("PK", "zip"))
For Each type In list
If base64.Contains(type.Key) Then

View File

@@ -515,8 +515,10 @@ Public Class cMSEAPI
Return "FEHLER Array Transaktions ist leer"
End If
If transactions.Size = 1 Then
If transactions.Size = 1 Then '?? warum nochmal
transactionID.Columns("batch_seq_nr").ReadOnly = False
row.Item("batch_seq_nr") = transactions.ObjectAt(0).StringOf("batch_seq_nr")
transactionID.Columns("batch_seq_nr").ReadOnly = True
End If