Offerten ueberarbeitet, Bonität verbessert

SDL/kunden/usrCntlOfferte.vb

@@ -52,14 +52,12 @@ Public Class usrCntlOfferte
 
 
         With dgvOfferteNew
-            .DataSource = SQL.loadDgvBySql("SELECT Offerten.OffertenNr, cast(Offerten.OffertenNr as varchar(3)) + ' - ' + Offertenstamm.OffertenBez as OffertenBez ,Offerten.Besonderheiten, Offerten.Art as Art FROM Offerten inner join Offertenstamm on [Offerten].OffertenNr=Offertenstamm.OffertenNr WHERE Offerten.KundenNr='" & kdNr & "'  " & where & " ORDER BY Offerten.OffertenNr ", "FMZOLL")
+            .DataSource = SQL.loadDgvBySql("SELECT Offerten.OffertenNr, cast(Offerten.OffertenNr as varchar(3)) + ' - ' + Offertenstamm.OffertenBez as OffertenBez ,Offerten.Besonderheiten FROM Offerten inner join Offertenstamm on [Offerten].OffertenNr=Offertenstamm.OffertenNr WHERE Offerten.KundenNr='" & kdNr & "'  " & where & " ORDER BY Offerten.OffertenNr ", "FMZOLL")
             .Columns("OffertenNr").Visible = False
             .Columns("Besonderheiten").Visible = False
             ' .Columns("OffertenNr").HeaderText = "Nr"
             .Columns("OffertenBez").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
             .Columns("OffertenBez").HeaderText = "Bezeichnung"
-            .Columns("Art").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
-            .Columns("Art").HeaderText = "Art"
         End With
 
     End Sub
@@ -152,7 +150,6 @@ Public Class usrCntlOfferte
 
 
 
-
     Private Sub dgvOfferteDetails_SelectionChanged(sender As Object, e As EventArgs) Handles dgvOfferteNew.SelectionChanged
 
         cbxArchivierteOffertenAnzeigen.Checked = False
@@ -315,11 +312,20 @@ Public Class usrCntlOfferte
             dgvOfferteDetails.Rows(e.RowIndex).Cells("Sachbearbeiter").Value = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
             dgvOfferteDetails.Rows(e.RowIndex).Cells("Geändert am").Value = Now
             DGVHasChaged = True
+            saveCurrentOffert()
+            If isNew = True Then
+
+                currentOffert.Art = "Neuanlage"
+                currentOffert.SAVE()
+
+            Else
+
+                currentOffert.Art = "Geändert"
+                currentOffert.SAVE()
+            End If
 
         End If
-        saveCurrentOffert()
-        currentOffert.Art = "Geändert"
-        currentOffert.SAVE()
+
         'DGVHasChaged = True
 
     End Sub
@@ -327,9 +333,10 @@ Public Class usrCntlOfferte
     Private Sub btnDeleteOfferte_Click(sender As Object, e As EventArgs) Handles btnDeleteOfferte.Click
         If dgvOfferteNew.SelectedRows.Count = 1 Then
             If vbYes = MsgBox("Möchten Sie das Offert '" & dgvOfferteNew.SelectedRows(0).Cells("OffertenBez").Value & "' wirklich löschen", vbYesNoCancel) Then
-                currentOffert.Art = "gelöscht"
+                saveCurrentOffert()
+                currentOffert.Art = "Gelöscht"
                 currentOffert.SAVE()
-                saveArchivierteOfferteNew()
+                OfferteArchivieren()
                 If SQL.doSQL("DELETE FROM Offerten where [KundenNr]='" & kdNr & "' AND [OffertenNr]='" & dgvOfferteNew.SelectedRows(0).Cells("OffertenNr").Value & "' ", "FMZOLL") Then
                     initDGVOfferte()
                     RaiseEvent OfferteChanged()
@@ -345,7 +352,7 @@ Public Class usrCntlOfferte
         checkPerimissionsDGVDetails()
         edit = False
         handleEditMode(edit)
-        'saveToArchive()
+        saveToArchive()
 
         OFFERTEBind.updateBinding()
         RaiseEvent OfferteChanged()
@@ -357,9 +364,6 @@ Public Class usrCntlOfferte
 
         edit = True
         handleEditMode(edit)
-        'currentOffert.Art = "Geändert"
-        'currentOffert.SAVE()
-        'saveCurrentOffert()
         checkPerimissionsDGVDetails()
 
     End Sub
@@ -641,51 +645,6 @@ Public Class usrCntlOfferte
         End If
     End Sub
 
-    Private Sub saveArchivierteOfferte(Optional forceSave As Boolean = False)
-
-
-        If isNew = False AndAlso isStandard = False Or isNew AndAlso isStandard = False Then 'Neuanlage oder Anlage über "Standardoffert laden" speichern, 
-            If DGVHasChaged = False Then Exit Sub
-        End If
-
-        If isStandard Then
-            If DGVHasChaged = False AndAlso isNew Then
-                OfferteArchivieren()
-                isNew = False
-                Exit Sub
-            ElseIf DGVHasChaged = True AndAlso isNew Then
-                OfferteArchivieren()
-                isNew = False
-                Exit Sub
-
-            End If
-            isStandard = False
-        Else
-
-            If DGVHasChaged Then
-                If isNew = False Then
-
-                    OfferteArchivieren()
-                    Exit Sub
-
-                Else
-                    If isNew Then
-                        OfferteArchivieren()
-                        isNew = False
-                    End If
-
-                End If
-            End If
-        End If
-
-    End Sub
-
-    Private Sub saveArchivierteOfferteNew(Optional forceSave As Boolean = False)
-
-        OfferteArchivieren()
-
-    End Sub
-
 
     Private Sub saveToArchive()
 
@@ -704,15 +663,11 @@ Public Class usrCntlOfferte
 
             If DGVHasChaged Then
                 If isNew = False Then
-                    isNew = False
                     OfferteArchivieren()
                     Exit Sub
 
                 Else
                     If isNew Then
-                        'currentOffert.Art = "Neuanlage"
-                        'currentOffert.SAVE()
-                        'isNew = False
                         OfferteArchivieren()
                         isNew = False
                     End If