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

SDL

Browse Source
This commit is contained in:
d.breimaier
2024-09-17 10:14:10 +02:00
parent 0bbf26e855
commit ce0865f629
12 changed files with 217 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SDL/Fakturierung/frmFaktEmail.vb
View File

@@ -629,7 +629,7 @@ Public Class frmFaktEmail
Try Try
Dim additionalLine = "" Dim additionalLine = ""
If RECHNUNG.FakturierungsGruppe IsNot Nothing AndAlso RECHNUNG.FakturierungsGruppe <> "" Then If RECHNUNG IsNot Nothing AndAlso RECHNUNG.FakturierungsGruppe IsNot Nothing AndAlso RECHNUNG.FakturierungsGruppe <> "" Then
additionalLine = "Abrechnungsstelle: " & RECHNUNG.FakturierungsGruppe.Replace("WAI", "Waidhaus") additionalLine = "Abrechnungsstelle: " & RECHNUNG.FakturierungsGruppe.Replace("WAI", "Waidhaus")
End If End If

2
SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_EU.Designer.vb generated
View File

@@ -786,7 +786,7 @@ Partial Class usrcntlVollmacht_MDM_EU
Me.txtKapital._TimeOnly_Seconds = False Me.txtKapital._TimeOnly_Seconds = False
Me.txtKapital._value = Nothing Me.txtKapital._value = Nothing
Me.txtKapital._Waehrung = True Me.txtKapital._Waehrung = True
Me.txtKapital._WaehrungZeichen = True Me.txtKapital._WaehrungZeichen = False
Me.txtKapital.ForeColor = System.Drawing.Color.Black Me.txtKapital.ForeColor = System.Drawing.Color.Black
Me.txtKapital.Location = New System.Drawing.Point(402, 202) Me.txtKapital.Location = New System.Drawing.Point(402, 202)
Me.txtKapital.MaxLineLength = -1 Me.txtKapital.MaxLineLength = -1

9
SDL/Formulare/KDFormulare/frmFormulare.vb
View File

@@ -1850,6 +1850,15 @@ Public Class FormularManagerNEU
Case "place" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse3.Text Case "place" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse3.Text
Case "street" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse1.Text Case "street" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse1.Text
Case "surname_firstname" : odoc.FormFields(fieldName).Range.Text = IIf(usrCntl.txt_GF_Name.Text <> "", usrCntl.txt_GF_Name.Text, usrCntl.txtHerrFrau.Text) Case "surname_firstname" : odoc.FormFields(fieldName).Range.Text = IIf(usrCntl.txt_GF_Name.Text <> "", usrCntl.txt_GF_Name.Text, usrCntl.txtHerrFrau.Text)
Case "ceo_place" : odoc.FormFields(fieldName).Range.Text = usrCntl.txt_GF_Ort.Text
Case "ceo_country" : odoc.FormFields(fieldName).Range.Text = usrCntl.cbx_GF_Land._value
Case "ceo_zipcode" : odoc.FormFields(fieldName).Range.Text = usrCntl.txt_GF_PLZ.Text
Case "ceo_birthdate" : odoc.FormFields(fieldName).Range.Text = usrCntl.txt_GF_Geb.Text
Case "ceo_street" : odoc.FormFields(fieldName).Range.Text = usrCntl.txt_GF_Adresse.Text
Case "ceo_address" : odoc.FormFields(fieldName).Range.Text = usrCntl.txt_GF_Adresse.Text & " " & usrCntl.cbx_GF_Land._value & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text
Case "vatno" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtUid.Text Case "vatno" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtUid.Text
Case "mailcontact" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtEmail.Text ' TODO: neues Feld im formular Case "mailcontact" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtEmail.Text ' TODO: neues Feld im formular
Case "phone" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtEmail.Text ' TODO: neues Feld im formular Case "phone" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtEmail.Text ' TODO: neues Feld im formular

4
SDL/My Project/AssemblyInfo.vb
View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.3.1.0")> <Assembly: AssemblyVersion("1.3.1.1")>
<Assembly: AssemblyFileVersion("1.3.1.0")> <Assembly: AssemblyFileVersion("1.3.1.1")>

2
SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb
View File

@@ -362,7 +362,7 @@ Public Class frmNacherfassungNEU
sqlStr &= " ( SELECT SUM(isnull([SteuerpflichtigerBetrag],0)+isnull([SteuerfreierBetrag],0)) FROM [RechnungsausgangPositionen] where [RechnungsausgangPositionen].RK_ID=[Rechnungsausgang].RK_ID ) as Rechnungsbetrag," sqlStr &= " ( SELECT SUM(isnull([SteuerpflichtigerBetrag],0)+isnull([SteuerfreierBetrag],0)) FROM [RechnungsausgangPositionen] where [RechnungsausgangPositionen].RK_ID=[Rechnungsausgang].RK_ID ) as Rechnungsbetrag,"
sqlStr &= " Sammelrechnung, isnull(cast(RechnungsKundenNr as nvarchar(7)) + ' ','') + [RechnungsName 1] as [RechnungAn] " sqlStr &= " Sammelrechnung, isnull(cast(RechnungsKundenNr as nvarchar(7)) + ' ','') + [RechnungsName 1] as [RechnungAn] "
' sqlStr &= "Sachbearbeiter " ' sqlStr &= "Sachbearbeiter "
sqlStr &= " FROM [Rechnungsausgang] WHERE FilialenNr='" & SPEDITIONSBUCH.FilialenNr & "' and AbfertigungsNr='" & SPEDITIONSBUCH.AbfertigungsNr & "' AND [SpeditionsbuchUnterNr]='" & SPEDITIONSBUCH.UnterNr & "' " sqlStr &= " FROM [Rechnungsausgang] WHERE FilialenNr='" & SPEDITIONSBUCH.FilialenNr & "' and AbfertigungsNr='" & SPEDITIONSBUCH.AbfertigungsNr & "' AND [SpeditionsbuchUnterNr]='" & SPEDITIONSBUCH.UnterNr & "' AND [RechnungsNr] is not null"
sqlStr &= " order by RechnungsDatum" sqlStr &= " order by RechnungsDatum"
.DataSource = SQL.loadDgvBySql(sqlStr, "FMZOLL") .DataSource = SQL.loadDgvBySql(sqlStr, "FMZOLL")

30
SDL/buchhaltung/frmBU_Mahnlauf.vb
View File

@@ -295,7 +295,17 @@ Public Class frmBU_Mahnlauf
Dim rpt As New rptMahnung(Sprache, MAHNSTUFE, Firma_ID) Dim rpt As New rptMahnung(Sprache, MAHNSTUFE, Firma_ID)
rpt.Document.Printer.PrinterName = "" rpt.Document.Printer.PrinterName = ""
Dim RG_Bezeichnung = "Mahnung.pdf"
Dim RG_Bezeichnung As String = ""
Select Case art
Case "ZE" : RG_Bezeichnung = "Mahnung.pdf"
Case "OP" : RG_Bezeichnung = "OP-Liste.pdf"
Case Else
RG_Bezeichnung = "Mahnung.pdf"
End Select
Dim KD_RG As New VERAG_PROG_ALLGEMEIN.cAdressen(AD.AdressenNr) Dim KD_RG As New VERAG_PROG_ALLGEMEIN.cAdressen(AD.AdressenNr)
@@ -425,7 +435,14 @@ Public Class frmBU_Mahnlauf
rpt.lblUeberschriftRG_GS.Text = MAHNTEXT rpt.lblUeberschriftRG_GS.Text = MAHNTEXT
rpt.txtMahnungstextVOR.Text = MahnTEXT_VOR rpt.txtMahnungstextVOR.Text = MahnTEXT_VOR
rpt.txtVermerk.Text = MahnTEXT_NACH rpt.txtVermerk.Text = MahnTEXT_NACH
End If Else
'über Übersetzung geregelt, alle anderen über getMahnstufe (sollte in Zukunft noch abgeändert werden!)
getMahnstufetext("DE", MAHNSTUFE, MahnTEXT_VOR, MahnTEXT_NACH, MAHNTEXT)
rpt.lblUeberschriftRG_GS.Text = MAHNTEXT
rpt.txtMahnungstextVOR.Text = MahnTEXT_VOR
rpt.txtVermerk.Text = MahnTEXT_NACH
End If
@@ -655,13 +672,6 @@ Public Class frmBU_Mahnlauf
Dim pdfBezeichnung As String = "" Dim pdfBezeichnung As String = ""
Select Case art
Case "ZE" : pdfBezeichnung = "Mahnung.pdf"
Case "OP" : pdfBezeichnung = "OP-Liste.pdf"
Case Else
pdfBezeichnung = "Mahnung.pdf"
End Select
Select Case Mahndruckart Select Case Mahndruckart
Case 5 'MAIL_SEND Case 5 'MAIL_SEND
Dim list As New List(Of String) Dim list As New List(Of String)
@@ -1044,7 +1054,7 @@ Public Class frmBU_Mahnlauf
Select Case getAusgabe(MainForm, False) Select Case getAusgabe(MainForm, False)
Case "PDF" Case "PDF"
If KontoList.Count = 1 Then If KontoList.Count = 1 Then
doMahnung(3, KontoList(0), Firma, art, srchPrinter, forceMahnstufe,, hideMahnstopp) doMahnung(3, KontoList(0), Firma, art,, srchPrinter, forceMahnstufe,, hideMahnstopp)
Else Else
Dim PDF_LIST As New List(Of String) Dim PDF_LIST As New List(Of String)
fProgBar.Show(MainForm) fProgBar.Show(MainForm)

147
SDL/buchhaltung/usrCntlBH.Designer.vb generated
View File

@@ -25,6 +25,10 @@ Partial Class usrCntlBH
Me.Label6 = New System.Windows.Forms.Label() Me.Label6 = New System.Windows.Forms.Label()
Me.pnl = New System.Windows.Forms.Panel() Me.pnl = New System.Windows.Forms.Panel()
Me.TabPage1 = New System.Windows.Forms.TabPage() Me.TabPage1 = New System.Windows.Forms.TabPage()
Me.Label42 = New System.Windows.Forms.Label()
Me.GroupBox10 = New System.Windows.Forms.GroupBox()
Me.Label43 = New System.Windows.Forms.Label()
Me.Button12 = New System.Windows.Forms.Button()
Me.Label37 = New System.Windows.Forms.Label() Me.Label37 = New System.Windows.Forms.Label()
Me.GroupBox9 = New System.Windows.Forms.GroupBox() Me.GroupBox9 = New System.Windows.Forms.GroupBox()
Me.Label41 = New System.Windows.Forms.Label() Me.Label41 = New System.Windows.Forms.Label()
@@ -122,12 +126,9 @@ Partial Class usrCntlBH
Me.Label30 = New System.Windows.Forms.Label() Me.Label30 = New System.Windows.Forms.Label()
Me.Label29 = New System.Windows.Forms.Label() Me.Label29 = New System.Windows.Forms.Label()
Me.Button7 = New System.Windows.Forms.Button() Me.Button7 = New System.Windows.Forms.Button()
Me.Label42 = New System.Windows.Forms.Label()
Me.GroupBox10 = New System.Windows.Forms.GroupBox()
Me.Label43 = New System.Windows.Forms.Label()
Me.Button12 = New System.Windows.Forms.Button()
Me.pnl.SuspendLayout() Me.pnl.SuspendLayout()
Me.TabPage1.SuspendLayout() Me.TabPage1.SuspendLayout()
Me.GroupBox10.SuspendLayout()
Me.GroupBox9.SuspendLayout() Me.GroupBox9.SuspendLayout()
Me.GroupBox8.SuspendLayout() Me.GroupBox8.SuspendLayout()
Me.GroupBox7.SuspendLayout() Me.GroupBox7.SuspendLayout()
@@ -142,7 +143,6 @@ Partial Class usrCntlBH
Me.tbcntr.SuspendLayout() Me.tbcntr.SuspendLayout()
Me.TabPage5.SuspendLayout() Me.TabPage5.SuspendLayout()
Me.GroupBox6.SuspendLayout() Me.GroupBox6.SuspendLayout()
Me.GroupBox10.SuspendLayout()
Me.SuspendLayout() Me.SuspendLayout()
' '
'Label6 'Label6
@@ -167,6 +167,7 @@ Partial Class usrCntlBH
' '
'TabPage1 'TabPage1
' '
Me.TabPage1.AutoScroll = True
Me.TabPage1.Controls.Add(Me.Label42) Me.TabPage1.Controls.Add(Me.Label42)
Me.TabPage1.Controls.Add(Me.GroupBox10) Me.TabPage1.Controls.Add(Me.GroupBox10)
Me.TabPage1.Controls.Add(Me.Label37) Me.TabPage1.Controls.Add(Me.Label37)
@@ -180,7 +181,6 @@ Partial Class usrCntlBH
Me.TabPage1.Controls.Add(Me.Label27) Me.TabPage1.Controls.Add(Me.Label27)
Me.TabPage1.Controls.Add(Me.GroupBox5) Me.TabPage1.Controls.Add(Me.GroupBox5)
Me.TabPage1.Controls.Add(Me.GroupBox1) Me.TabPage1.Controls.Add(Me.GroupBox1)
Me.TabPage1.Controls.Add(Me.Label24)
Me.TabPage1.Controls.Add(Me.GroupBox2) Me.TabPage1.Controls.Add(Me.GroupBox2)
Me.TabPage1.Controls.Add(Me.GroupBox4) Me.TabPage1.Controls.Add(Me.GroupBox4)
Me.TabPage1.Controls.Add(Me.Label7) Me.TabPage1.Controls.Add(Me.Label7)
@@ -188,21 +188,65 @@ Partial Class usrCntlBH
Me.TabPage1.Location = New System.Drawing.Point(4, 22) Me.TabPage1.Location = New System.Drawing.Point(4, 22)
Me.TabPage1.Name = "TabPage1" Me.TabPage1.Name = "TabPage1"
Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
Me.TabPage1.Size = New System.Drawing.Size(956, 1062) Me.TabPage1.Size = New System.Drawing.Size(956, 968)
Me.TabPage1.TabIndex = 0 Me.TabPage1.TabIndex = 0
Me.TabPage1.Text = "Allgemein" Me.TabPage1.Text = "Allgemein"
Me.TabPage1.UseVisualStyleBackColor = True Me.TabPage1.UseVisualStyleBackColor = True
' '
'Label42
'
Me.Label42.AutoSize = True
Me.Label42.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label42.ForeColor = System.Drawing.SystemColors.ControlDarkDark
Me.Label42.Location = New System.Drawing.Point(7, 703)
Me.Label42.Name = "Label42"
Me.Label42.Size = New System.Drawing.Size(168, 17)
Me.Label42.TabIndex = 19
Me.Label42.Text = "Sachkontenzuweisung"
'
'GroupBox10
'
Me.GroupBox10.Controls.Add(Me.Label43)
Me.GroupBox10.Controls.Add(Me.Button12)
Me.GroupBox10.Location = New System.Drawing.Point(6, 715)
Me.GroupBox10.Name = "GroupBox10"
Me.GroupBox10.Size = New System.Drawing.Size(847, 61)
Me.GroupBox10.TabIndex = 18
Me.GroupBox10.TabStop = False
'
'Label43
'
Me.Label43.AutoSize = True
Me.Label43.Location = New System.Drawing.Point(141, 28)
Me.Label43.Name = "Label43"
Me.Label43.Size = New System.Drawing.Size(165, 13)
Me.Label43.TabIndex = 2
Me.Label43.Text = "Sachkontenzuweisung für Syska."
'
'Button12
'
Me.Button12.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center
Me.Button12.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button12.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
Me.Button12.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button12.Location = New System.Drawing.Point(4, 11)
Me.Button12.Name = "Button12"
Me.Button12.Size = New System.Drawing.Size(121, 44)
Me.Button12.TabIndex = 7
Me.Button12.Text = "Sachkonten"
Me.Button12.UseVisualStyleBackColor = True
'
'Label37 'Label37
' '
Me.Label37.AutoSize = True Me.Label37.AutoSize = True
Me.Label37.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label37.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label37.ForeColor = System.Drawing.SystemColors.ControlDarkDark Me.Label37.ForeColor = System.Drawing.SystemColors.ControlDarkDark
Me.Label37.Location = New System.Drawing.Point(13, 602) Me.Label37.Location = New System.Drawing.Point(3, 871)
Me.Label37.Name = "Label37" Me.Label37.Name = "Label37"
Me.Label37.Size = New System.Drawing.Size(136, 17) Me.Label37.Size = New System.Drawing.Size(136, 17)
Me.Label37.TabIndex = 16 Me.Label37.TabIndex = 16
Me.Label37.Text = "Kontoabstimmung" Me.Label37.Text = "Kontoabstimmung"
Me.Label37.Visible = False
' '
'GroupBox9 'GroupBox9
' '
@@ -214,11 +258,12 @@ Partial Class usrCntlBH
Me.GroupBox9.Controls.Add(Me.Label39) Me.GroupBox9.Controls.Add(Me.Label39)
Me.GroupBox9.Controls.Add(Me.Label38) Me.GroupBox9.Controls.Add(Me.Label38)
Me.GroupBox9.Controls.Add(Me.Button9) Me.GroupBox9.Controls.Add(Me.Button9)
Me.GroupBox9.Location = New System.Drawing.Point(14, 622) Me.GroupBox9.Location = New System.Drawing.Point(4, 891)
Me.GroupBox9.Name = "GroupBox9" Me.GroupBox9.Name = "GroupBox9"
Me.GroupBox9.Size = New System.Drawing.Size(847, 67) Me.GroupBox9.Size = New System.Drawing.Size(847, 67)
Me.GroupBox9.TabIndex = 17 Me.GroupBox9.TabIndex = 17
Me.GroupBox9.TabStop = False Me.GroupBox9.TabStop = False
Me.GroupBox9.Visible = False
' '
'Label41 'Label41
' '
@@ -332,7 +377,7 @@ Partial Class usrCntlBH
' '
Me.Label34.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label34.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label34.ForeColor = System.Drawing.SystemColors.ControlDarkDark Me.Label34.ForeColor = System.Drawing.SystemColors.ControlDarkDark
Me.Label34.Location = New System.Drawing.Point(11, 869) Me.Label34.Location = New System.Drawing.Point(7, 628)
Me.Label34.Name = "Label34" Me.Label34.Name = "Label34"
Me.Label34.Size = New System.Drawing.Size(298, 18) Me.Label34.Size = New System.Drawing.Size(298, 18)
Me.Label34.TabIndex = 14 Me.Label34.TabIndex = 14
@@ -344,7 +389,7 @@ Partial Class usrCntlBH
Me.GroupBox8.Controls.Add(Me.cboAbfVerbFirma) Me.GroupBox8.Controls.Add(Me.cboAbfVerbFirma)
Me.GroupBox8.Controls.Add(Me.Button8) Me.GroupBox8.Controls.Add(Me.Button8)
Me.GroupBox8.Controls.Add(Me.Label35) Me.GroupBox8.Controls.Add(Me.Label35)
Me.GroupBox8.Location = New System.Drawing.Point(10, 881) Me.GroupBox8.Location = New System.Drawing.Point(6, 640)
Me.GroupBox8.Name = "GroupBox8" Me.GroupBox8.Name = "GroupBox8"
Me.GroupBox8.Size = New System.Drawing.Size(847, 69) Me.GroupBox8.Size = New System.Drawing.Size(847, 69)
Me.GroupBox8.TabIndex = 15 Me.GroupBox8.TabIndex = 15
@@ -396,7 +441,7 @@ Partial Class usrCntlBH
' '
Me.Label32.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label32.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label32.ForeColor = System.Drawing.SystemColors.ControlDarkDark Me.Label32.ForeColor = System.Drawing.SystemColors.ControlDarkDark
Me.Label32.Location = New System.Drawing.Point(13, 221) Me.Label32.Location = New System.Drawing.Point(7, 104)
Me.Label32.Name = "Label32" Me.Label32.Name = "Label32"
Me.Label32.Size = New System.Drawing.Size(298, 18) Me.Label32.Size = New System.Drawing.Size(298, 18)
Me.Label32.TabIndex = 12 Me.Label32.TabIndex = 12
@@ -406,7 +451,7 @@ Partial Class usrCntlBH
' '
Me.GroupBox7.Controls.Add(Me.Label33) Me.GroupBox7.Controls.Add(Me.Label33)
Me.GroupBox7.Controls.Add(Me.Button6) Me.GroupBox7.Controls.Add(Me.Button6)
Me.GroupBox7.Location = New System.Drawing.Point(12, 233) Me.GroupBox7.Location = New System.Drawing.Point(6, 116)
Me.GroupBox7.Name = "GroupBox7" Me.GroupBox7.Name = "GroupBox7"
Me.GroupBox7.Size = New System.Drawing.Size(847, 69) Me.GroupBox7.Size = New System.Drawing.Size(847, 69)
Me.GroupBox7.TabIndex = 13 Me.GroupBox7.TabIndex = 13
@@ -436,18 +481,19 @@ Partial Class usrCntlBH
Me.Label3.AutoSize = True Me.Label3.AutoSize = True
Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label3.ForeColor = System.Drawing.SystemColors.ControlDarkDark Me.Label3.ForeColor = System.Drawing.SystemColors.ControlDarkDark
Me.Label3.Location = New System.Drawing.Point(11, 21) Me.Label3.Location = New System.Drawing.Point(6, 781)
Me.Label3.Name = "Label3" Me.Label3.Name = "Label3"
Me.Label3.Size = New System.Drawing.Size(216, 17) Me.Label3.Size = New System.Drawing.Size(216, 17)
Me.Label3.TabIndex = 1 Me.Label3.TabIndex = 1
Me.Label3.Text = "Soll/Haben - Abgleich - MDM" Me.Label3.Text = "Soll/Haben - Abgleich - MDM"
Me.Label3.Visible = False
' '
'Label4 'Label4
' '
Me.Label4.AutoSize = True Me.Label4.AutoSize = True
Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label4.ForeColor = System.Drawing.SystemColors.ControlDarkDark Me.Label4.ForeColor = System.Drawing.SystemColors.ControlDarkDark
Me.Label4.Location = New System.Drawing.Point(13, 121) Me.Label4.Location = New System.Drawing.Point(7, 4)
Me.Label4.Name = "Label4" Me.Label4.Name = "Label4"
Me.Label4.Size = New System.Drawing.Size(260, 17) Me.Label4.Size = New System.Drawing.Size(260, 17)
Me.Label4.TabIndex = 3 Me.Label4.TabIndex = 3
@@ -458,7 +504,7 @@ Partial Class usrCntlBH
Me.Label27.AutoSize = True Me.Label27.AutoSize = True
Me.Label27.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label27.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label27.ForeColor = System.Drawing.SystemColors.ControlDarkDark Me.Label27.ForeColor = System.Drawing.SystemColors.ControlDarkDark
Me.Label27.Location = New System.Drawing.Point(11, 778) Me.Label27.Location = New System.Drawing.Point(6, 552)
Me.Label27.Name = "Label27" Me.Label27.Name = "Label27"
Me.Label27.Size = New System.Drawing.Size(101, 17) Me.Label27.Size = New System.Drawing.Size(101, 17)
Me.Label27.TabIndex = 11 Me.Label27.TabIndex = 11
@@ -468,7 +514,7 @@ Partial Class usrCntlBH
' '
Me.GroupBox5.Controls.Add(Me.Label26) Me.GroupBox5.Controls.Add(Me.Label26)
Me.GroupBox5.Controls.Add(Me.Button5) Me.GroupBox5.Controls.Add(Me.Button5)
Me.GroupBox5.Location = New System.Drawing.Point(10, 790) Me.GroupBox5.Location = New System.Drawing.Point(5, 564)
Me.GroupBox5.Name = "GroupBox5" Me.GroupBox5.Name = "GroupBox5"
Me.GroupBox5.Size = New System.Drawing.Size(847, 61) Me.GroupBox5.Size = New System.Drawing.Size(847, 61)
Me.GroupBox5.TabIndex = 10 Me.GroupBox5.TabIndex = 10
@@ -506,11 +552,12 @@ Partial Class usrCntlBH
Me.GroupBox1.Controls.Add(Me.cbxMdmSollHaben) Me.GroupBox1.Controls.Add(Me.cbxMdmSollHaben)
Me.GroupBox1.Controls.Add(Me.Label1) Me.GroupBox1.Controls.Add(Me.Label1)
Me.GroupBox1.Controls.Add(Me.btnWord) Me.GroupBox1.Controls.Add(Me.btnWord)
Me.GroupBox1.Location = New System.Drawing.Point(10, 32) Me.GroupBox1.Location = New System.Drawing.Point(6, 782)
Me.GroupBox1.Name = "GroupBox1" Me.GroupBox1.Name = "GroupBox1"
Me.GroupBox1.Size = New System.Drawing.Size(847, 86) Me.GroupBox1.Size = New System.Drawing.Size(847, 86)
Me.GroupBox1.TabIndex = 2 Me.GroupBox1.TabIndex = 2
Me.GroupBox1.TabStop = False Me.GroupBox1.TabStop = False
Me.GroupBox1.Visible = False
' '
'cbxMdmSollHabenOhneKdNr 'cbxMdmSollHabenOhneKdNr
' '
@@ -586,7 +633,7 @@ Partial Class usrCntlBH
Me.Label24.AutoSize = True Me.Label24.AutoSize = True
Me.Label24.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label24.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label24.ForeColor = System.Drawing.SystemColors.ControlDarkDark Me.Label24.ForeColor = System.Drawing.SystemColors.ControlDarkDark
Me.Label24.Location = New System.Drawing.Point(11, 692) Me.Label24.Location = New System.Drawing.Point(2, -3)
Me.Label24.Name = "Label24" Me.Label24.Name = "Label24"
Me.Label24.Size = New System.Drawing.Size(150, 17) Me.Label24.Size = New System.Drawing.Size(150, 17)
Me.Label24.TabIndex = 8 Me.Label24.TabIndex = 8
@@ -597,7 +644,7 @@ Partial Class usrCntlBH
Me.GroupBox2.Controls.Add(Me.Label2) Me.GroupBox2.Controls.Add(Me.Label2)
Me.GroupBox2.Controls.Add(Me.Label5) Me.GroupBox2.Controls.Add(Me.Label5)
Me.GroupBox2.Controls.Add(Me.Button1) Me.GroupBox2.Controls.Add(Me.Button1)
Me.GroupBox2.Location = New System.Drawing.Point(12, 132) Me.GroupBox2.Location = New System.Drawing.Point(6, 15)
Me.GroupBox2.Name = "GroupBox2" Me.GroupBox2.Name = "GroupBox2"
Me.GroupBox2.Size = New System.Drawing.Size(847, 86) Me.GroupBox2.Size = New System.Drawing.Size(847, 86)
Me.GroupBox2.TabIndex = 4 Me.GroupBox2.TabIndex = 4
@@ -638,7 +685,8 @@ Partial Class usrCntlBH
' '
Me.GroupBox4.Controls.Add(Me.Label25) Me.GroupBox4.Controls.Add(Me.Label25)
Me.GroupBox4.Controls.Add(Me.Button4) Me.GroupBox4.Controls.Add(Me.Button4)
Me.GroupBox4.Location = New System.Drawing.Point(10, 703) Me.GroupBox4.Controls.Add(Me.Label24)
Me.GroupBox4.Location = New System.Drawing.Point(5, 488)
Me.GroupBox4.Name = "GroupBox4" Me.GroupBox4.Name = "GroupBox4"
Me.GroupBox4.Size = New System.Drawing.Size(847, 61) Me.GroupBox4.Size = New System.Drawing.Size(847, 61)
Me.GroupBox4.TabIndex = 9 Me.GroupBox4.TabIndex = 9
@@ -672,7 +720,7 @@ Partial Class usrCntlBH
Me.Label7.AutoSize = True Me.Label7.AutoSize = True
Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label7.ForeColor = System.Drawing.SystemColors.ControlDarkDark Me.Label7.ForeColor = System.Drawing.SystemColors.ControlDarkDark
Me.Label7.Location = New System.Drawing.Point(13, 305) Me.Label7.Location = New System.Drawing.Point(7, 188)
Me.Label7.Name = "Label7" Me.Label7.Name = "Label7"
Me.Label7.Size = New System.Drawing.Size(182, 17) Me.Label7.Size = New System.Drawing.Size(182, 17)
Me.Label7.TabIndex = 5 Me.Label7.TabIndex = 5
@@ -711,7 +759,7 @@ Partial Class usrCntlBH
Me.GroupBox3.Controls.Add(Me.txtOPKdName) Me.GroupBox3.Controls.Add(Me.txtOPKdName)
Me.GroupBox3.Controls.Add(Me.Label8) Me.GroupBox3.Controls.Add(Me.Label8)
Me.GroupBox3.Controls.Add(Me.Button2) Me.GroupBox3.Controls.Add(Me.Button2)
Me.GroupBox3.Location = New System.Drawing.Point(12, 316) Me.GroupBox3.Location = New System.Drawing.Point(6, 199)
Me.GroupBox3.Name = "GroupBox3" Me.GroupBox3.Name = "GroupBox3"
Me.GroupBox3.Size = New System.Drawing.Size(847, 283) Me.GroupBox3.Size = New System.Drawing.Size(847, 283)
Me.GroupBox3.TabIndex = 6 Me.GroupBox3.TabIndex = 6
@@ -1351,7 +1399,7 @@ Partial Class usrCntlBH
Me.tbcntr.Location = New System.Drawing.Point(0, 52) Me.tbcntr.Location = New System.Drawing.Point(0, 52)
Me.tbcntr.Name = "tbcntr" Me.tbcntr.Name = "tbcntr"
Me.tbcntr.SelectedIndex = 0 Me.tbcntr.SelectedIndex = 0
Me.tbcntr.Size = New System.Drawing.Size(964, 1088) Me.tbcntr.Size = New System.Drawing.Size(964, 994)
Me.tbcntr.TabIndex = 25 Me.tbcntr.TabIndex = 25
' '
'TabPage5 'TabPage5
@@ -1360,7 +1408,7 @@ Partial Class usrCntlBH
Me.TabPage5.Controls.Add(Me.GroupBox6) Me.TabPage5.Controls.Add(Me.GroupBox6)
Me.TabPage5.Location = New System.Drawing.Point(4, 22) Me.TabPage5.Location = New System.Drawing.Point(4, 22)
Me.TabPage5.Name = "TabPage5" Me.TabPage5.Name = "TabPage5"
Me.TabPage5.Size = New System.Drawing.Size(956, 1010) Me.TabPage5.Size = New System.Drawing.Size(956, 1062)
Me.TabPage5.TabIndex = 1 Me.TabPage5.TabIndex = 1
Me.TabPage5.Text = "IMEX" Me.TabPage5.Text = "IMEX"
Me.TabPage5.UseVisualStyleBackColor = True Me.TabPage5.UseVisualStyleBackColor = True
@@ -1429,49 +1477,6 @@ Partial Class usrCntlBH
Me.Button7.Text = "Importieren" Me.Button7.Text = "Importieren"
Me.Button7.UseVisualStyleBackColor = True Me.Button7.UseVisualStyleBackColor = True
' '
'Label42
'
Me.Label42.AutoSize = True
Me.Label42.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label42.ForeColor = System.Drawing.SystemColors.ControlDarkDark
Me.Label42.Location = New System.Drawing.Point(9, 963)
Me.Label42.Name = "Label42"
Me.Label42.Size = New System.Drawing.Size(168, 17)
Me.Label42.TabIndex = 19
Me.Label42.Text = "Sachkontenzuweisung"
'
'GroupBox10
'
Me.GroupBox10.Controls.Add(Me.Label43)
Me.GroupBox10.Controls.Add(Me.Button12)
Me.GroupBox10.Location = New System.Drawing.Point(8, 975)
Me.GroupBox10.Name = "GroupBox10"
Me.GroupBox10.Size = New System.Drawing.Size(847, 61)
Me.GroupBox10.TabIndex = 18
Me.GroupBox10.TabStop = False
'
'Label43
'
Me.Label43.AutoSize = True
Me.Label43.Location = New System.Drawing.Point(141, 28)
Me.Label43.Name = "Label43"
Me.Label43.Size = New System.Drawing.Size(165, 13)
Me.Label43.TabIndex = 2
Me.Label43.Text = "Sachkontenzuweisung für Syska."
'
'Button12
'
Me.Button12.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center
Me.Button12.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button12.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
Me.Button12.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button12.Location = New System.Drawing.Point(4, 11)
Me.Button12.Name = "Button12"
Me.Button12.Size = New System.Drawing.Size(121, 44)
Me.Button12.TabIndex = 7
Me.Button12.Text = "Sachkonten"
Me.Button12.UseVisualStyleBackColor = True
'
'usrCntlBH 'usrCntlBH
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1480,11 +1485,13 @@ Partial Class usrCntlBH
Me.Controls.Add(Me.tbcntr) Me.Controls.Add(Me.tbcntr)
Me.Controls.Add(Me.pnl) Me.Controls.Add(Me.pnl)
Me.Name = "usrCntlBH" Me.Name = "usrCntlBH"
Me.Size = New System.Drawing.Size(964, 1140) Me.Size = New System.Drawing.Size(964, 1046)
Me.pnl.ResumeLayout(False) Me.pnl.ResumeLayout(False)
Me.pnl.PerformLayout() Me.pnl.PerformLayout()
Me.TabPage1.ResumeLayout(False) Me.TabPage1.ResumeLayout(False)
Me.TabPage1.PerformLayout() Me.TabPage1.PerformLayout()
Me.GroupBox10.ResumeLayout(False)
Me.GroupBox10.PerformLayout()
Me.GroupBox9.ResumeLayout(False) Me.GroupBox9.ResumeLayout(False)
Me.GroupBox9.PerformLayout() Me.GroupBox9.PerformLayout()
Me.GroupBox8.ResumeLayout(False) Me.GroupBox8.ResumeLayout(False)
@@ -1511,8 +1518,6 @@ Partial Class usrCntlBH
Me.TabPage5.PerformLayout() Me.TabPage5.PerformLayout()
Me.GroupBox6.ResumeLayout(False) Me.GroupBox6.ResumeLayout(False)
Me.GroupBox6.PerformLayout() Me.GroupBox6.PerformLayout()
Me.GroupBox10.ResumeLayout(False)
Me.GroupBox10.PerformLayout()
Me.ResumeLayout(False) Me.ResumeLayout(False)
End Sub End Sub

74
SDL/kunden/usrCntlKundenuebersicht.vb
View File

@@ -2808,59 +2808,53 @@ Public Class usrCntlKundenuebersicht
Exit Sub Exit Sub
End If End If
Select Case ADRESSE.LandKz If ADRESSE.LandKz.ToString.Length <> 2 Then
land = cProgramFunctions.getISO2Land(ADRESSE.LandKz)
Case "A" : land = "AT" Else
Case "D" : land = "DE" land = ADRESSE.LandKz
Case Else End If
land = ADRESSE.LandKz
End Select
Dim company As New cCreditSafeAPI.Company("", "", "", land, KUNDE_ERW.kde_CreditSaveNo, KUNDE_ERW.kde_CreditSaveId, Nothing, "", "", "", "", "", "", "", "", "") Dim company As New cCreditSafeAPI.Company("", "", "", land, KUNDE_ERW.kde_CreditSaveNo, KUNDE_ERW.kde_CreditSaveId, Nothing, "", "", "", "", "", "", "", "", "")
If lblBonitaetsdatum._value <> Nothing Then If lblBonitaetsdatum._value <> Nothing Then
Dim lastChecked As Date = Date.ParseExact(lblBonitaetsdatum._value, "dd.MM.yyyy", System.Globalization.DateTimeFormatInfo.InvariantInfo) Dim lastChecked As Date = Date.ParseExact(lblBonitaetsdatum._value, "dd.MM.yyyy", System.Globalization.DateTimeFormatInfo.InvariantInfo)
company.lastChecked = lastChecked company.lastChecked = lastChecked
If lastChecked = Today Then
Dim bonaus = VERAG_PROG_ALLGEMEIN.cBonitaetsauskunft.LOADByKdNrDate(kdNr, Today)
If bonaus.ba_Pruefungstool = "creditsafe API" AndAlso bonaus.ba_datenarchivId > -1 Then
MsgBox("Heute wurde bereits eine erfolgreiche Abfrage durchgeführt" & vbNewLine & "Vorgang wird abgebrochen!")
Cursor = Cursors.Default
btnCreditsafe.Enabled = True
Exit Sub
End If
End If
If cs.checkDateOfLastRequest(company) < lastChecked Then
Dim a As MsgBoxResult = MsgBox("Seit der letzen Abfrage (" & lastChecked.ToShortDateString & ") wurde bei Creditsafe keine Änderung gemacht!" & vbNewLine & "Trotzdem Creditreport-Daten aktualisieren?", vbYesNo)
If a = vbYes Then
setCreditsafereportEntry(cs, company, True) 'doppelte Abfragen mitprotokollieren
If lastChecked = Today Then
Dim bonaus = VERAG_PROG_ALLGEMEIN.cBonitaetsauskunft.LOADByKdNrDate(kdNr, Today)
If bonaus.ba_Pruefungstool = "creditsafe API" AndAlso bonaus.ba_datenarchivId > -1 Then
MsgBox("Heute wurde bereits eine erfolgreiche Abfrage durchgeführt" & vbNewLine & "Vorgang wird abgebrochen!")
Cursor = Cursors.Default
btnCreditsafe.Enabled = True
Exit Sub
End If
End If End If
If cs.checkDateOfLastRequest(company) < lastChecked Then
Dim a As MsgBoxResult = MsgBox("Seit der letzen Abfrage (" & lastChecked.ToShortDateString & ") wurde bei Creditsafe keine Änderung gemacht!" & vbNewLine & "Trotzdem Creditreport-Daten aktualisieren?", vbYesNo)
If a = vbYes Then
setCreditsafereportEntry(cs, company, True) 'doppelte Abfragen mitprotokollieren
End If
Else
setCreditsafereportEntry(cs, company)
End If
Else Else
setCreditsafereportEntry(cs, company) setCreditsafereportEntry(cs, company)
End If End If
Else Else
MsgBox("Authentifizierungsfehler bei Creditsafe-User")
setCreditsafereportEntry(cs, company)
End If
Else
MsgBox("Authentifizierungsfehler bei Creditsafe-User")
End If End If

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

@@ -49,6 +49,7 @@ Partial Class usrCntlOfferte
Me.Label2 = New System.Windows.Forms.Label() Me.Label2 = New System.Windows.Forms.Label()
Me.lblLeistunAddErr2 = New System.Windows.Forms.Label() Me.lblLeistunAddErr2 = New System.Windows.Forms.Label()
Me.pnlEdit = New System.Windows.Forms.Panel() Me.pnlEdit = New System.Windows.Forms.Panel()
Me.Button1 = New System.Windows.Forms.Button()
Me.cbxAutoFakturierung = New System.Windows.Forms.CheckBox() Me.cbxAutoFakturierung = New System.Windows.Forms.CheckBox()
Me.Label3 = New System.Windows.Forms.Label() Me.Label3 = New System.Windows.Forms.Label()
Me.cboLeistungenAdd = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cboLeistungenAdd = New VERAG_PROG_ALLGEMEIN.MyComboBox()
@@ -63,7 +64,6 @@ Partial Class usrCntlOfferte
Me.lblEditMode = New System.Windows.Forms.Label() Me.lblEditMode = New System.Windows.Forms.Label()
Me.btnOffertbearbeiten = New System.Windows.Forms.Button() Me.btnOffertbearbeiten = New System.Windows.Forms.Button()
Me.dgvOfferteNew = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.dgvOfferteNew = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.Button1 = New System.Windows.Forms.Button()
CType(Me.dgvOfferteDetails, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvOfferteDetails, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.dgvOfferte, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvOfferte, System.ComponentModel.ISupportInitialize).BeginInit()
Me.cntxtAddSdl.SuspendLayout() Me.cntxtAddSdl.SuspendLayout()
@@ -101,7 +101,7 @@ Partial Class usrCntlOfferte
Me.lblOffert.Multiline = True Me.lblOffert.Multiline = True
Me.lblOffert.Name = "lblOffert" Me.lblOffert.Name = "lblOffert"
Me.lblOffert.ReadOnly = True Me.lblOffert.ReadOnly = True
Me.lblOffert.Size = New System.Drawing.Size(110, 22) Me.lblOffert.Size = New System.Drawing.Size(171, 22)
Me.lblOffert.TabIndex = 0 Me.lblOffert.TabIndex = 0
Me.lblOffert.Text = "Offerte" Me.lblOffert.Text = "Offerte"
' '
@@ -402,6 +402,20 @@ Partial Class usrCntlOfferte
Me.pnlEdit.Size = New System.Drawing.Size(796, 60) Me.pnlEdit.Size = New System.Drawing.Size(796, 60)
Me.pnlEdit.TabIndex = 20 Me.pnlEdit.TabIndex = 20
' '
'Button1
'
Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button1.ForeColor = System.Drawing.Color.Black
Me.Button1.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button1.Location = New System.Drawing.Point(606, 0)
Me.Button1.Name = "Button1"
Me.Button1.Size = New System.Drawing.Size(51, 36)
Me.Button1.TabIndex = 33
Me.Button1.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.Button1.UseVisualStyleBackColor = True
'
'cbxAutoFakturierung 'cbxAutoFakturierung
' '
Me.cbxAutoFakturierung.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.cbxAutoFakturierung.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -606,20 +620,6 @@ Partial Class usrCntlOfferte
Me.dgvOfferteNew.Size = New System.Drawing.Size(228, 347) Me.dgvOfferteNew.Size = New System.Drawing.Size(228, 347)
Me.dgvOfferteNew.TabIndex = 30 Me.dgvOfferteNew.TabIndex = 30
' '
'Button1
'
Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button1.ForeColor = System.Drawing.Color.Black
Me.Button1.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button1.Location = New System.Drawing.Point(606, 0)
Me.Button1.Name = "Button1"
Me.Button1.Size = New System.Drawing.Size(51, 36)
Me.Button1.TabIndex = 33
Me.Button1.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.Button1.UseVisualStyleBackColor = True
'
'usrCntlOfferte 'usrCntlOfferte
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

44
SDL/kunden/usrCntlOfferte.vb
View File

@@ -92,7 +92,7 @@ Public Class usrCntlOfferte
' OFFERTEBind.bindingdataTable.PrimaryKey = {OFFERTEBind.bindingdataTable.Columns("KundenNr"), OFFERTEBind.bindingdataTable.Columns("LeistungsNr"), OFFERTEBind.bindingdataTable.Columns("LeistungsNr"), OFFERTEBind.bindingdataTable.Columns("LeistungsBez")} ' OFFERTEBind.bindingdataTable.PrimaryKey = {OFFERTEBind.bindingdataTable.Columns("KundenNr"), OFFERTEBind.bindingdataTable.Columns("LeistungsNr"), OFFERTEBind.bindingdataTable.Columns("LeistungsNr"), OFFERTEBind.bindingdataTable.Columns("LeistungsBez")}
Catch ex As Exception Catch ex As Exception
MsgBox(ex.Message) VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try End Try
@@ -135,7 +135,7 @@ Public Class usrCntlOfferte
' .Columns("Geändert am").Visible = False ' .Columns("Geändert am").Visible = False
.Columns("PreisänderungProzent").Width = 70 .Columns("PreisänderungProzent").Width = 70
.Columns("PreisänderungProzent").HeaderText = "Preisänd. %" .Columns("PreisänderungProzent").HeaderText = "Preisänd. %"
.Columns("PreisänderungProzent").DefaultCellStyle.Format = "P" .Columns("PreisänderungProzent").DefaultCellStyle.Format = "p"
.Columns("PreisänderungProzent").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight .Columns("PreisänderungProzent").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight
.Columns("PreisAlt").Width = 60 .Columns("PreisAlt").Width = 60
.Columns("PreisAlt").DefaultCellStyle.Format = "N2" .Columns("PreisAlt").DefaultCellStyle.Format = "N2"
@@ -334,22 +334,17 @@ Public Class usrCntlOfferte
Private Sub dgvOfferteDetails_CellValueChanged(sender As Object, e As DataGridViewCellEventArgs) Handles dgvOfferteDetails.CellValueChanged Private Sub dgvOfferteDetails_CellValueChanged(sender As Object, e As DataGridViewCellEventArgs) Handles dgvOfferteDetails.CellValueChanged
Try Try
If loaded = True Then If loaded = True Then
dgvOfferteDetails.Rows(e.RowIndex).Cells("Sachbearbeiter").Value = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME dgvOfferteDetails.Rows(e.RowIndex).Cells("Sachbearbeiter").Value = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
dgvOfferteDetails.Rows(e.RowIndex).Cells("Geändert am").Value = Now dgvOfferteDetails.Rows(e.RowIndex).Cells("Geändert am").Value = Now
DGVHasChaged = True DGVHasChaged = True
'saveCurrentOffert() 'saveCurrentOffert()
If isNew = True Then If isNew Then
currentOffert.Art = "Neuanlage" currentOffert.Art = "Neuanlage"
currentOffert.SAVE()
Else Else
currentOffert.Art = "Geändert" currentOffert.Art = "Geändert"
currentOffert.SAVE()
End If End If
currentOffert.SAVE()
End If End If
Catch ex As Exception Catch ex As Exception
@@ -782,4 +777,35 @@ Public Class usrCntlOfferte
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
cProgramFunctions.genExcelFromDGV_NEW(dgvOfferteDetails, True) cProgramFunctions.genExcelFromDGV_NEW(dgvOfferteDetails, True)
End Sub End Sub
Private Sub dgvOfferteDetails_KeyUp(sender As Object, e As KeyEventArgs) Handles dgvOfferteDetails.KeyUp
If e.KeyCode = Keys.Tab Then
dgvOfferteDetails.CurrentCell = GetNextCell(dgvOfferteDetails.CurrentCell)
e.Handled = True
End If
End Sub
Private Function GetNextCell(currentCell As DataGridViewCell) As DataGridViewCell
Dim i As Integer = 0
Dim nextCell As DataGridViewCell = currentCell
Dim j = 0
Do
Dim nextCellIndex As Integer = (nextCell.ColumnIndex + j) Mod dgvOfferteDetails.ColumnCount
Dim nextRowIndex As Integer = If(nextCellIndex = 0, (nextCell.RowIndex + 1) Mod dgvOfferteDetails.RowCount, nextCell.RowIndex)
lblOffert.Text = "C" & nextCellIndex & "R" & nextRowIndex & "RO" & IIf(nextCell.[ReadOnly], "1", "0") & "H" & IIf(Not nextCell.Visible, "1", "0")
nextCell = dgvOfferteDetails.Rows(nextRowIndex).Cells(nextCellIndex)
i += 1
j = 1
Loop While (i < (dgvOfferteDetails.RowCount * dgvOfferteDetails.ColumnCount) AndAlso (nextCell.[ReadOnly]) Or i < (dgvOfferteDetails.RowCount * dgvOfferteDetails.ColumnCount) AndAlso Not nextCell.Visible)
Return nextCell
End Function
End Class End Class

47
SDL/mdm/frmMDMDatenverarbetiung.vb
View File

@@ -18,6 +18,9 @@ Public Class frmMDMDatenverarbetiung
Private Sub frmPloseDatenverarbetiung_Load(sender As Object, e As EventArgs) Handles MyBase.Load Private Sub frmPloseDatenverarbetiung_Load(sender As Object, e As EventArgs) Handles MyBase.Load
Me.Top = 0 Me.Top = 0
Me.Height = My.Computer.Screen.WorkingArea.Height Me.Height = My.Computer.Screen.WorkingArea.Height
VERAG_PROG_ALLGEMEIN.cProgramFunctions.SetDoubleBuffered(MyDatagridview1)
End Sub End Sub
Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
@@ -555,7 +558,7 @@ Public Class frmMDMDatenverarbetiung
With MyDatagridview1 With MyDatagridview1
.Columns.Clear() .Columns.Clear()
.SET_SQL(" SELECT plose_POLSEKundennummer, count(*) Anzahl,plose_ProduktCode,max(plose_Produktbeschreibung) as plose_Produktbeschreibung, sum(plose_Menge) as plose_Menge,sum(plose_Preis) as plose_Preis,sum(plose_NettobetragWaehrungAbbuchung) as plose_NettobetragWaehrungAbbuchung,sum(plose_MWSTBetragWaehrungAbbuchung) as plose_MWSTBetragWaehrungAbbuchung,sum(plose_BruttobetragWaehrungAbbuchung) as plose_BruttobetragWaehrungAbbuchung .SET_SQL(" SELECT plose_POLSEKundennummer, count(*) Anzahl,plose_ProduktCode,max(plose_Produktbeschreibung) as plose_Produktbeschreibung, sum(plose_Menge) as plose_Menge,sum(plose_Preis) as plose_Preis,sum(plose_NettobetragWaehrungAbbuchung) as plose_NettobetragWaehrungAbbuchung,sum(plose_MWSTBetragWaehrungAbbuchung) as plose_MWSTBetragWaehrungAbbuchung,sum(plose_BruttobetragWaehrungAbbuchung) as plose_BruttobetragWaehrungAbbuchung
FROM tblPLOSE_Details FROM tblPLOSE_Details
WHERE 1 = 1 WHERE 1 = 1
And plose_DatumTransaktion between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' And plose_DatumTransaktion between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "'
@@ -3223,12 +3226,14 @@ Public Class frmMDMDatenverarbetiung
Function pruefData_PLOSE() As Boolean Function pruefData_PLOSE() As Boolean
pruefData_PLOSE = True pruefData_PLOSE = True
Try Try
Dim VERAGKdNr_DT As DataTable = SQL.loadDgvBySql("SELECT AdressenNr,PLOSEKundenNr FROM Adressen WHERE PLOSEKundenNr is not null", "FMZOLL") Dim VERAGKdNr_DT As DataTable = SQL.loadDgvBySql("SELECT AdressenNr,PLOSEKundenNr FROM Adressen WHERE PLOSEKundenNr is not null order by PLOSEKundenNr", "FMZOLL")
Dim VERAGLeistungsNr_DT = SQL.loadDgvBySql("SELECT [plp_LeistungsNr],plp_ProductCode FROM [tblPLOSE_Produktbeschreibung] where plp_ProductCode is not null and plp_Firma IN ('PSS','PU') ", "FMZOLL") Dim VERAGLeistungsNr_DT = SQL.loadDgvBySql("SELECT [plp_LeistungsNr],plp_ProductCode FROM [tblPLOSE_Produktbeschreibung] where plp_ProductCode is not null and plp_Firma IN ('PSS','PU') order by plp_ProductCode ", "FMZOLL")
'Dim OffertenNr_DT = SQL.loadDgvBySql("SELECT KundenNr,OffertenNr FROM [Offerten] where OffertenNr = 80 ", "FMZOLL") Dim OffertenNr_DT = SQL.loadDgvBySql("SELECT KundenNr,OffertenNr FROM [Offerten] where OffertenNr = 80 order by KundenNr", "FMZOLL")
' Dim KundeLeistungsNr_DT = SQL.loadDgvBySql("SELECT [LeistungsNr],KundenNr FROM [Offertenpositionen] where OffertenNr = 80", "FMZOLL") Dim KundeLeistungsNr_DT = SQL.loadDgvBySql("SELECT [LeistungsNr],KundenNr FROM [Offertenpositionen] where OffertenNr = 80 order by KundenNr", "FMZOLL")
Dim VERAGKdNr = -1 Dim VERAGKdNr = -1
Dim VERAGLeistungsNr = -1 Dim VERAGLeistungsNr = -1
@@ -3236,6 +3241,7 @@ Public Class frmMDMDatenverarbetiung
Dim results As DataRow() Dim results As DataRow()
Dim cnt = 0 Dim cnt = 0
Dim cntTotal = MyDatagridview1.Rows.Count()
For Each r As DataGridViewRow In MyDatagridview1.Rows For Each r As DataGridViewRow In MyDatagridview1.Rows
'KUNDEN-NR / PLOSE KD-NR 'KUNDEN-NR / PLOSE KD-NR
@@ -3251,21 +3257,7 @@ Public Class frmMDMDatenverarbetiung
pruefData_PLOSE = False pruefData_PLOSE = False
End If End If
'KUNDEN-NR / PLOSE KD-NR
'Default -> Nicht gefunden
'r.Cells("VERAGKdNr").Style.BackColor = Color.PapayaWhip
'found = False
'For Each k In VERAGKdNr_DT.Rows
' If r.Cells("plose_POLSEKundennummer").Value = k("PLOSEKundenNr") Then
' 'Gefunden!
' r.Cells("VERAGKdNr").Value = k("PLOSEKundenNr")
' r.Cells("VERAGKdNr").Style.BackColor = Color.MintCream
' VERAGKdNr = k("AdressenNr")
' found = True
' Exit For
' End If
'Next
'If Not found Then pruefData_PLOSE = False
'VERAG/PLOSE LEISTUNG 'VERAG/PLOSE LEISTUNG
results = VERAGLeistungsNr_DT.Select("plp_ProductCode = '" & r.Cells("plose_ProduktCode").Value & "' AND plp_LeistungsNr is not null") results = VERAGLeistungsNr_DT.Select("plp_ProductCode = '" & r.Cells("plose_ProduktCode").Value & "' AND plp_LeistungsNr is not null")
@@ -3283,7 +3275,7 @@ Public Class frmMDMDatenverarbetiung
'VERAG OFFERT 80 'VERAG OFFERT 80
'Default -> Nicht gefunden 'Default -> Nicht gefunden
Dim OffertenNr_DT = SQL.loadDgvBySql("SELECT KundenNr,OffertenNr FROM [Offerten] where OffertenNr = 80 AND KundenNr = '" & VERAGKdNr & "'", "FMZOLL") 'Dim OffertenNr_DT = SQL.loadDgvBySql("SELECT KundenNr,OffertenNr FROM [Offerten] where OffertenNr = 80 AND KundenNr = '" & VERAGKdNr & "'", "FMZOLL")
results = OffertenNr_DT.Select("KundenNr = '" & VERAGKdNr & "'") results = OffertenNr_DT.Select("KundenNr = '" & VERAGKdNr & "'")
If results.Length > 0 Then If results.Length > 0 Then
'Gefunden! 'Gefunden!
@@ -3298,7 +3290,7 @@ Public Class frmMDMDatenverarbetiung
'VERAG LEISTUNGS-NR 'VERAG LEISTUNGS-NR
'Default -> Nicht gefunden 'Default -> Nicht gefunden
Dim KundeLeistungsNr_DT = SQL.loadDgvBySql("SELECT [LeistungsNr],KundenNr FROM [Offertenpositionen] where OffertenNr = 80 AND KundenNr = '" & VERAGKdNr & "' AND LeistungsNr = '" & VERAGLeistungsNr & "'", "FMZOLL") 'Dim KundeLeistungsNr_DT = SQL.loadDgvBySql("SELECT [LeistungsNr],KundenNr FROM [Offertenpositionen] where OffertenNr = 80 AND KundenNr = '" & VERAGKdNr & "' AND LeistungsNr = '" & VERAGLeistungsNr & "'", "FMZOLL")
results = KundeLeistungsNr_DT.Select("KundenNr = '" & VERAGKdNr & "' AND LeistungsNr = '" & VERAGLeistungsNr & "'") results = KundeLeistungsNr_DT.Select("KundenNr = '" & VERAGKdNr & "' AND LeistungsNr = '" & VERAGLeistungsNr & "'")
If results.Length > 0 Then If results.Length > 0 Then
'Gefunden! 'Gefunden!
@@ -3309,17 +3301,20 @@ Public Class frmMDMDatenverarbetiung
pruefData_PLOSE = False pruefData_PLOSE = False
End If End If
If cnt Mod 5 = 0 Then If cnt Mod 5 = 0 Then
lblProzPruef.Text = CInt(cnt / MyDatagridview1.Rows.Count() * 100) & " %" lblProzPruef.Text = CInt(cnt / cntTotal * 100) & " %"
lblProzPruef.Refresh() lblProzPruef.Refresh()
Me.Refresh() 'Me.Refresh()
End If End If
cnt += 1 cnt += 1
Next Next
lblProzPruef.Text = CInt(cnt / MyDatagridview1.Rows.Count() * 100) & " %" '100
'lblProzPruef.Text = CInt(cnt / MyDatagridview1.Rows.Count() * 100) & " %" '100
'lblProzPruef.Refresh()
Me.Refresh()
Catch ex As Exception Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
pruefData_PLOSE = False pruefData_PLOSE = False

1
VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb
View File

@@ -661,6 +661,7 @@ Public Class cCreditSafeAPI
i = i + 1 i = i + 1
End While End While
Return "Anzahl gefundener Datensätze: " & i Return "Anzahl gefundener Datensätze: " & i