diff --git a/Aviso/Anhänge/frmSendungAnhangImport.vb b/Aviso/Anhänge/frmSendungAnhangImport.vb index 3b3fa66..f944db2 100644 --- a/Aviso/Anhänge/frmSendungAnhangImport.vb +++ b/Aviso/Anhänge/frmSendungAnhangImport.vb @@ -1062,7 +1062,8 @@ Public Class frmSendungAnhangImport cboArt.Items.Clear() cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATR-EUR1", "ATR-EUR1")) + cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATR", "ATR-EUR1")) + cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EUR1", "EUR1")) cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Rechnung", "Rechnung")) cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("eFatura", "eFatura")) cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CMR", "CMR")) @@ -1087,6 +1088,15 @@ Public Class frmSendungAnhangImport cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GB - Atanak Rechnung", "Atanak_RG")) End If + cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-D", "GGED_D")) + cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-PP", "GGED_PP")) + cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-P", "GGED_P")) + cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-A", "GED_A")) + cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Phytosanitary Certificate", "PHYTO")) + cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Konformitätserklärung", "CONFORM")) + + + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EXPORT_DOCS", "EXPORT_DOCS")) End If @@ -1124,7 +1134,7 @@ Public Class frmSendungAnhangImport Dim cnt = 1 For Each s In SENDUNG_LIST Dim abfertigungsArt = SQL.getValueTxtBySql("SELECT isnull([Abfertigungsbezeichnung],'') FROM [Abfertigungsarten] WHERE Abfertigungsart='" & s.tblSnd_Abfertigungsart_ID & "'", "FMZOLL") - Dim empfTmp = "" + Dim empfTmp = "" If s.tblSnd_Empfaenger IsNot Nothing Then empfTmp = If(s.tblSnd_Empfaenger.Length > 15, s.tblSnd_Empfaenger.Substring(0, 15), s.tblSnd_Empfaenger) End If diff --git a/Aviso/Anhänge/frmSendungAnhangUmbenennenUmkateg.vb b/Aviso/Anhänge/frmSendungAnhangUmbenennenUmkateg.vb index 2aa233d..eadb4eb 100644 --- a/Aviso/Anhänge/frmSendungAnhangUmbenennenUmkateg.vb +++ b/Aviso/Anhänge/frmSendungAnhangUmbenennenUmkateg.vb @@ -14,7 +14,8 @@ cboArt.Items.Clear() cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATR-EUR1", "ATR-EUR1")) + cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATR", "ATR-EUR1")) + cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EUR1", "EUR1")) cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Rechnung", "Rechnung")) cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("eFatura", "eFatura")) cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CMR", "CMR")) @@ -38,6 +39,15 @@ cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GB - E2", "E2")) cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GB - Atanak Rechnung", "Atanak_RG")) End If + + cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-D", "GGED_D")) + cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-PP", "GGED_PP")) + cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-P", "GGED_P")) + cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-A", "GED_A")) + cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Phytosanitary Certificate", "PHYTO")) + cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Konformitätserklärung", "CONFORM")) + + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EXPORT_DOCS", "EXPORT_DOCS")) End If diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 937866b..eb38cfe 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index 4f4410f..d27161b 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -784,7 +784,9 @@ Public Class usrcntlAktDetails WHERE [anh_AvisoId]='" & AvisoID & "' " & AktSndAnhaenge & " " & WhereWO & " ORDER BY anh_SendungsId desc, case + when [anh_Art] = 'ATR' then 0 when [anh_Art] = 'ATR-EUR1' then 0 + when [anh_Art] = 'EUR1' then 0.1 when [anh_Art] = 'Rechnung' then 1 when [anh_Art] = 'eFatura' then 1.1 when [anh_Art] = 'CMR' then 2 @@ -799,7 +801,18 @@ Public Class usrcntlAktDetails when [anh_Art] = 'Vollmacht' then 11 when [anh_Art] = 'ATB' then 12 when [anh_Art] = 'ATA' then 13 + + when [anh_Art] = 'GGED_D' then 40 + when [anh_Art] = 'GGED_PP' then 41 + when [anh_Art] = 'GGED_P' then 42 + when [anh_Art] = 'GGED_A' then 43 + when [anh_Art] = 'PHYTO' then 44 + when [anh_Art] = 'CONFORM' then 45 + + when [anh_Art] = 'Sonstiges' then 99 + + when [anh_Art] ='' then 15 END, [anh_Reihenfolge],[anh_id]"