MDM, UTA, FIbu
This commit is contained in:
@@ -287,6 +287,7 @@ Partial Class frmLeistundenFIBUKonten
|
||||
Me.btnAdd.Size = New System.Drawing.Size(24, 20)
|
||||
Me.btnAdd.TabIndex = 103
|
||||
Me.btnAdd.UseVisualStyleBackColor = True
|
||||
Me.btnAdd.Visible = False
|
||||
'
|
||||
'btnDelete
|
||||
'
|
||||
|
||||
@@ -115,8 +115,6 @@ Public Class frmLeistundenFIBUKonten
|
||||
|
||||
If checkIfFirmaIsFilled(True) = False Then Exit Sub
|
||||
|
||||
|
||||
|
||||
If Not mainPanel.Enabled Then mainPanel.Enabled = True
|
||||
|
||||
For Each contr As Windows.Forms.Control In mainPanel.Controls
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
Imports System.Data.OleDb
|
||||
Imports System.IO
|
||||
Imports Challenge
|
||||
Imports TAlex.WPF.Helpers
|
||||
Imports VERAG_PROG_ALLGEMEIN
|
||||
|
||||
@@ -632,17 +633,17 @@ Public Class frmMDMDatenverarbetiung
|
||||
rpt.lblKartennr.Text = "VERAG-KdNr: " & SQL.isDbnullEmpty(rpt.Fields.Item("AdressenNr").Value, "") & IIf(SQL.isDbnullEmpty(rpt.Fields.Item("Rabatt").Value, "") <> "", " abgezogener Rabatt:" & SQL.isDbnullEmpty(rpt.Fields.Item("Rabatt").Value & "", ""), "")
|
||||
|
||||
rpt.lblNetto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Liter").Value, 2, "")
|
||||
rpt.lblMWST.Text = SQL.isDbnullEmptyDbl(CDbl(rpt.Fields.Item("Netto").Value) - CDbl(rpt.Fields.Item("Rabatt").Value) / CDbl(rpt.Fields.Item("Liter").Value), 2, "")
|
||||
rpt.lblBrutto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Brutto").Value, 2, "")
|
||||
rpt.lblMWST.Text = SQL.isDbnullEmptyDbl((CDbl(rpt.Fields.Item("Netto").Value) - CDbl(rpt.Fields.Item("Rabatt").Value)) / CDbl(rpt.Fields.Item("Liter").Value), 4, "")
|
||||
rpt.lblBrutto.Text = SQL.isDbnullEmptyDbl(CDbl(rpt.Fields.Item("Brutto").Value) - CDbl(rpt.Fields.Item("Rabatt").Value), 2, "")
|
||||
|
||||
|
||||
rpt.lblSumNet.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Liter").Value, 2, "")
|
||||
rpt.lblSumVat.Text = SQL.isDbnullEmptyDbl(CDbl(rpt.Fields.Item("Netto").Value) - CDbl(rpt.Fields.Item("Rabatt").Value) / CDbl(rpt.Fields.Item("Liter").Value), 2, "")
|
||||
rpt.lblSumBrt.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Brutto").Value, 2, "")
|
||||
rpt.lblSumVat.Text = SQL.isDbnullEmptyDbl((CDbl(rpt.Fields.Item("Netto").Value) - CDbl(rpt.Fields.Item("Rabatt").Value)) / CDbl(rpt.Fields.Item("Liter").Value), 4, "")
|
||||
rpt.lblSumBrt.Text = SQL.isDbnullEmptyDbl(CDbl(rpt.Fields.Item("Brutto").Value) - CDbl(rpt.Fields.Item("Rabatt").Value), 2, "")
|
||||
|
||||
sumNetto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Liter").Value, 4, 0)
|
||||
sumMWST += SQL.isDbnullEmptyDbl(CDbl(rpt.Fields.Item("Netto").Value) - CDbl(rpt.Fields.Item("Rabatt").Value) / CDbl(rpt.Fields.Item("Liter").Value), 4, 0)
|
||||
sumBrutto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Brutto").Value, 4, 0)
|
||||
'sumMWST += SQL.isDbnullEmptyDbl((CDbl(rpt.Fields.Item("Netto").Value) - CDbl(rpt.Fields.Item("Rabatt").Value)) / CDbl(rpt.Fields.Item("Liter").Value), 4, 0)
|
||||
sumBrutto += SQL.isDbnullEmptyDbl(CDbl(rpt.Fields.Item("Brutto").Value) - CDbl(rpt.Fields.Item("Rabatt").Value), 4, 0)
|
||||
|
||||
|
||||
End Sub
|
||||
@@ -651,7 +652,7 @@ Public Class frmMDMDatenverarbetiung
|
||||
AddHandler rpt.ReportFooter1.Format, Sub()
|
||||
|
||||
rpt.lblSumNetto.Text = sumNetto.ToString("N2")
|
||||
rpt.lblSumMwst.Text = sumMWST.ToString("N2")
|
||||
'rpt.lblSumMwst.Text = sumMWST.ToString("N2")
|
||||
rpt.lblSumBrutto.Text = sumBrutto.ToString("N2")
|
||||
|
||||
End Sub
|
||||
@@ -879,6 +880,7 @@ Public Class frmMDMDatenverarbetiung
|
||||
|
||||
lblTTRSum.Visible = True
|
||||
txtTTRSum.Visible = True
|
||||
txtTTRSum._WaehrungZeichen = True
|
||||
|
||||
lblTTRSum.Text = "Tr-Kosten"
|
||||
|
||||
@@ -1013,12 +1015,13 @@ Public Class frmMDMDatenverarbetiung
|
||||
Next
|
||||
|
||||
txtAnzahl.Text = .Rows.Count
|
||||
txtPruefsummeNetto.Text = CDbl(sumTr).ToString("C2")
|
||||
txtPruefsummeNetto.Text = CDbl(sumFee).ToString("C2")
|
||||
txtPruefsummeBrutto.Text = CDbl(sumGes).ToString("C2")
|
||||
txtTTRSum.Text = CDbl(sumFee).ToString("C2")
|
||||
txtTTRSum.Text = CDbl(sumTr).ToString("C2")
|
||||
|
||||
lblTTRSum.Visible = True
|
||||
txtTTRSum.Visible = True
|
||||
txtTTRSum._WaehrungZeichen = False
|
||||
|
||||
lblTTRSum.Text = "Liter"
|
||||
|
||||
@@ -4184,6 +4187,7 @@ Public Class frmMDMDatenverarbetiung
|
||||
lblTTRSum.Visible = True
|
||||
txtTTRSum.Visible = True
|
||||
lblTTRSum.Text = "Prüfsumme TTR:"
|
||||
txtTTRSum._WaehrungZeichen = True
|
||||
Else
|
||||
lblTTRSum.Visible = False
|
||||
txtTTRSum.Visible = False
|
||||
@@ -4204,11 +4208,6 @@ Public Class frmMDMDatenverarbetiung
|
||||
End Function
|
||||
|
||||
Private Function setRechenwerteIDS() As Boolean
|
||||
'Abrechnungsdatum setzen
|
||||
|
||||
'Return False
|
||||
|
||||
|
||||
|
||||
If Not LIEFERANT = "IDS" Then Return False
|
||||
|
||||
@@ -4225,6 +4224,7 @@ Public Class frmMDMDatenverarbetiung
|
||||
For Each row In MyDatagridview1.Rows
|
||||
|
||||
Dim kundeOhneRabatt = True
|
||||
Dim seachedCustomer = False
|
||||
|
||||
Dim trans As New VERAG_PROG_ALLGEMEIN.cIDS(row.Cells("transaction_id").value)
|
||||
trans.Rechenwert = 0
|
||||
@@ -4244,6 +4244,9 @@ Public Class frmMDMDatenverarbetiung
|
||||
|
||||
If kundeOhneRabatt Then GoTo RabattBerechnen 'kundeOhneRabatt -> gleich zu Rabattberechnen!
|
||||
|
||||
If trans.CustomerCode = 60003367 And trans.OutletCountry = "Austria" Then
|
||||
seachedCustomer = True
|
||||
End If
|
||||
|
||||
'Rechenwert für Land/Station/Kunde/Produkt ermitteln
|
||||
Dim sqlStringLandStationKundeProdukt = "select Top(1) Rechenwert, Kz, KategorieNr FROM tbl_IDS_Rechenwerte WHERE OutletCountryCode=" & row.Cells("OutletCountryCode").Value & " AND OutletCode=" & row.Cells("OutletCode").Value & " And CustomerCode=" & row.Cells("KundeCustomerCode").Value & " AND ProductTypeCode=" & row.Cells("ProductTypeCode").Value & " ORDER BY Zeitstempel DESC"
|
||||
@@ -4279,7 +4282,7 @@ Public Class frmMDMDatenverarbetiung
|
||||
|
||||
' Rechenwert für Land/Station/Produkt ermitteln
|
||||
|
||||
Dim sqlStringLandStationProdukt = "select Top(1) Rechenwert, Kz, KategorieNr FROM tbl_IDS_Rechenwerte WHERE OutletCountryCode=" & row.Cells("OutletCountryCode").Value & " AND OutletCode=" & row.Cells("OutletCode").Value & " AND ProductTypeCode=" & row.Cells("ProductTypeCode").Value & " ORDER BY Zeitstempel DESC"
|
||||
Dim sqlStringLandStationProdukt = "select Top(1) Rechenwert, Kz, KategorieNr FROM tbl_IDS_Rechenwerte WHERE OutletCountryCode=" & row.Cells("OutletCountryCode").Value & " AND OutletCode=" & row.Cells("OutletCode").Value & " AND ProductTypeCode=" & row.Cells("ProductTypeCode").Value & " AND CustomerCode is null ORDER BY Zeitstempel DESC"
|
||||
Dim dtLandStationProdukt As DataTable = SQL.loadDgvBySql(sqlStringLandStationProdukt, "FMZOLL")
|
||||
If dtLandStationProdukt.Rows.Count > 0 Then
|
||||
For Each r In dtLandStationProdukt.Rows
|
||||
@@ -4294,7 +4297,7 @@ Public Class frmMDMDatenverarbetiung
|
||||
|
||||
' Rechenwert für Land/Produkt ermitteln
|
||||
|
||||
Dim sqlStringLandProdukt = "Select Top(1) Rechenwert, Kz, KategorieNr FROM tbl_IDS_Rechenwerte WHERE OutletCountryCode=" & row.Cells("OutletCountryCode").Value & " And OutletCode Is Null And ProductTypeCode=" & row.Cells("ProductTypeCode").Value & " ORDER BY Zeitstempel DESC"
|
||||
Dim sqlStringLandProdukt = "Select Top(1) Rechenwert, Kz, KategorieNr FROM tbl_IDS_Rechenwerte WHERE OutletCountryCode=" & row.Cells("OutletCountryCode").Value & " And OutletCode Is Null And ProductTypeCode=" & row.Cells("ProductTypeCode").Value & " AND CustomerCode is null ORDER BY Zeitstempel DESC"
|
||||
Dim dtLandProdukt As DataTable = SQL.loadDgvBySql(sqlStringLandProdukt, "FMZOLL")
|
||||
If dtLandProdukt.Rows.Count > 0 Then
|
||||
For Each r In dtLandProdukt.Rows
|
||||
@@ -4349,10 +4352,15 @@ RabattBerechnen:
|
||||
Select Case trans.Kz
|
||||
|
||||
Case "P" 'Rechenwert ist Preis pro Liter
|
||||
trans.Rabattbetrag = trans.TotalNetAmount - (trans.Rechenwert * trans.TransactionVolume * 100 + 0.5) / 100
|
||||
|
||||
trans.Rabattbetrag = trans.TotalNetAmount - Math.Floor(trans.Rechenwert * trans.TransactionVolume * 100 + 0.5) / 100
|
||||
trans.RabattbetragOrig = trans.Rabattbetrag
|
||||
trans.Rabattbetrag = trans.Rabattbetrag
|
||||
|
||||
Case "R" 'Rechenwert ist Rabatt pro Liter
|
||||
trans.Rabattbetrag = (trans.Rechenwert * trans.TransactionVolume * 100 + 0.5) / 100
|
||||
trans.Rabattbetrag = Math.Floor(trans.Rechenwert * trans.TransactionVolume * 100 + 0.5) / 100
|
||||
trans.RabattbetragOrig = trans.Rabattbetrag
|
||||
trans.Rabattbetrag = trans.Rabattbetrag
|
||||
|
||||
End Select
|
||||
|
||||
@@ -4363,6 +4371,8 @@ RabattBerechnen:
|
||||
|
||||
If trans.TransactionVolume <> 0 Then
|
||||
trans.RabattbetragProLiter = trans.Rabattbetrag / trans.TransactionVolume
|
||||
trans.RabattbetragProLiterOrig = trans.RabattbetragProLiter
|
||||
trans.RabattbetragProLiter = trans.RabattbetragProLiter
|
||||
End If
|
||||
|
||||
trans.Zeitstempel = Now()
|
||||
@@ -4653,19 +4663,24 @@ RabattBerechnen:
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
If vbYes = MsgBox("Wollen Sie die Rechenwerte in der IDS-Tabelle zurücksetzen?", vbYesNoCancel) Then
|
||||
If vbYes = MsgBox("Wollen Sie die Rechenwerte und Rabattbeträge in der IDS-Tabelle zurücksetzen?", vbYesNoCancel) Then
|
||||
Me.Cursor = Cursors.WaitCursor
|
||||
Dim i As Integer = 0
|
||||
For Each row In MyDatagridview1.Rows
|
||||
Dim trans As New VERAG_PROG_ALLGEMEIN.cIDS(row.Cells("transaction_id").Value)
|
||||
trans.Rechenwert = 0
|
||||
trans.Rabattbetrag = 0
|
||||
trans.RabattbetragProLiter = 0
|
||||
trans.Kz = "R"
|
||||
trans.Zeitstempel = Now()
|
||||
trans.KdNrVERAG = Nothing
|
||||
trans.Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
|
||||
If trans.SAVE() Then i += 1
|
||||
Next
|
||||
initDgv_IDS()
|
||||
Me.Cursor = Cursors.Default
|
||||
MsgBox(i & " Rechenwerte und Rabattbeträge wurden zurückgesetzt!")
|
||||
|
||||
MsgBox(i & " Rechenwerte wurden zurückgesetzt!")
|
||||
End If
|
||||
|
||||
End Sub
|
||||
|
||||
Reference in New Issue
Block a user