X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=js%2Fkivi.SalesPurchase.js;h=e8a1ba241cb3970764d50a558ba755c205bd2239;hb=e0fb092b1a1ac0429036b41abc0a85a011e0d9a8;hp=7637129f676c3a3897942533306c048bc1f727a2;hpb=dd33cbecc78ee154df73ebf578be8f660af2357c;p=kivitendo-erp.git

diff --git a/js/kivi.SalesPurchase.js b/js/kivi.SalesPurchase.js
index 7637129f6..e8a1ba241 100644
--- a/js/kivi.SalesPurchase.js
+++ b/js/kivi.SalesPurchase.js
@@ -32,8 +32,6 @@ namespace('kivi.SalesPurchase', function(ns) {
 
     $edit.val(params.default_longdescription);
 
-    kivi.init_text_editor($edit);
-
     $('#popup_edit_longdescription_runningnumber').html(params.runningnumber);
     $('#popup_edit_longdescription_partnumber').html(params.partnumber);
 
@@ -172,8 +170,9 @@ namespace('kivi.SalesPurchase', function(ns) {
     $('#shiptoname').focus();
   };
 
-  this.submit_custom_shipto = function() {
-    $('#shipto_id').val('');
+  this.submit_custom_shipto = function(id_selector) {
+    id_selector = id_selector || '#shipto_id';
+    $(id_selector).val('');
     $('#shipto_dialog').data('confirmed', true);
     $('#shipto_dialog').dialog('close');
   };
@@ -270,21 +269,24 @@ namespace('kivi.SalesPurchase', function(ns) {
 
     var vc   = $('#vc').val();
     var data = {
-      action:      'show_sales_purchase_email_dialog',
-      cp_id:       $('#cp_id').val(),
-      donumber:    $('#donumber').val(),
-      format:      $('#format').val(),
-      formname:    $('#formname').val(),
-      id:          $('#id').val(),
-      invnumber:   $('#invnumber').val(),
-      language_id: $('#language_id').val(),
-      media:       'email',
-      ordnumber:   $('#ordnumber').val(),
-      rowcount:    $('#rowcount').val(),
-      quonumber:   $('#quonumber').val(),
-      type:        $('#type').val(),
-      vc:          vc,
-      vc_id:       $('#' + vc + '_id').val(),
+      action:       'show_sales_purchase_email_dialog',
+      cp_id:        $('#cp_id').val(),
+      direct_debit: $('#direct_debit').prop('checked') ? 1 : 0,
+      donumber:     $('#donumber').val(),
+      format:       $('#format').val(),
+      formname:     $('#formname').val(),
+      id:           $('#id').val(),
+      invnumber:    $('#invnumber').val(),
+      language_id:  $('#language_id').val(),
+      media:        'email',
+      ordnumber:    $('#ordnumber').val(),
+      cusordnumber: $('#cusordnumber').val(),
+      rowcount:     $('#rowcount').val(),
+      quonumber:    $('#quonumber').val(),
+      type:         $('#type').val(),
+      vc:           vc,
+      vc_id:        $('#' + vc + '_id').val(),
+      project_id:  $('#globalproject_id').val(),
     };
 
     $('[name^=id_],[name^=partnumber_]').each(function(idx, elt) {
@@ -311,7 +313,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.