Letter: "alle" E-Mail-Adressen per Anhaken als Empfänger

diff --git a/SL/Controller/Letter.pm b/SL/Controller/Letter.pm
index 4da3e1918dfac81e6020a27ea78c63b0e8503bb8..4faf452cf60248f4d1232f4dc0769e0ace1cab45 100644 (file)
--- a/SL/Controller/Letter.pm
+++ b/SL/Controller/Letter.pm
@@ -620,6 +620,8 @@ sub setup_load_letter_draft_action_bar {
 sub setup_display_action_bar {
   my ($self, %params) = @_;
 
 sub setup_display_action_bar {
   my ($self, %params) = @_;
 

+  my $vc = $self->is_sales ? 'customer' : 'vendor'; # needed for show_email_dialog
+

   for my $bar ($::request->layout->get('actionbar')) {
     $bar->add(
       action => [
   for my $bar ($::request->layout->get('actionbar')) {
     $bar->add(
       action => [


@@ -655,7 +657,7 @@ sub setup_display_action_bar {
         ],
         action => [
           t8('E-mail'),
         ],
         action => [
           t8('E-mail'),

-          call     => [ 'kivi.SalesPurchase.show_email_dialog', 'Letter/send_email' ],
+          call     => [ 'kivi.SalesPurchase.show_email_dialog', 'Letter/send_email', $vc, '#letter_' . $vc . '_id' ],

           disabled => !$self->letter->id ? t8('The object has not been saved yet.') : undef,
         ],
       ],
           disabled => !$self->letter->id ? t8('The object has not been saved yet.') : undef,
         ],
       ],

diff --git a/js/kivi.SalesPurchase.js b/js/kivi.SalesPurchase.js
index 2b13dd8669d6366c4333fa2e20035964d65c376d..a350e1963d06f3f777bb0cb238e0de74b5812046 100644 (file)
--- a/js/kivi.SalesPurchase.js
+++ b/js/kivi.SalesPurchase.js
@@ -274,10 +274,13 @@ namespace('kivi.SalesPurchase', function(ns) {
     return true;
   };
 
     return true;
   };
 

-  this.show_email_dialog = function(send_action) {
+  this.show_email_dialog = function(send_action, vc, vc_id_selector) {

     $('#form').data('send-email-action', send_action || 'send_sales_purchase_email');
 
     $('#form').data('send-email-action', send_action || 'send_sales_purchase_email');
 

-    var vc   = $('#vc').val();
+    vc             = vc             || $('#vc').val();
+    vc_id_selector = vc_id_selector || '#' + vc + '_id';
+    var vc_id = $(vc_id_selector).val();
+

     var data = {
       action:       'show_sales_purchase_email_dialog',
       cp_id:        $('#cp_id').val(),
     var data = {
       action:       'show_sales_purchase_email_dialog',
       cp_id:        $('#cp_id').val(),


@@ -295,7 +298,7 @@ namespace('kivi.SalesPurchase', function(ns) {
       quonumber:    $('#quonumber').val(),
       type:         $('#type').val(),
       vc:           vc,
       quonumber:    $('#quonumber').val(),
       type:         $('#type').val(),
       vc:           vc,

-      vc_id:        $('#' + vc + '_id').val(),
+      vc_id:        vc_id,

       project_id:  $('#globalproject_id').val(),
     };
 
       project_id:  $('#globalproject_id').val(),
     };