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

Merge branch 'newMaster2024' of https://git.it.verag.ag/edv/SDL into newMaster2024

Browse Source
This commit is contained in:
d.breimaier
2026-11-10 08:30:09 +01:00
parent 8fffd23404 fa1981b4db
commit b04b7cb54e
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/cATLAS_EZA_IMPORT.vb
View File

@@ -1673,7 +1673,8 @@ Public Class cATLAS_EZA_IMPORT
If currency <> "" Then pos.ezaWP_ArtikelpreisWaehrung = currency If currency <> "" Then pos.ezaWP_ArtikelpreisWaehrung = currency
Dim n As Decimal Dim n As Decimal
If TetraTryDecimal(netText, n) Then pos.ezaWP_Eigenmasse = n.ToString("0.###", CultureInfo.CurrentCulture) If TetraTryDecimal(netText, n) Then pos.ezaWP_Eigenmasse = n.ToString("0.###", CultureInfo.CurrentCulture)
If TetraTryDecimal(grossText, n) Then pos.ezaWP_Rohmasse = CDbl(n) ' If TetraTryDecimal(grossText, n) Then pos.ezaWP_Rohmasse = CDbl(n)
If TetraTryDecimal(grossText, n) Then pos.ezaWP_Rohmasse = CDbl(Math.Round(n, 1, MidpointRounding.AwayFromZero))
If TetraTryDecimal(valueText, n) Then pos.ezaWP_Artikelpreis = n.ToString("0.00", CultureInfo.CurrentCulture) If TetraTryDecimal(valueText, n) Then pos.ezaWP_Artikelpreis = n.ToString("0.00", CultureInfo.CurrentCulture)
If procedure.Length >= 2 Then pos.ezaWP_AnmeldeVErfahren = procedure.Substring(0, 2) If procedure.Length >= 2 Then pos.ezaWP_AnmeldeVErfahren = procedure.Substring(0, 2)
If procedure.Length >= 4 Then pos.ezaWP_VerfahrensCodeVorangegangenesVerfahren = procedure.Substring(2, 2) If procedure.Length >= 4 Then pos.ezaWP_VerfahrensCodeVorangegangenesVerfahren = procedure.Substring(2, 2)

1
VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/RELAYHUB/cRelayHub.vb
View File

@@ -356,6 +356,7 @@ Public Class cRelayHub
Case "Freihandelszone", "FTZ" : fileType = "ftz" Case "Freihandelszone", "FTZ" : fileType = "ftz"
Case "EUR1", "EUR", "EUR.1" : fileType = "eur" Case "EUR1", "EUR", "EUR.1" : fileType = "eur"
Case "GGED_D", "GGED-D" : fileType = "gged_p" Case "GGED_D", "GGED-D" : fileType = "gged_p"
Case "Bill of Lading", "BoL" : fileType = "bill_of_lading"
Case Else : fileType = "unknown" '"other" Case Else : fileType = "unknown" '"other"
End Select End Select