AMbar, Vorauskasse, etc.
This commit is contained in:
@@ -507,7 +507,7 @@ Public Class usrCntlFaktAbrechnung
|
||||
|
||||
cboRgGS.SelectedIndex = 0
|
||||
|
||||
EUStGutschriftAnVeragToolStripMenuItem.Visible = False
|
||||
GutschriftAnVeragToolStripMenuItem.Visible = False
|
||||
|
||||
cboFiliale.fillWithSQL("SELECT FilialenNr, Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)
|
||||
|
||||
@@ -539,6 +539,8 @@ Public Class usrCntlFaktAbrechnung
|
||||
FirmaTmp = "VERAGIMEX"
|
||||
End If
|
||||
|
||||
FirmaTmp = "AMBAR"
|
||||
|
||||
Select Case FirmaTmp
|
||||
Case "VERAG"
|
||||
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGAG_DE", "SDL") Then
|
||||
@@ -554,7 +556,7 @@ Public Class usrCntlFaktAbrechnung
|
||||
Case "ATILLA" : whereFirma = " AND Firma_ID=7 " : pnlDocs.Visible = True
|
||||
Case "UNISPED" : whereFirma = " AND FIRMENGRUPPE IN ('UNISPED') " : firstEmpty = True : pnlDocs.Visible = True
|
||||
|
||||
Case "AMBAR" : whereFirma = " AND Firma_ID=24 " : pnlDocs.Visible = True : EUStGutschriftAnVeragToolStripMenuItem.Visible = True
|
||||
Case "AMBAR" : whereFirma = " AND Firma_ID=24 " : pnlDocs.Visible = True : GutschriftAnVeragToolStripMenuItem.Visible = True
|
||||
Case "FRONT-OFFICE" : whereFirma = " AND Firma_ID=17 " : pnlDocs.Visible = True
|
||||
Case "VERAGIMEX"
|
||||
whereFirma = " AND FIRMENGRUPPE IN ('VERAG','IMEX','ATILLA','VERAGUNISPED','FRONTOFFICE') "
|
||||
@@ -1039,9 +1041,9 @@ Public Class usrCntlFaktAbrechnung
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
Dim top = IIf(VeragGU, "top(1)", "")
|
||||
Dim nurVerzollung = IIf(VeragGU, " AND Offerten.OffertenNr = 1", "")
|
||||
|
||||
.DataSource = SQL.loadDgvBySql("SELECT " & top & "Offerten.OffertenNr, cast(Offerten.OffertenNr as varchar(3)) + ' - ' + Offertenstamm.OffertenBez as OffertenBez ,Offerten.Besonderheiten, Gesperrt, Gesperrt_Datum, Gesperrt_Grund FROM Offerten inner join Offertenstamm on [Offerten].OffertenNr=Offertenstamm.OffertenNr WHERE Offerten.KundenNr='" & kdNr & "' ORDER BY Offerten.OffertenNr ", "FMZOLL")
|
||||
.DataSource = SQL.loadDgvBySql("SELECT Offerten.OffertenNr, cast(Offerten.OffertenNr as varchar(3)) + ' - ' + Offertenstamm.OffertenBez as OffertenBez ,Offerten.Besonderheiten, Gesperrt, Gesperrt_Datum, Gesperrt_Grund FROM Offerten inner join Offertenstamm on [Offerten].OffertenNr=Offertenstamm.OffertenNr WHERE Offerten.KundenNr='" & kdNr & "' " & nurVerzollung & " ORDER BY Offerten.OffertenNr ", "FMZOLL")
|
||||
If .ColumnCount = 0 Then Exit Sub
|
||||
.Columns("OffertenNr").Visible = False
|
||||
.Columns("Besonderheiten").Visible = False
|
||||
@@ -1782,7 +1784,7 @@ Public Class usrCntlFaktAbrechnung
|
||||
Case 23 : pic.BackgroundImage = My.Resources.Unisped_ZS_logo
|
||||
pnlTop.BackColor = Color.FromArgb(192, 0, 0) : errCOlor = Color.DarkRed
|
||||
|
||||
Case 24 : pic.BackgroundImage = My.Resources.ambar_simple
|
||||
Case 24 : pic.BackgroundImage = My.Resources.ambar_boarder
|
||||
pnlTop.BackColor = Color.FromArgb(0, 120, 120) : errCOlor = Color.DarkRed
|
||||
'Case 23 : pic.BackgroundImage = My.Resources.FrontOfficeSUB_Horizontal
|
||||
' pnlTop.BackColor = Color.FromArgb(0, 120, 120) : errCOlor = Color.DarkRed
|
||||
@@ -3939,7 +3941,12 @@ Nächste_Textzeile_lesen:
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub EUStGutschriftAnVeragToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EUStGutschriftAnVeragToolStripMenuItem.Click
|
||||
Private Sub EUStGutschriftAnVeragToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GutschriftAnVeragToolStripMenuItem.Click
|
||||
|
||||
Dim spedbuch = New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch(cboFiliale._value, txtAbfertigungsnummer.Text, cboSpedBuchUnterNr._value)
|
||||
|
||||
If spedbuch.Abfertigungsart <> 1 AndAlso RECHNUNG.[BelegartenNr] = 71 Then Exit Sub 'nur bei Rechnung und abfertigungsart 1
|
||||
|
||||
|
||||
Dim abfrage = "Soll eine neue Gutschrift an die Verag AG für die Verzollung/EUST erstellt werden?"
|
||||
Dim PosWithWEustOrVerz As Boolean = False
|
||||
@@ -3947,7 +3954,7 @@ Nächste_Textzeile_lesen:
|
||||
For Each POS In RECHNUNG.POSITIONEN.Where(Function(x) x.Anzahl > 0).ToList
|
||||
Select Case POS.LeistungsNr
|
||||
Case "20" : abfrage &= vbNewLine & POS.Anzahl & "x EUSt: " & CDbl(POS.Preis) : PosWithWEustOrVerz = True : selectedPOS.Add(POS)
|
||||
Case "340" : abfrage &= vbNewLine & POS.Anzahl & "x Verzollung: " & CDbl(POS.LeistungsBez) : PosWithWEustOrVerz = True : selectedPOS.Add(POS)
|
||||
Case "340", "60" : abfrage &= vbNewLine & POS.Anzahl & "x : " & POS.LeistungsBez & " laut Offerte" : PosWithWEustOrVerz = True : selectedPOS.Add(POS)
|
||||
End Select
|
||||
Next
|
||||
|
||||
@@ -3957,19 +3964,7 @@ Nächste_Textzeile_lesen:
|
||||
veragKunde = 3013401
|
||||
saveMe()
|
||||
Dim RECHNUNGOldID = RECHNUNG.RK_ID
|
||||
|
||||
'ALTE RECHNUNG--------------------------------------------------------------------------------------------
|
||||
'If Not saveMe() Then Exit Sub 'alte Rechnung kopieren (in neuen DS speichern)
|
||||
'Dim REM_POS_TMP As New List(Of VERAG_PROG_ALLGEMEIN.cRechnungsausgangPositionen)
|
||||
Dim RECHNUNG_TMP = New VERAG_PROG_ALLGEMEIN.cRechnungsausgang(RECHNUNGOldID)
|
||||
'RECHNUNG_TMP.Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
|
||||
'For Each POS In RECHNUNG_TMP.POSITIONEN
|
||||
' REM_POS_TMP.Add(POS)
|
||||
'Next
|
||||
|
||||
'initDGVRechnungenPositionen()
|
||||
'RECHNUNG_TMP.SAVE_POSITIONEN(RECHNUNG_TMP.RK_ID)
|
||||
'saveMe()
|
||||
'--------------------------------------------------------------------------------------------
|
||||
'Gutschrift
|
||||
|
||||
@@ -3985,12 +3980,6 @@ Nächste_Textzeile_lesen:
|
||||
|
||||
cboRgGS.SelectedIndex = 1
|
||||
|
||||
dgvOfferteDetailsUebersicht.Columns.Clear()
|
||||
|
||||
przBerechneRAPos("")
|
||||
loadFormRGPosInOfferte()
|
||||
initDGVRechnungenPositionen()
|
||||
cboFiliale.Focus()
|
||||
'setze VERG ALS Vermittler/Kunde
|
||||
Dim kundeVerag As New cKunde(veragKunde)
|
||||
Dim kundeVeragAdr As New cAdressen(veragKunde)
|
||||
@@ -4001,9 +3990,15 @@ Nächste_Textzeile_lesen:
|
||||
kdFirmaAuftraggeber.KdData_KUNDE = kundeVerag
|
||||
kdFirmaAuftraggeber.KdData_ADRESSEN = kundeVeragAdr
|
||||
kdFirmaAuftraggeber.KdData_KUNDE_ERW = kundeVeragErw
|
||||
|
||||
cboRechnungAn.changeItem("3")
|
||||
RECHNUNG.Rechnung_an = cboRechnungAn._value
|
||||
cboRechnungAn.changeItem("3")
|
||||
|
||||
kdFirmaRechnungAn.KdNr = veragKunde
|
||||
|
||||
przBerechneRAPos("")
|
||||
loadFormRGPosInOfferte()
|
||||
initDGVRechnungenPositionen()
|
||||
cboFiliale.Focus()
|
||||
|
||||
cboFiliale.Focus()
|
||||
saveMe()
|
||||
@@ -4015,7 +4010,7 @@ Nächste_Textzeile_lesen:
|
||||
For Each POS In RECHNUNG_TMP.POSITIONEN
|
||||
POS.RK_ID = RECHNUNG.RK_ID
|
||||
Select Case POS.LeistungsNr
|
||||
Case "20" '->org. EUST direkt in POS
|
||||
Case "20", "60" '->org. EUST direkt in POS
|
||||
''POS.Preis = POS.Preis * -1
|
||||
'REM_POS_GU.Add(POS)
|
||||
For Each r As DataGridViewRow In dgvOfferteDetailsUebersicht.Rows
|
||||
@@ -4038,11 +4033,6 @@ Nächste_Textzeile_lesen:
|
||||
RECHNUNG.POSITIONEN.Clear()
|
||||
przRefreshDGV_Positionen()
|
||||
|
||||
|
||||
'For Each POS_NEW In REM_POS_GU
|
||||
' RECHNUNG.POSITIONEN.Add(POS_NEW)
|
||||
'Next
|
||||
|
||||
RECHNUNG.SAVE_POSITIONEN(RECHNUNG.RK_ID)
|
||||
saveMe()
|
||||
If Not loaded Then Exit Sub
|
||||
@@ -4057,4 +4047,5 @@ Nächste_Textzeile_lesen:
|
||||
|
||||
End Sub
|
||||
|
||||
|
||||
End Class
|
||||
Reference in New Issue
Block a user