kundeblatt, etc.

SDL/Fakturierung/cFakturierung.vb

@@ -2106,20 +2106,37 @@ Public Class cFakturierung
                 Select Case RECHNUNG.BelegartenKz
                     Case "AR"
                         rpt.lblUeberschriftRG_GS.Text = "FACTURA"
-                        rpt.lblSummeUeberschrift.Text = "Total"
+                        rpt.lblSummeUeberschrift.Text = "Total:"
                         rpt.lblRgNrUeberschrift.Text = "Nr. factura:"
                         rpt.lblRgDatumUeberschrift.Text = "Data factura:"
                     Case "AG"
                         rpt.lblUeberschriftRG_GS.Text = "NOTA DE CREDIT"
-                        rpt.lblSummeUeberschrift.Text = "Total"
+                        rpt.lblSummeUeberschrift.Text = "Total:"
                         rpt.lblRgNrUeberschrift.Text = "Nr. nota credit:"
                         rpt.lblRgDatumUeberschrift.Text = "Data nota credit:"
                 End Select
 
+            Case "TR" 'Todo: bekomme noch die Übersetzungen dazu:  2025-12-18
+                Select Case RECHNUNG.BelegartenKz
+                    Case "AR"
+                        rpt.lblUeberschriftRG_GS.Text = "INVOICE"
+                        rpt.lblSummeUeberschrift.Text = "Invoice Amount:"
+                        rpt.lblRgNrUeberschrift.Text = "Invoice No.:"
+                        rpt.lblRgDatumUeberschrift.Text = "Invoice Date:"
+                    Case "AG"
+                        rpt.lblUeberschriftRG_GS.Text = "CREDIT NOTE"
+                        rpt.lblSummeUeberschrift.Text = "Credit Amount:"
+                        rpt.lblRgNrUeberschrift.Text = "Credit Note No.:"
+                        rpt.lblRgDatumUeberschrift.Text = "Credit Note Date:"
+                End Select
+
             Case Else
                 Select Case RECHNUNG.BelegartenKz
                     Case "AR"
                         rpt.lblUeberschriftRG_GS.Text = "RECHNUNG"
+                        rpt.lblSummeUeberschrift.Text = "Rechnungsbetrag"
+                        rpt.lblRgNrUeberschrift.Text = "Rechnungs-Nr.:"
+                        rpt.lblRgDatumUeberschrift.Text = "Rechnungs-Datum:"
                     Case "AG"
                         rpt.lblUeberschriftRG_GS.Text = "GUTSCHRIFT"
                         rpt.lblSummeUeberschrift.Text = "Gutschriftsbetrag:"
@@ -2353,7 +2370,7 @@ Public Class cFakturierung
                 Case Else
 
                     rpt.lblLeistungUeberschrift.Text = "RENR"
-                    rpt.lblLeistungUeberschrift.Text = "RE Datum"
+                    rpt.lbl_onlyZR_ReDatUeberschrift.Text = "RE Datum"
                     rpt.lblAnzahlUeberschrift.Text = "VZ Tage"
                     rpt.lblSteuerpflichtigUeberschrift.Text = "RE Betrag"
                     rpt.lblSteuerfreiUeberschrift.Text = "Verzugszinsen"

SDL/Fakturierung/usrCntlFaktAbrechnung.vb

@@ -558,7 +558,10 @@ Public Class usrCntlFaktAbrechnung
         cboRechnungSprache.Items.Clear()
         cboRechnungSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Deutsch", "DE"))
         cboRechnungSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Englisch", "EN"))
-        If FirmaTmp = "VERAG360" Then cboRechnungSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Rumänisch", "RO"))
+        If FirmaTmp = "VERAG360" Then
+            cboRechnungSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Rumänisch", "RO"))
+            cboRechnungSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Türkisch", "TR"))
+        End If
         cboRechnungSprache.changeItem(0)
 
         cboRgArt.Items.Clear()

SDL/My Project/AssemblyInfo.vb

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

SDL/kunden/frmKundenblatt.Designer.vb

@@ -66,7 +66,6 @@ Partial Class frmKundenblatt
         Me.GroupBox5 = New System.Windows.Forms.GroupBox()
         Me.lblStat_Lkws = New System.Windows.Forms.Label()
         Me.dgvLeistungen = New System.Windows.Forms.DataGridView()
-        Me.PictureBox5 = New System.Windows.Forms.PictureBox()
         Me.lblAnsprechp = New System.Windows.Forms.TextBox()
         Me.txtEmailRE2 = New System.Windows.Forms.TextBox()
         Me.txtEmailRE = New System.Windows.Forms.TextBox()
@@ -221,6 +220,7 @@ Partial Class frmKundenblatt
         Me.tbRechnungen = New System.Windows.Forms.TabPage()
         Me.dgvRg = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components)
+        Me.btnRgMail = New System.Windows.Forms.Button()
         Me.btnRgPdf = New System.Windows.Forms.Button()
         Me.btnMonat = New System.Windows.Forms.Button()
         Me.Button10 = New System.Windows.Forms.Button()
@@ -253,13 +253,13 @@ Partial Class frmKundenblatt
         Me.tbiKartenverwaltung = New System.Windows.Forms.ToolStripMenuItem()
         Me.tbiLKW = New System.Windows.Forms.ToolStripMenuItem()
         Me.tbiVERAGCard = New System.Windows.Forms.ToolStripMenuItem()
+        Me.Button8 = New System.Windows.Forms.Button()
         Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull()
         Me.usrcntlKarten = New SDL.usrCntlKartenDaten()
         Me.UsrCntlLKW1 = New SDL.usrCntlLKW()
         Me.UsrCntlKundenlogin1 = New SDL.usrCntlKundenlogin()
         Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte()
         Me.UsrCntlUSTV = New SDL.usrCntlUSTV()
-        Me.btnRgMail = New System.Windows.Forms.Button()
         Me.pnlInfo.SuspendLayout()
         Me.tbFirmendaten.SuspendLayout()
         Me.Panel4.SuspendLayout()
@@ -267,7 +267,6 @@ Partial Class frmKundenblatt
         Me.tbAllgemein.SuspendLayout()
         Me.GroupBox5.SuspendLayout()
         CType(Me.dgvLeistungen, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.picLogo, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.TabControl1.SuspendLayout()
@@ -386,6 +385,7 @@ Partial Class frmKundenblatt
         'tbAllgemein
         '
         Me.tbAllgemein.BackColor = System.Drawing.Color.White
+        Me.tbAllgemein.Controls.Add(Me.Button8)
         Me.tbAllgemein.Controls.Add(Me.txtKundeninfo)
         Me.tbAllgemein.Controls.Add(Me.txtRisiko)
         Me.tbAllgemein.Controls.Add(Me.Label20)
@@ -539,7 +539,6 @@ Partial Class frmKundenblatt
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.GroupBox5.Controls.Add(Me.lblStat_Lkws)
         Me.GroupBox5.Controls.Add(Me.dgvLeistungen)
-        Me.GroupBox5.Controls.Add(Me.PictureBox5)
         Me.GroupBox5.Location = New System.Drawing.Point(738, 501)
         Me.GroupBox5.Name = "GroupBox5"
         Me.GroupBox5.Size = New System.Drawing.Size(543, 489)
@@ -596,17 +595,6 @@ Partial Class frmKundenblatt
         Me.dgvLeistungen.Size = New System.Drawing.Size(531, 429)
         Me.dgvLeistungen.TabIndex = 197
         '
-        'PictureBox5
-        '
-        Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
-        Me.PictureBox5.Image = Global.SDL.My.Resources.Resources.statistik
-        Me.PictureBox5.Location = New System.Drawing.Point(449, 9)
-        Me.PictureBox5.Name = "PictureBox5"
-        Me.PictureBox5.Size = New System.Drawing.Size(38, 39)
-        Me.PictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
-        Me.PictureBox5.TabIndex = 144
-        Me.PictureBox5.TabStop = False
-        '
         'lblAnsprechp
         '
         Me.lblAnsprechp.BackColor = System.Drawing.Color.White
@@ -1059,7 +1047,7 @@ Partial Class frmKundenblatt
         'Label17
         '
         Me.Label17.AutoSize = True
-        Me.Label17.Location = New System.Drawing.Point(660, 21)
+        Me.Label17.Location = New System.Drawing.Point(660, 101)
         Me.Label17.Name = "Label17"
         Me.Label17.Size = New System.Drawing.Size(66, 13)
         Me.Label17.TabIndex = 1
@@ -1086,7 +1074,7 @@ Partial Class frmKundenblatt
         DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText
         DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
         Me.dgvOfferte.DefaultCellStyle = DataGridViewCellStyle17
-        Me.dgvOfferte.Location = New System.Drawing.Point(684, 37)
+        Me.dgvOfferte.Location = New System.Drawing.Point(684, 118)
         Me.dgvOfferte.Name = "dgvOfferte"
         Me.dgvOfferte.ReadOnly = True
         DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
@@ -1097,7 +1085,7 @@ Partial Class frmKundenblatt
         DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText
         DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
         Me.dgvOfferte.RowHeadersDefaultCellStyle = DataGridViewCellStyle18
-        Me.dgvOfferte.Size = New System.Drawing.Size(42, 320)
+        Me.dgvOfferte.Size = New System.Drawing.Size(42, 239)
         Me.dgvOfferte.TabIndex = 12
         Me.dgvOfferte.Visible = False
         '
@@ -2817,6 +2805,20 @@ Partial Class frmKundenblatt
         Me.MyPanel1.Size = New System.Drawing.Size(1681, 60)
         Me.MyPanel1.TabIndex = 2
         '
+        'btnRgMail
+        '
+        Me.btnRgMail.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnRgMail.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnRgMail.Image = Global.SDL.My.Resources.Resources.email_big1
+        Me.btnRgMail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnRgMail.Location = New System.Drawing.Point(1536, 0)
+        Me.btnRgMail.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3)
+        Me.btnRgMail.Name = "btnRgMail"
+        Me.btnRgMail.Size = New System.Drawing.Size(58, 57)
+        Me.btnRgMail.TabIndex = 213
+        Me.btnRgMail.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnRgMail.UseVisualStyleBackColor = True
+        '
         'btnRgPdf
         '
         Me.btnRgPdf.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -3027,7 +3029,7 @@ Partial Class frmKundenblatt
         '
         Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM"
-        Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8
+        Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4
         Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4)
         Me.cntxtCntxtMDM.Text = "cntxtMDM"
         '
@@ -3189,6 +3191,18 @@ Partial Class frmKundenblatt
         Me.tbiVERAGCard.Size = New System.Drawing.Size(186, 22)
         Me.tbiVERAGCard.Text = "VERAG Card"
         '
+        'Button8
+        '
+        Me.Button8.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button8.Image = Global.SDL.My.Resources.Resources.statistik2
+        Me.Button8.Location = New System.Drawing.Point(660, 6)
+        Me.Button8.Name = "Button8"
+        Me.Button8.Size = New System.Drawing.Size(66, 58)
+        Me.Button8.TabIndex = 203
+        Me.Button8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button8.UseVisualStyleBackColor = True
+        '
         'UsrcntlKundeBearbeitenFull1
         '
         Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White
@@ -3247,20 +3261,6 @@ Partial Class frmKundenblatt
         Me.UsrCntlUSTV.Size = New System.Drawing.Size(1667, 964)
         Me.UsrCntlUSTV.TabIndex = 0
         '
-        'btnRgMail
-        '
-        Me.btnRgMail.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnRgMail.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnRgMail.Image = Global.SDL.My.Resources.Resources.email_big1
-        Me.btnRgMail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnRgMail.Location = New System.Drawing.Point(1536, 0)
-        Me.btnRgMail.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3)
-        Me.btnRgMail.Name = "btnRgMail"
-        Me.btnRgMail.Size = New System.Drawing.Size(58, 57)
-        Me.btnRgMail.TabIndex = 213
-        Me.btnRgMail.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnRgMail.UseVisualStyleBackColor = True
-        '
         'frmKundenblatt
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -3290,7 +3290,6 @@ Partial Class frmKundenblatt
         Me.GroupBox5.ResumeLayout(False)
         Me.GroupBox5.PerformLayout()
         CType(Me.dgvLeistungen, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.picLogo, System.ComponentModel.ISupportInitialize).EndInit()
         Me.TabControl1.ResumeLayout(False)
@@ -3373,7 +3372,6 @@ Partial Class frmKundenblatt
     Friend WithEvents tbLKW As System.Windows.Forms.TabPage
     Friend WithEvents pnlLKWRight As System.Windows.Forms.Panel
     Friend WithEvents GroupBox5 As System.Windows.Forms.GroupBox
-    Friend WithEvents PictureBox5 As System.Windows.Forms.PictureBox
     Friend WithEvents lblStat_Lkws As System.Windows.Forms.Label
     Friend WithEvents Button4 As System.Windows.Forms.Button
     Friend WithEvents PictureBox4 As System.Windows.Forms.PictureBox
@@ -3570,4 +3568,5 @@ Partial Class frmKundenblatt
     Friend WithEvents Label21 As Label
     Friend WithEvents txtKundeninfo As VERAG_PROG_ALLGEMEIN.MyTextBox
     Friend WithEvents btnRgMail As Button
+    Friend WithEvents Button8 As Button
 End Class

SDL/kunden/frmKundenblatt.vb

@@ -219,6 +219,7 @@ Public Class frmKundenblatt
                 Dim path = DS.GET_TOP1_PATH 'cDATENSERVER.getTOP1Path("GRAFIK", "FIRMENLOGOS", kdNr)
                 If path <> "" Then
                     picLogo.ImageLocation = path
+                    picLogo.SizeMode = PictureBoxSizeMode.Zoom
                 Else
                     picLogo.ImageLocation = Nothing
                 End If
@@ -1694,6 +1695,8 @@ Public Class frmKundenblatt
         'Dim path = cDATENSERVER.uploadDataToDATENSERVERFileDialog("GRAFIK", "FIRMENLOGOS", kdNr, , , , "PIC")
         If path <> "" Then
             picLogo.ImageLocation = path
+        Else
+            picLogo.ImageLocation = Nothing
         End If
 
 
@@ -2884,5 +2887,21 @@ Public Class frmKundenblatt
     Private Sub btnRgMail_Click(sender As Object, e As EventArgs) Handles btnRgMail.Click
 
     End Sub
+
+    Private Sub Button8_Click(sender As Object, e As EventArgs) Handles Button8.Click
+
+        Dim rptKundeUebersicht As New SDL.rptKundeUebersicht(kdNr, 19)
+        Dim rpt As New frmPrintLayout
+        rpt.Text = ""
+
+        rpt.Viewer.LoadDocument(rptKundeUebersicht)
+
+        rpt.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous
+        rpt.Show()
+    End Sub
+
+    Private Sub PictureBox5_Click(sender As Object, e As EventArgs) 
+
+    End Sub
 End Class
 

SDL/kunden/usrCntlOfferte.vb

@@ -1055,9 +1055,7 @@ Public Class usrCntlOfferte
 
     Private Sub btnOffertPreisliste_Click(sender As Object, e As EventArgs) Handles btnOffertPreisliste.Click
 
-        'dgvOfferteDetails
+        MsgBox("Noch nicht implementiert!")
-
-
 
     End Sub
 End Class

SDL/mdm/frmMDMDatenverarbetiung.vb

@@ -815,7 +815,7 @@ Public Class frmMDMDatenverarbetiung
                         		AND (tblUTAImportNew.Lieferland = tblUTALeistungen.Lieferland) 
                         		AND (tblUTAImportNew.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) 
                         		ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart) as temp
-                        where isnull(temp.charged,0) = 0 and cast([Rechnungsdatum] as Date) = '" & DateTimePicker2.Text & "'  and temp.AdressenNr not in (756150, 711104) 
+                        where (temp.charged = 0 OR temp.charged IS NULL) and [Rechnungsdatum] >= '" & DateTimePicker2.Text & "' AND [Rechnungsdatum] <  '" & CDate(DateTimePicker2.Text).AddDays(1).ToShortDateString & "'  and temp.AdressenNr not in (756150, 711104) 
                         GROUP BY Kundennummer, KundenNr, [Name 1], LandKz, Ort", "FMZOLL")
             .LOAD()
             'MsgBox(.GET_SQL())