X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fkivi.SalesPurchase.js;h=86704f24655710f2af630a0f445ba9fdeec50c21;hb=4b1666b74b0fa70077c64144a57526a1d64b4e64;hp=3eae14e946b4e7fba676842441b40b6918ee363d;hpb=10852277fadcc965e883724a6e9b6fefc5026d8c;p=kivitendo-erp.git

diff --git a/js/kivi.SalesPurchase.js b/js/kivi.SalesPurchase.js
index 3eae14e94..86704f246 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);
 
@@ -224,22 +222,28 @@ namespace('kivi.SalesPurchase', function(ns) {
   };
 
   // Sending records via email.
-  this.send_email = function() {
+  this.check_required_email_fields = function() {
     var unset = $('#email_form_to,#email_form_subject,#email_form_message').filter(function(idx, elt) {
       return $(elt).val() === '';
     });
 
-    if (unset.length > 0) {
-      alert(kivi.t8("The recipient, subject or body is missing."));
-      $(unset[0]).focus();
+    if (unset.length === 0)
+      return true;
+
+    alert(kivi.t8("The recipient, subject or body is missing."));
+    $(unset[0]).focus();
+
+    return false;
+  };
 
+  this.send_email = function() {
+    if (!kivi.SalesPurchase.check_required_email_fields())
       return false;
-    }
 
     $('#send_email_dialog').children().remove().appendTo('#email_inputs');
     $('#send_email_dialog').dialog('close');
 
-    kivi.submit_form_with_action('#form', 'send_sales_purchase_email');
+    kivi.submit_form_with_action('#form', $('#form').data('send-email-action'));
 
     return true;
   };
@@ -259,24 +263,39 @@ namespace('kivi.SalesPurchase', function(ns) {
     return true;
   };
 
-  this.show_email_dialog = function() {
+  this.show_email_dialog = function(send_action) {
+    $('#form').data('send-email-action', send_action || 'send_sales_purchase_email');
+
+    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(),
+    };
+
+    $('[name^=id_],[name^=partnumber_]').each(function(idx, elt) {
+      var val = $(elt).val() || '';
+      if (val !== '')
+        data[ $(elt).attr('name') ] = val;
+    });
+
     kivi.popup_dialog({
       id:     'send_email_dialog',
       url:    'io.pl',
       load:   kivi.SalesPurchase.setup_send_email_dialog,
-      data:   {
-        action:      'show_sales_purchase_email_dialog',
-        type:        $('#type').val(),
-        formname:    $('#formname').val(),
-        format:      $('#format').val(),
-        media:       'email',
-        ordnumber:   $('#ordnumber').val(),
-        donumber:    $('#donumber').val(),
-        invnumber:   $('#invnumber').val(),
-        quonumber:   $('#quonumber').val(),
-        cp_id:       $('#cp_id').val(),
-        language_id: $('#language_id').val(),
-      },
+      data:   data,
       dialog: {
         height:      600,
         title:       kivi.t8('Send email'),
@@ -287,6 +306,12 @@ namespace('kivi.SalesPurchase', function(ns) {
     return true;
   };
 
+  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']();
+  };
+
   // Printing records.
   this.setup_print_dialog = function() {
     kivi.SalesPurchase.show_all_print_options_elements();
@@ -303,7 +328,11 @@ namespace('kivi.SalesPurchase', function(ns) {
   this.print_record = function() {
     $('#print_dialog').dialog('close');
 
-    kivi.submit_form_with_action('#form', $('#form').data('print-action'));
+    var action = $('#form').data('print-action');
+    if (action.match("^js:"))
+      return kivi.run(action.substring(3));
+
+    kivi.submit_form_with_action('#form', action);
   };
 
   this.show_print_dialog = function(print_action) {