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

Fakturierung VERAG AG (DE); NCTS Adressen zugel.Empf.; ATEZ +Procedure

Browse Source
This commit is contained in:
Andreas Luxbauer
2023-08-30 16:07:44 +02:00
parent f68ad96df5
commit aaecc4fce6
17 changed files with 294 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SDL/Fakturierung/cFakturierung.vb
View File

@@ -965,6 +965,7 @@ Public Class cFakturierung
Select Case RECHNUNG.Firma_ID
Case 1 ' rpt.picVERAG.Image= My.Resources.Verag_AG_Logo : rpt.Picture1.Image = My.Resources.aeo_AT_imex is eh standard
Case 4 : rpt.picVERAG.Image = My.Resources.Verag_AG_Logo : rpt.Picture1.Image = Nothing
Case 7 : rpt.picVERAG.Image = My.Resources.Atilla_big_med : rpt.Picture1.Image = Nothing
Case 11 : rpt.picVERAG.Image = My.Resources.Verag_Customs_Service_GMBH_Logo : rpt.Picture1.Image = My.Resources.aeo_CS
Case 20 : rpt.picVERAG.Image = My.Resources.IMEX_LOGO_simple : rpt.Picture1.Image = My.Resources.aeo_AT_imex
@@ -1572,6 +1573,11 @@ Public Class cFakturierung
If displayFirmenmane Then getSignature &= "<br><b>VERAG Spedition AG</b><br>"
getSignature &= "<div style=""font-size:12px"">A 4975 Suben, Nr. 100 <br><b>T</b> +43 7711 2777-0 | <b>F</b> +43 7711 31 073 | <b>@</b> " & If(individuell, emailindividuell, "rechnungsversand@verag.ag") & " | www.verag.ag | FN 216714y</div>"
If additionalLine <> "" Then getSignature &= vbNewLine & additionalLine & vbNewLine
Case 4 'VERAG AG (DE)
getSignature &= "<img width=""250"" height=""50"" src=""" & imgsrc & "Verag-AG-Logo21.png""/>"
If displayFirmenmane Then getSignature &= "<br><b>VERAG Spedition AG</b><br>"
getSignature &= "<div style=""font-size:12px"">A 4975 Suben, Nr. 100 <br><b>T</b> +43 7711 2777-0 | <b>F</b> +43 7711 31 073 | <b>@</b> " & If(individuell, emailindividuell, "rechnungsversand@verag.ag") & " | www.verag.ag | FN 216714y</div>"
If additionalLine <> "" Then getSignature &= vbNewLine & additionalLine & vbNewLine
Case 7 'ATILLA
getSignature &= "<img width=""250"" height=""50"" src=""" & imgsrc & "Atilla.jpg""/>"
If displayFirmenmane Then getSignature &= "<br><b>ATILLA Spedition GmbH</b><br>"
@@ -2506,6 +2512,7 @@ Public Class cFakturierung
Select Case ROW("Firma_ID")
Case 1 ' rpt.picVERAG.Image= My.Resources.Verag_AG_Logo : rpt.Picture1.Image = My.Resources.aeo_AT_imex is eh standard
Case 4 : rpt.picVERAG.Image = My.Resources.Verag_AG_Logo : rpt.Picture1.Image = Nothing
Case 7 : rpt.picVERAG.Image = My.Resources.Atilla_big_med : rpt.Picture1.Image = Nothing
Case 11 : rpt.picVERAG.Image = My.Resources.Verag_Customs_Service_GMBH_Logo : rpt.Picture1.Image = My.Resources.aeo_CS
Case 20 : rpt.picVERAG.Image = My.Resources.IMEX_LOGO_simple : rpt.Picture1.Image = My.Resources.aeo_AT_imex
@@ -2919,6 +2926,7 @@ Public Class cFakturierung
Select Case ROW("Firma_ID")
Case 1 ' rpt.picVERAG.Image= My.Resources.Verag_AG_Logo : rpt.Picture1.Image = My.Resources.aeo_AT_imex is eh standard
Case 4 : rpt.picVERAG.Image = My.Resources.Verag_AG_Logo : rpt.Picture1.Image = Nothing
Case 7 : rpt.picVERAG.Image = My.Resources.Atilla_big_med : rpt.Picture1.Image = Nothing
Case 11 : rpt.picVERAG.Image = My.Resources.Verag_Customs_Service_GMBH_Logo : rpt.Picture1.Image = My.Resources.aeo_CS
Case 20 : rpt.picVERAG.Image = My.Resources.IMEX_LOGO_simple : rpt.Picture1.Image = My.Resources.aeo_AT_imex

21
SDL/Fakturierung/frmAbrechnungsMaske.vb
View File

@@ -53,12 +53,23 @@ Public Class frmAbrechnungsMaske
Select Case FirmaTmp
Case "VERAG"
If VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG = "MDM" Then
cboFirma.fillWithSQL("Select [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE FIRMENGRUPPE In ('VERAG360') ", False, "FMZOLL")
Dim whereFirma = " AND FIRMENGRUPPE In ('VERAG360')"
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGAG_DE", "SDL") Then
whereFirma = " AND FIRMENGRUPPE In ('VERAG360','VERAGAG_DE') "
End If
cboFirma.fillWithSQL("Select [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE 1=1 " & whereFirma, False, "FMZOLL")
cboFirma.changeItem("1")
MyComboBox2.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where mit_firma IN ('VERAG'" & If(VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "ADMIN", ",'ALL'", "") & ") and mit_gekuendigt=0 AND (mit_abteilung IN ('VRR','BH') OR [mit_id] IN (SELECT [beroz_bergrId] FROM [tblBerechtigungsObjekteZuordnung] where [beroz_beroId]=90 AND beroz_art='B')) order by mit_username", False, "ADMIN", True)
MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("*BAUBÖCK", "BAUBOECK"))
Else
cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE FIRMENGRUPPE IN ('VERAG','VERAGUNISPED','FRONTOFFICE','ATILLA') ", False, "FMZOLL")
Dim whereFirma = " AND FIRMENGRUPPE IN ('VERAG','VERAGUNISPED','FRONTOFFICE','ATILLA') "
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGAG_DE", "SDL") Then
whereFirma = " AND FIRMENGRUPPE In ('VERAG','VERAGUNISPED','FRONTOFFICE','ATILLA','VERAGAG_DE') "
End If
cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE 1=1 " & whereFirma, False, "FMZOLL")
cboFirma.changeItem("1")
MyComboBox2.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where mit_firma IN ('VERAG'" & If(VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "ADMIN", ",'ALL'", "") & ") and mit_gekuendigt=0 AND (mit_abteilung IN ('VRR','BH') OR [mit_id] IN (SELECT [beroz_bergrId] FROM [tblBerechtigungsObjekteZuordnung] where [beroz_beroId]=90 AND beroz_art='B')) order by mit_username", False, "ADMIN", True)
End If
@@ -75,7 +86,11 @@ Public Class frmAbrechnungsMaske
cboFirma.changeItem("24")
MyComboBox2.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where mit_firma='AMBAR' and mit_gekuendigt=0 AND (mit_abteilung IN ('VRR','BH') OR (SELECT COUNT(*) FROM [tblBerechtigungsObjekteZuordnung] where [beroz_beroId]=90 AND [beroz_bergrId]=[mit_id] AND beroz_art='B')>0) order by mit_username", False, "ADMIN", True)
Case "VERAGIMEX"
cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE FIRMENGRUPPE IN ('VERAG','IMEX','ATILLA','VERAGUNISPED','FRONTOFFICE') ", False, "FMZOLL")
Dim whereFirma = " AND FIRMENGRUPPE IN ('VERAG','IMEX','ATILLA','VERAGUNISPED','FRONTOFFICE') "
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGAG_DE", "SDL") Then
whereFirma = " AND FIRMENGRUPPE In ('VERAG','IMEX','VERAGUNISPED','FRONTOFFICE','ATILLA','VERAGAG_DE') "
End If
cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE 1=1 " & whereFirma, False, "FMZOLL")
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Case "VERAG" : cboFirma.changeItem("1")
Case "IMEX" : cboFirma.changeItem("20")

25
SDL/Fakturierung/usrCntlFaktAbrechnung.vb
View File

@@ -516,7 +516,14 @@ Public Class usrCntlFaktAbrechnung
End If
Select Case FirmaTmp
Case "VERAG" : whereFirma = " AND FIRMENGRUPPE IN ('VERAG','ATILLA','FRONTOFFICE') " : pnlDocs.Visible = True
Case "VERAG"
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGAG_DE", "SDL") Then
whereFirma = " AND FIRMENGRUPPE IN ('VERAG','ATILLA','FRONTOFFICE','VERAGAG_DE') " : pnlDocs.Visible = True
MsgBox("AH")
Else
whereFirma = " AND FIRMENGRUPPE IN ('VERAG','ATILLA','FRONTOFFICE') " : pnlDocs.Visible = True
End If
Case "IMEX" : whereFirma = " AND FIRMENGRUPPE IN ('IMEX') " : pnlDocs.Visible = True
'Case "VERAG" : whereFirma = " AND Firma_ID<>20 " : pnlDocs.Visible = True
'Case "IMEX" : whereFirma = " AND Firma_ID=20 "
@@ -525,7 +532,18 @@ Public Class usrCntlFaktAbrechnung
Case "AMBAR" : whereFirma = " AND Firma_ID=24 " : pnlDocs.Visible = True
Case "FRONT-OFFICE" : whereFirma = " AND Firma_ID=17 " : pnlDocs.Visible = True
Case "VERAGIMEX" : whereFirma = " AND FIRMENGRUPPE IN ('VERAG','IMEX','ATILLA','VERAGUNISPED','FRONTOFFICE') " : pnlDocs.Visible = True
Case "VERAGIMEX"
whereFirma = " AND FIRMENGRUPPE IN ('VERAG','IMEX','ATILLA','VERAGUNISPED','FRONTOFFICE') "
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGAG_DE", "SDL") Then
whereFirma = " AND FIRMENGRUPPE IN ('VERAG','IMEX','ATILLA','VERAGUNISPED','FRONTOFFICE','VERAGAG_DE') "
End If
pnlDocs.Visible = True
Case "VERA360"
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGAG_DE", "SDL") Then
whereFirma = " AND FIRMENGRUPPE IN ('VERAG360','VERAGAG_DE') " : pnlDocs.Visible = True
Else
whereFirma = " AND FIRMENGRUPPE IN ('VERAG360') " : pnlDocs.Visible = True
End If
End Select
cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE Firma_ID NOT IN(3) " & whereFirma & " ORDER BY Firma_ID ", True, "FMZOLL", firstEmpty)
@@ -1681,6 +1699,8 @@ Public Class usrCntlFaktAbrechnung
Select Case cboFirma._value
Case 1 : pic.BackgroundImage = My.Resources.Verag_AG_Logo
pnlTop.BackColor = Color.FromArgb(0, 54, 128)
Case 4 : pic.BackgroundImage = My.Resources.Verag_AG_Logo_DE
pnlTop.BackColor = Color.FromArgb(0, 54, 128)
Case 7 : pic.BackgroundImage = My.Resources.Atilla_big_med
pnlTop.BackColor = Color.FromArgb(192, 0, 0) : errCOlor = Color.Yellow
Case 11 : pic.BackgroundImage = My.Resources.Verag_Customs_Service_GMBH_Logo
@@ -1754,6 +1774,7 @@ Public Class usrCntlFaktAbrechnung
Case "4805" : cboFirma.changeItem(11) : RECHNUNG.Firma_ID = 11
Case "4801" : cboFirma.changeItem(7) : RECHNUNG.Firma_ID = 7
Case "5501" : cboFirma.changeItem(20) : RECHNUNG.Firma_ID = 20
'' Case "4819" : cboFirma.changeItem(4) : RECHNUNG.Firma_ID = 4
Case "5601" : cboFirma.changeItem("") : RECHNUNG.Firma_ID = -1 'UNISPED
Case "7001" : cboFirma.changeItem("") : RECHNUNG.Firma_ID = -1 'UK oder AG

10
SDL/My Project/Resources.Designer.vb generated
View File

@@ -2351,6 +2351,16 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Verag_AG_Logo_DE() As System.Drawing.Bitmap
Get
Dim obj As Object = ResourceManager.GetObject("Verag_AG_Logo_DE", resourceCulture)
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>

3
SDL/My Project/Resources.resx
View File

@@ -886,4 +886,7 @@
<data name="modaltrans_original" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\modaltrans_original.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Verag_AG_Logo_DE" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Verag-AG-Logo_DE.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

BIN
SDL/Resources/Verag-AG-Logo_DE.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 33 KiB

1
SDL/SDL.vbproj
View File

@@ -4559,6 +4559,7 @@
<None Include="Resources\pay_cash_s.png" />
<None Include="Resources\locked.jpg" />
<None Include="Resources\modaltrans_original.png" />
<None Include="Resources\Verag-AG-Logo_DE.jpg" />
<Content Include="Resources\Verag_Customs_Service_AEO.jpg">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>

7
SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_Adressen.vb
View File

@@ -71,7 +71,7 @@
NCTS.ncts_Empfaenger_EORI = cProgramFunctions.isLeerNothing(usrCntlEmpfaenger.txtEORI.Text)
NCTS.ncts_Empfaenger_NLNR = cProgramFunctions.isLeerNothing(usrCntlEmpfaenger.txtEORINL.Text)
NCTS.ncts_ZugelassenerEmpfaenger_EORI = cProgramFunctions.isLeerNothing(usrCntlZugelEmpfaenger.txtEORI.Text)
' MsgBox(NCTS.ncts_ZugelassenerEmpfaenger_EORI)
'SumA: Beförderer
'--------------------------------
@@ -134,6 +134,7 @@
usrCntlHauptverpflichteter.txtEORINL.Text = NCTS.ncts_Hauptverpflichteter_NLNR
usrCntlHauptverpflichteter.sbLand.SET_VALUE(NCTS.ncts_Hauptverpflichteter_Land)
usrCntlZugelEmpfaenger.txtEORI.Text = NCTS.ncts_ZugelassenerEmpfaenger_EORI
'usrCntlHauptverpflichteter.txtAnsprechpartner.Text=NCTS.ncts_Hauptverpflichteter_Ansprechpartner ' git es nicht
usrCntlVersender.kdFirma.Text = NCTS.ncts_Versender_Name
@@ -281,8 +282,8 @@
usrCntlEmpfaenger.txtEORINL.Text = NCTS.ncts_Empfaenger_NLNR
usrCntlEmpfaenger.sbLand.SET_VALUE(NCTS.ncts_Empfaenger_Land)
'usrCntlEmpfaenger.txtAnsprechpartner.Text=NCTS.ncts_Empfaenger_Ansprechpartner ' git es nicht
' usrCntlHauptverpflichteter.txtEORI.Text = NCTS.ncts_ZugelassenerEmpfaenger_EORI
usrCntlZugelEmpfaenger.txtEORI.Text = NCTS.ncts_ZugelassenerEmpfaenger_EORI
'usrCntlHauptverpflichteter.txtEORINL.Text = NCTS.ncts_ZugelassenerEmpfaenger_BewilligungsnummerVersender
'usrCntlHauptverpflichteter.sbLand.SET_VALUE(NCTS.ncts_Hauptverpflichteter_Land)
'usrCntlHauptverpflichteter.txtAnsprechpartner.Text=NCTS.ncts_Hauptverpflichteter_Ansprechpartner ' git es nicht

6
SDL/ZOLLSYSTEM/DAKOSY/ATLAS/cDakosyInterface_Send.vb
View File

@@ -37,8 +37,6 @@ Class DAKOSY_Interface_SEND
'cDY.ncts_WARENPOS=USRCNTL.POSITIONEN.getValues()
'--------------------------------
Return cDY
Catch ex As Exception
@@ -873,6 +871,10 @@ Class DAKOSY_Interface_SEND
If cDY.ncts_ZugelassenerEmpfaenger_IDCarnet IsNot Nothing Then XML.EinzelVersandanmeldung.KopfDaten.Adressen.Hauptverpflichteter.IDCarnet = cDY.ncts_ZugelassenerEmpfaenger_IDCarnet
End If
If cDY.ncts_ZugelassenerEmpfaenger_EORI IsNot Nothing Then
XML.EinzelVersandanmeldung.KopfDaten.Adressen.Hauptverpflichteter = New VersandanmeldungNCTSDE.HauptverpflichteterVATyp
If cDY.ncts_ZugelassenerEmpfaenger_EORI IsNot Nothing Then XML.EinzelVersandanmeldung.KopfDaten.Adressen.ZugelassenderEmpfaenger.EORI = cDY.ncts_ZugelassenerEmpfaenger_EORI
End If