MS Common

EnvelopeGenerator.Form/Controllers/BaseController.vb

@@ -28,7 +28,7 @@ Public MustInherit Class BaseController
         State = pState
         Database = pState.Database
         InitializeModels(pState)
-        ActionService = New ActionService(pState, Nothing)
+        ActionService = New ActionService(pState, Database)
     End Sub
 
     Private Sub InitializeModels(pState As State)

EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb

@@ -22,7 +22,7 @@ Public Class EnvelopeEditorController
         Envelope = CreateEnvelope()
         Thumbnail = New Thumbnail(pState.LogConfig)
         EmailService = New EmailService(pState)
-        ActionService = New ActionService(pState)
+        ActionService = New ActionService(pState, Nothing)
     End Sub
 
     Public Sub New(pState As State, pEnvelope As Envelope)
@@ -33,7 +33,7 @@ Public Class EnvelopeEditorController
         Envelope.Receivers = ReceiverModel.ListEnvelopeReceivers(pEnvelope.Id).ToList()
 
         Thumbnail = New Thumbnail(pState.LogConfig)
-        ActionService = New ActionService(pState)
+        ActionService = New ActionService(pState, Nothing)
     End Sub
 
 #Region "Public"

EnvelopeGenerator.Form/frmEnvelopeMainData.vb

@@ -65,6 +65,9 @@ Public Class frmEnvelopeMainData
                 chked_2Faktor.EditValue = DEF_TF_ENABLED
 
             Else
+                If IsNothing(Envelope.EnvelopeType) Then
+                    Envelope.EnvelopeType = EnvelopeType
+                End If
                 If Envelope.EnvelopeType.ContractType = 0 Then
                     cmbEnvelopeType.EditValue = EnvelopeType
                 Else