X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fkivi.SalesPurchase.js;h=771351cf57ce5093e9c3b565554e568c914397e0;hb=824735fcfa7c7bb9a5e76ceb2214c6a7cb42e60a;hp=98a538c194d97896430c9417cb5d4b95e7ee2ad3;hpb=bc0386a49ddf723675331faeae842447d8c1fa2e;p=kivitendo-erp.git

diff --git a/js/kivi.SalesPurchase.js b/js/kivi.SalesPurchase.js
index 98a538c19..771351cf5 100644
--- a/js/kivi.SalesPurchase.js
+++ b/js/kivi.SalesPurchase.js
@@ -241,9 +241,17 @@ namespace('kivi.SalesPurchase', function(ns) {
     if (!kivi.SalesPurchase.check_required_email_fields())
       return false;
 
+    // ckeditor gets de-initialized when removing the children from
+    // the DOM. Therefore we have to manually preserve its content
+    // over the children's relocation.
+
+    var message = $('#email_form_message').val();
+
     $('#send_email_dialog').children().remove().appendTo('#email_inputs');
     $('#send_email_dialog').dialog('close');
 
+    $('#email_form_message').val(message);
+
     kivi.submit_form_with_action('#form', $('#form').data('send-email-action'));
 
     return true;
@@ -255,6 +263,8 @@ namespace('kivi.SalesPurchase', function(ns) {
 
     $('#print_options').children().remove().appendTo('#email_form_print_options');
 
+    kivi.reinit_widgets();
+
     var to_focus = $('#email_form_to').val() === '' ? 'to' : 'subject';
     $('#email_form_' + to_focus).focus();
   };
@@ -313,7 +323,7 @@ namespace('kivi.SalesPurchase', function(ns) {
   this.activate_send_email_actions_regarding_printout = function() {
     var selected = $('#email_form_attachment_policy').val();
     $('#email_form_attachment_filename').parents('tr')[selected !== 'no_file' ? 'show' : 'hide']();
-    $('#email_form_print_options')[selected === 'normal' ? 'show' : 'hide']();
+    $('#email_form_print_options')[selected !== 'no_file' ? 'show' : 'hide']();
   };
 
   // Printing records.