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

picture

Browse Source
This commit is contained in:
d.breimaier
2024-10-01 11:02:00 +02:00
parent a5921c5faf
commit 76fbf96823
13 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
SDL/My Project/Resources.resx
View File

@@ -160,7 +160,7 @@
<data name="word" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\word.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="reloadFinance" type="System.Resources.ResXFileRef, System.Windows.Forms">
<data name="reloadFinance_" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\..\..\data\reloadFinance.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="plose_it" type="System.Resources.ResXFileRef, System.Windows.Forms">

2
SDL/kunden/frmKundenblatt.Designer.vb generated
View File

@@ -373,7 +373,7 @@ Partial Class frmKundenblatt
'
'btnReloadOP
'
Me.btnReloadOP.BackgroundImage = Global.SDL.My.Resources.Resources.reloadFinance
Me.btnReloadOP.BackgroundImage = Global.SDL.My.Resources.Resources.reloadFinance_
Me.btnReloadOP.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.btnReloadOP.Cursor = System.Windows.Forms.Cursors.Hand
Me.btnReloadOP.FlatAppearance.BorderSize = 0

2
SDL/kunden/usrCntlKundenuebersicht.Designer.vb generated
View File

@@ -3368,7 +3368,7 @@ Partial Class usrCntlKundenuebersicht
'
'btnReloadOP
'
Me.btnReloadOP.BackgroundImage = Global.SDL.My.Resources.Resources.reloadFinance
Me.btnReloadOP.BackgroundImage = Global.SDL.My.Resources.Resources.reloadFinance_
Me.btnReloadOP.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.btnReloadOP.Cursor = System.Windows.Forms.Cursors.Hand
Me.btnReloadOP.FlatAppearance.BorderSize = 0

20
SDL/mdm/frmMDMDatenverarbetiung.vb
View File

@@ -15,7 +15,7 @@ Public Class frmMDMDatenverarbetiung
' Dim ProduktCode_NOT_IN = "SELECT plp_ProductCode FROM [tblPLOSE_Produktbeschreibung] WHERE [plp_einarbeiten]=0 "
Dim ProduktCode_NOT_IN = "'9020'"
Dim datum As Date = Nothing
Dim test As Boolean = False
Dim test As Boolean = True
Private Sub frmPloseDatenverarbetiung_Load(sender As Object, e As EventArgs) Handles MyBase.Load
Me.Top = 0
@@ -3006,10 +3006,11 @@ Public Class frmMDMDatenverarbetiung
Dim NettoBetrag As Double = r("Netto")
Dim BruttoBetrag As Double = r("Brutto")
Dim UstBetrag As Double = BruttoBetrag = NettoBetrag
Dim LeistungsNr As Integer = r("LeistungsNr")
Dim OFFERTE As New VERAG_PROG_ALLGEMEIN.cOfferte(KdNr, OffertenNr, True)
allPos(RG, OFFERTE, LeistungsNr, NettoBetrag, BruttoBetrag)
allPos(RG, OFFERTE, LeistungsNr, NettoBetrag, BruttoBetrag, UstBetrag)
Next
@@ -3069,11 +3070,12 @@ Public Class frmMDMDatenverarbetiung
useNettogesamtbetrag = False
'alles steuerfrei also Brutto = Netto
sqlstr = "select customer_id, LeistungsNr, sum(Netto) as Netto, Sum (Brutto) as Brutto from (select cust.[customer_id], trans.device_product_type, Offertenpositionen.LeistungsNr ,
sqlstr = "select customer_id, LeistungsNr, sum(Netto) as Netto, Sum (Brutto) as Brutto, Sum (UST) as UST from (select cust.[customer_id], trans.device_product_type, Offertenpositionen.LeistungsNr ,
case when trans.device_product_type like '%System Fee' then sum(msts_fee_amount) + sum(transaction_gross_amount)
else sum(transaction_gross_amount) End as Netto,
case when trans.device_product_type like '%System Fee' then sum(msts_fee_amount) + sum(transaction_gross_amount)
else sum(transaction_gross_amount) End as Brutto
else sum(transaction_gross_amount) End as Brutto,
sum(USteuer_EUR) as UST
FROM [VERAG].[dbo].[tblMSESettlements] as bills
left join [VERAG].[dbo].[tblMSETransactions] as trans on bills.[transaction_id] = trans.[transaction_id]
left join [VERAG].[dbo].[tblMSECustomers] as cust on cust.partner_customer_number = trans.partner_haulier_id
@@ -3089,10 +3091,11 @@ Public Class frmMDMDatenverarbetiung
Dim NettoBetrag As Double = r("Netto")
Dim BruttoBetrag As Double = r("Brutto")
Dim UstBetrag As Double = r("UST")
Dim LeistungsNr As Integer = r("LeistungsNr")
Dim OFFERTE As New VERAG_PROG_ALLGEMEIN.cOfferte(KdNr, OffertenNr, True)
allPos(RG, OFFERTE, LeistungsNr, NettoBetrag, BruttoBetrag)
allPos(RG, OFFERTE, LeistungsNr, NettoBetrag, BruttoBetrag, UstBetrag)
Next
@@ -3123,7 +3126,7 @@ Public Class frmMDMDatenverarbetiung
End Function
Function allPos(ByRef RG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, OFFERTE As VERAG_PROG_ALLGEMEIN.cOfferte, LeistungsNr As Integer, NettoBetrag As Double, BruttoBetrag As Double)
Function allPos(ByRef RG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, OFFERTE As VERAG_PROG_ALLGEMEIN.cOfferte, LeistungsNr As Integer, NettoBetrag As Double, BruttoBetrag As Double, Optional UstBetrag As Double = 0)
Try
For Each o In OFFERTE.POSITIONEN
@@ -3143,7 +3146,8 @@ Public Class frmMDMDatenverarbetiung
'POS.Preis = BruttoBetrag
POS.Anzahl = 1
POS.Steuerpflichtig = LEISTUNG.Steuerpflichtig
POS.BGebBgl = IIf(LIEFERANT = "UTA", BruttoBetrag, NettoBetrag)
'Berrechnunggebühr wird immer vom übergebenen Betrag abzüglich UST berechnet (Nettobetrag)!
POS.BGebBgl = IIf(LIEFERANT = "UTA", BruttoBetrag - UstBetrag, NettoBetrag - UstBetrag)
If POS.Steuerpflichtig Then
@@ -3160,6 +3164,7 @@ Public Class frmMDMDatenverarbetiung
RG.POSITIONEN.Add(POS)
If (If(POS.BGebLeistungsNr, 0) > 0) AndAlso (If(POS.BGebProzent, 0) > 0) AndAlso (If(POS.BGebBgl, 0) > 0) Then
allPlosePosBGeb(RG, OFFERTE, POS.BGebLeistungsNr, POS.BGebBgl, POS.BGebProzent)
End If
@@ -3207,6 +3212,7 @@ Public Class frmMDMDatenverarbetiung
Function allPlosePosBGeb(ByRef RG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, OFFERTE As VERAG_PROG_ALLGEMEIN.cOfferte, BGebLeistungsNr As Integer, BGebBgl As Double, BGebProzent As Double)
Try
Dim Betrag As Double = Math.Round(BGebBgl * BGebProzent, 1)
For Each o In OFFERTE.POSITIONEN
If o.LeistungsNr = BGebLeistungsNr Then