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

Kostenkalk für UNISPED

Browse Source
This commit is contained in:
d.breimaier
2026-05-05 16:25:51 +02:00
parent 73df7bcea6
commit b03297c119
6 changed files with 75 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

3
SDL/My Project/Resources.resx
View File

@@ -982,4 +982,7 @@
<data name="KVI_report_general" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\KVI_report_general.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="Kostenkalkulation_UNI" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Kostenkalkulation_UNI.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>

BIN
SDL/Resources/Kostenkalkulation_UNI.xlsx Normal file
View File

Binary file not shown.

1
SDL/SDL.vbproj
View File

@@ -5035,6 +5035,7 @@
<None Include="Resources\Kostenkalkulation_CS.xlsx" />
<None Include="Resources\Kostenkalkulation_AG.xlsx" />
<None Include="Resources\Kostenkalkulation_IMEX.xlsx" />
<None Include="Resources\Kostenkalkulation_UNI.xlsx" />
<None Include="Resources\KVI_report.xlsx" />
<None Include="Resources\KVI_report_general.xlsx" />
<None Include="Resources\LKW_Liste.xlsx" />

74
SDL/kunden/usrCntlOfferte.Designer.vb generated
View File

@@ -22,9 +22,8 @@ Partial Class usrCntlOfferte
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()>
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Me.lblBesonderheiten = New System.Windows.Forms.Label()
Me.rtbBesonderheiten = New System.Windows.Forms.RichTextBox()
Me.lblOffert = New System.Windows.Forms.TextBox()
@@ -37,7 +36,7 @@ Partial Class usrCntlOfferte
Me.Label67 = New System.Windows.Forms.Label()
Me.btnDeleteLeistung = New System.Windows.Forms.Button()
Me.btnAddLeistung = New System.Windows.Forms.Button()
Me.cntxtAddSdl = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.cntxtAddSdl = New System.Windows.Forms.ContextMenuStrip()
Me.DToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.btnOfferteSpeichern = New System.Windows.Forms.Button()
Me.btnHinzufuegen = New System.Windows.Forms.Button()
@@ -49,6 +48,7 @@ Partial Class usrCntlOfferte
Me.Label2 = New System.Windows.Forms.Label()
Me.lblLeistunAddErr2 = New System.Windows.Forms.Label()
Me.pnlEdit = New System.Windows.Forms.Panel()
Me.btnOffertPreisliste = New System.Windows.Forms.Button()
Me.Button1 = New System.Windows.Forms.Button()
Me.cbxAutoFakturierung = New System.Windows.Forms.CheckBox()
Me.Label3 = New System.Windows.Forms.Label()
@@ -63,18 +63,17 @@ Partial Class usrCntlOfferte
Me.lblArchivierteOfferten = New System.Windows.Forms.Label()
Me.lblEditMode = New System.Windows.Forms.Label()
Me.btnOffertbearbeiten = New System.Windows.Forms.Button()
Me.dgvOfferteNew = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.dgvOfferteNew = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
Me.Button2 = New System.Windows.Forms.Button()
Me.Panel1 = New System.Windows.Forms.Panel()
Me.pnlKostenkalkulation = New System.Windows.Forms.Panel()
Me.btnSaveBes = New System.Windows.Forms.Button()
Me.btnOffertPreisliste = New System.Windows.Forms.Button()
CType(Me.dgvOfferteDetails, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.dgvOfferte, System.ComponentModel.ISupportInitialize).BeginInit()
Me.cntxtAddSdl.SuspendLayout()
Me.pnlSperre.SuspendLayout()
Me.pnlEdit.SuspendLayout()
CType(Me.dgvOfferteNew, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel1.SuspendLayout()
Me.pnlKostenkalkulation.SuspendLayout()
Me.SuspendLayout()
'
'lblBesonderheiten
@@ -126,8 +125,8 @@ Partial Class usrCntlOfferte
Me.dgvOfferteDetails.AllowUserToDeleteRows = False
Me.dgvOfferteDetails.AllowUserToOrderColumns = True
Me.dgvOfferteDetails.AllowUserToResizeRows = False
DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
Me.dgvOfferteDetails.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
Me.dgvOfferteDetails.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
Me.dgvOfferteDetails.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -146,8 +145,8 @@ Partial Class usrCntlOfferte
Me.dgvOfferte.AllowUserToAddRows = False
Me.dgvOfferte.AllowUserToDeleteRows = False
Me.dgvOfferte.AllowUserToResizeRows = False
DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
Me.dgvOfferte.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
Me.dgvOfferte.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
Me.dgvOfferte.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.dgvOfferte.BackgroundColor = System.Drawing.Color.White
@@ -408,6 +407,21 @@ Partial Class usrCntlOfferte
Me.pnlEdit.Size = New System.Drawing.Size(797, 60)
Me.pnlEdit.TabIndex = 20
'
'btnOffertPreisliste
'
Me.btnOffertPreisliste.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.btnOffertPreisliste.BackgroundImage = Global.SDL.My.Resources.Resources.pdf
Me.btnOffertPreisliste.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.btnOffertPreisliste.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnOffertPreisliste.ForeColor = System.Drawing.Color.Black
Me.btnOffertPreisliste.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnOffertPreisliste.Location = New System.Drawing.Point(569, 0)
Me.btnOffertPreisliste.Name = "btnOffertPreisliste"
Me.btnOffertPreisliste.Size = New System.Drawing.Size(51, 36)
Me.btnOffertPreisliste.TabIndex = 34
Me.btnOffertPreisliste.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnOffertPreisliste.UseVisualStyleBackColor = True
'
'Button1
'
Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -641,14 +655,15 @@ Partial Class usrCntlOfferte
Me.Button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.Button2.UseVisualStyleBackColor = True
'
'Panel1
'pnlKostenkalkulation
'
Me.Panel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.Panel1.Controls.Add(Me.Button2)
Me.Panel1.Location = New System.Drawing.Point(3, 385)
Me.Panel1.Name = "Panel1"
Me.Panel1.Size = New System.Drawing.Size(139, 51)
Me.Panel1.TabIndex = 34
Me.pnlKostenkalkulation.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.pnlKostenkalkulation.Controls.Add(Me.Button2)
Me.pnlKostenkalkulation.Location = New System.Drawing.Point(3, 385)
Me.pnlKostenkalkulation.Name = "pnlKostenkalkulation"
Me.pnlKostenkalkulation.Size = New System.Drawing.Size(139, 51)
Me.pnlKostenkalkulation.TabIndex = 34
Me.pnlKostenkalkulation.Visible = False
'
'btnSaveBes
'
@@ -663,21 +678,6 @@ Partial Class usrCntlOfferte
Me.btnSaveBes.Tag = ""
Me.btnSaveBes.UseVisualStyleBackColor = True
'
'btnOffertPreisliste
'
Me.btnOffertPreisliste.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.btnOffertPreisliste.BackgroundImage = Global.SDL.My.Resources.Resources.pdf
Me.btnOffertPreisliste.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.btnOffertPreisliste.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnOffertPreisliste.ForeColor = System.Drawing.Color.Black
Me.btnOffertPreisliste.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnOffertPreisliste.Location = New System.Drawing.Point(569, 0)
Me.btnOffertPreisliste.Name = "btnOffertPreisliste"
Me.btnOffertPreisliste.Size = New System.Drawing.Size(51, 36)
Me.btnOffertPreisliste.TabIndex = 34
Me.btnOffertPreisliste.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnOffertPreisliste.UseVisualStyleBackColor = True
'
'usrCntlOfferte
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -705,7 +705,7 @@ Partial Class usrCntlOfferte
Me.Controls.Add(Me.dgvOfferteDetails)
Me.Controls.Add(Me.dgvOfferte)
Me.Controls.Add(Me.pnlEdit)
Me.Controls.Add(Me.Panel1)
Me.Controls.Add(Me.pnlKostenkalkulation)
Me.Margin = New System.Windows.Forms.Padding(2)
Me.Name = "usrCntlOfferte"
Me.Size = New System.Drawing.Size(1041, 576)
@@ -717,7 +717,7 @@ Partial Class usrCntlOfferte
Me.pnlEdit.ResumeLayout(False)
Me.pnlEdit.PerformLayout()
CType(Me.dgvOfferteNew, System.ComponentModel.ISupportInitialize).EndInit()
Me.Panel1.ResumeLayout(False)
Me.pnlKostenkalkulation.ResumeLayout(False)
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -763,7 +763,7 @@ Partial Class usrCntlOfferte
Friend WithEvents dgvOfferteNew As VERAG_PROG_ALLGEMEIN.MyDatagridview
Friend WithEvents Button1 As Button
Friend WithEvents Button2 As Button
Friend WithEvents Panel1 As Panel
Friend WithEvents pnlKostenkalkulation As Panel
Friend WithEvents btnSaveBes As Button
Friend WithEvents btnOffertPreisliste As Button
End Class

40
SDL/kunden/usrCntlOfferte.vb
View File

@@ -1,9 +1,4 @@

Imports VERAG_PROG_ALLGEMEIN
Imports VERAG_PROG_ALLGEMEIN.TESTJSON
Public Class usrCntlOfferte
Public Class usrCntlOfferte
Dim FUNC As New cProgramFunctions
Public kdNr As Integer = -1
@@ -769,6 +764,12 @@ Public Class usrCntlOfferte
End If
If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("KOSTENKALKULATION_OFFERTE", "SDL") Then
pnlKostenkalkulation.Visible = False
Else
pnlKostenkalkulation.Visible = True
End If
If dgvOfferteNew.SelectedRows.Count = 0 Then
btnOffertbearbeiten.Visible = False
@@ -912,11 +913,13 @@ Public Class usrCntlOfferte
Dim ExcelBez = "Kostenkalkulation"
Dim offertenNr As Integer = dtKostenkalk.Rows(0).Item("OffertenNr")
If offertenNr = 26 Or offertenNr = 38 Then FIRMA_TMP = "CS"
If (offertenNr = 26 Or offertenNr = 38) AndAlso FIRMA_TMP <> "UNISPED" Then FIRMA_TMP = "CS"
Select Case FIRMA_TMP
Case "IMEX" : ExcelBez &= "_IMEX "
Case "VERAG" : ExcelBez &= "_AG "
Case "UNISPED" : ExcelBez &= "_UNI "
Case "CS" : ExcelBez &= "_CS "
Case Else : ExcelBez &= " "
End Select
@@ -934,6 +937,8 @@ Public Class usrCntlOfferte
Select Case FIRMA_TMP
Case "IMEX" : My.Computer.FileSystem.WriteAllBytes(Path, My.Resources.Kostenkalkulation_IMEX, False)
Case "VERAG" : My.Computer.FileSystem.WriteAllBytes(Path, My.Resources.Kostenkalkulation_AG, False)
Case "UNISPED" : My.Computer.FileSystem.WriteAllBytes(Path, My.Resources.Kostenkalkulation_UNI, False)
Case "CS" : My.Computer.FileSystem.WriteAllBytes(Path, My.Resources.Kostenkalkulation_CS, False)
Case Else : My.Computer.FileSystem.WriteAllBytes(Path, My.Resources.Kostenkalkulation, False)
End Select
@@ -956,6 +961,8 @@ Public Class usrCntlOfferte
Blatt.Range("H11").Value = "Tarif für " & Today().Year
Blatt.Range("D11").Value = Blatt.Range("D11").Value.ToString.Replace("2025", Today().Year)
Dim currentRow As Integer = 13
Dim dtkeineMdtKostenkalk_mitPreise As DataTable = dtKostenkalk.Select("Preis <> ''").CopyToDataTable
@@ -984,14 +991,15 @@ Public Class usrCntlOfferte
Select Case CDate(DatumDerZollabf).Year
'Berechnungssätze laut Johanna Luxbauer
Case 2018 : Blatt.Range("D" & currentRow).Value = 0.3387
Case 2019 : Blatt.Range("D" & currentRow).Value = 0.3048
Case 2020 : Blatt.Range("D" & currentRow).Value = 0.2792
Case 2021 : Blatt.Range("D" & currentRow).Value = 0.2597
Case 2022 : Blatt.Range("D" & currentRow).Value = 0.2207
Case 2023 : Blatt.Range("D" & currentRow).Value = 0.0997
Case 2024 : Blatt.Range("D" & currentRow).Value = 0.0394
Case 2025 : Blatt.Range("D" & currentRow).Value = 0
Case 2018 : Blatt.Range("D" & currentRow).Value = 0.3782
Case 2019 : Blatt.Range("D" & currentRow).Value = 0.3433
Case 2020 : Blatt.Range("D" & currentRow).Value = 0.317
Case 2021 : Blatt.Range("D" & currentRow).Value = 0.2969
Case 2022 : Blatt.Range("D" & currentRow).Value = 0.2567
Case 2023 : Blatt.Range("D" & currentRow).Value = 0.1321
Case 2024 : Blatt.Range("D" & currentRow).Value = 0.701
Case 2025 : Blatt.Range("D" & currentRow).Value = 0.295
Case 2026 : Blatt.Range("D" & currentRow).Value = 0
Case Else
Blatt.Range("D" & currentRow).Value = ""
End Select
@@ -1026,7 +1034,7 @@ Public Class usrCntlOfferte
End Function
Private Sub rtbBesonderheiten_TextChanged(sender As Object, e As EventArgs) Handles rtbBesonderheiten.TextChanged
btnSaveBes.Visible = true
btnSaveBes.Visible = True
End Sub
Private Sub btnSaveBes_Click(sender As Object, e As EventArgs) Handles btnSaveBes.Click