X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FLetter.pm;h=ed31c9349f78d385e8bfb0661f64ea99df0aa236;hb=65604fea85234a5ae3e787f7cafd81ece6b8621d;hp=ed48f41a9a680c481699d127f05eb31311f6cace;hpb=e7913c4ca30470b30b0585205c6badbe2f99e655;p=kivitendo-erp.git

diff --git a/SL/Controller/Letter.pm b/SL/Controller/Letter.pm
index ed48f41a9..ed31c9349 100644
--- a/SL/Controller/Letter.pm
+++ b/SL/Controller/Letter.pm
@@ -14,12 +14,14 @@ use SL::DB::Language;
 use SL::DB::Letter;
 use SL::DB::LetterDraft;
 use SL::DB::Printer;
+use SL::File;
 use SL::Helper::Flash qw(flash flash_later);
 use SL::Helper::CreatePDF;
 use SL::Helper::PrintOptions;
 use SL::Locale::String qw(t8);
 use SL::Mailer;
 use SL::IS;
+use SL::Presenter::Tag qw(select_tag);
 use SL::ReportGenerator;
 use SL::Webdav;
 use SL::Webdav::File;
@@ -105,7 +107,7 @@ sub action_update_contacts {
     return $self->js
       ->replaceWith(
         '#letter_cp_id',
-        SL::Presenter->get->select_tag('letter.cp_id', [], value_key => 'cp_id', title_key => 'full_name')
+        select_tag('letter.cp_id', [], value_key => 'cp_id', title_key => 'full_name')
       )
       ->render;
   }
@@ -124,7 +126,7 @@ sub action_update_contacts {
   $self->js
     ->replaceWith(
       '#letter_cp_id',
-      SL::Presenter->get->select_tag('letter.cp_id', $contacts, default => $default, value_key => 'cp_id', title_key => 'full_name')
+      select_tag('letter.cp_id', $contacts, default => $default, value_key => 'cp_id', title_key => 'full_name')
     )
     ->render;
 }
@@ -150,7 +152,7 @@ sub action_delete {
   my ($self, %params) = @_;
 
   if (!$self->letter->delete) {
-    flash('error', t8('An error occured. Letter could not be deleted.'));
+    flash('error', t8('An error occurred. Letter could not be deleted.'));
     return $self->action_update;
   }
 
@@ -183,8 +185,7 @@ sub action_list {
 sub action_print_letter {
   my ($self, %params) = @_;
 
-  my $display_form = $::form->{display_form} || "display_form";
-  my $letter       = $self->_update;
+  my $letter = $self->_update;
 
   my ($template_file, @template_files) = SL::Helper::CreatePDF->find_template(
     name        => 'letter',
@@ -207,7 +208,7 @@ sub action_print_letter {
       letter        => $letter,
       template_meta => {
         formname  => 'letter',
-        language  => SL::DB::Language->new,
+        language  => SL::DB::Manager::Language->find_by_or_create(id => $::form->{language_id}*1),
         extension => 'pdf',
         format    => $::form->{format},
         media     => $::form->{media},
@@ -235,17 +236,28 @@ sub action_print_letter {
       $webdav_file->store(file => $result{file_name});
     }
 
+    if ($::instance_conf->get_doc_storage) {
+      my %save_params = (object_id    => $letter->id,
+                         object_type  => 'letter',
+                         mime_type    => 'application/pdf',
+                         source       => 'created',
+                         file_type    => 'document',
+                         file_name    => $attachment_name,
+                         file_path    => $result{file_name});
+      SL::File->save(%save_params);
+    }
+
     # set some form defaults for printing webdav copy variables
     if ( $::form->{media} eq 'email') {
       my $mail             = Mailer->new;
       my $signature        = $::myconfig{signature};
       $mail->{$_}          = $params{email}->{$_} for qw(to cc subject message bcc);
       $mail->{from}        = qq|"$::myconfig{name}" <$::myconfig{email}>|;
-      $mail->{attachments} = [{ filename => $result{file_name},
-                                name     => $params{email}->{attachment_filename} }];
+      $mail->{attachments} = [{ path => $result{file_name},
+                                name => $params{email}->{attachment_filename} }];
       $mail->{message}    .=  "\n-- \n$signature";
       $mail->{message}     =~ s/\r//g;
-
+      $mail->{record_id}   =  $letter->id;
       $mail->send;
       unlink $result{file_name};
 
@@ -313,7 +325,7 @@ sub action_send_email {
 sub _display {
   my ($self, %params) = @_;
 
-  $::request->{layout}->use_javascript("${_}.js") for qw(ckeditor/ckeditor ckeditor/adapters/jquery kivi.Letter);
+  $::request->{layout}->use_javascript("${_}.js") for qw(ckeditor/ckeditor ckeditor/adapters/jquery kivi.Letter kivi.SalesPurchase kivi.File);
 
   my $letter = $self->letter;
 
@@ -322,9 +334,6 @@ sub _display {
   $::form->{type}             = 'letter';   # needed for print_options
   $::form->{vc}               = $letter->is_sales ? 'customer' : 'vendor'; # needs to be for _get_contacts...
 
-  $::request->layout->add_javascripts('customer_or_vendor_selection.js');
-  $::request->layout->add_javascripts('edit_part_window.js');
-
   $::form->{language_id} ||= $params{language_id};
   $::form->{languages}   ||= SL::DB::Manager::Language->get_all_sorted;
   $::form->{printers}      = SL::DB::Manager::Printer->get_all_sorted;
@@ -370,9 +379,9 @@ sub prepare_report {
   my %column_defs = (
     date                  => { text => t8('Date'),         sub => sub { $_[0]->date_as_date } },
     subject               => { text => t8('Subject'),      sub => sub { $_[0]->subject },
-                               obj_link => sub { $self->url_for(action => 'edit', 'letter.id' => $_[0]->id, callback => $self->models->get_callback) }  },
+                               obj_link => sub { $self->url_for(action => 'edit', 'letter.id' => $_[0]->id, is_sales => $self->is_sales, callback => $self->models->get_callback) }  },
     letternumber          => { text => t8('Letternumber'), sub => sub { $_[0]->letternumber },
-                               obj_link => sub { $self->url_for(action => 'edit', 'letter.id' => $_[0]->id, callback => $self->models->get_callback) }  },
+                               obj_link => sub { $self->url_for(action => 'edit', 'letter.id' => $_[0]->id, is_sales => $self->is_sales, callback => $self->models->get_callback) }  },
     customer_id           => { text => t8('Customer'),      sub => sub { SL::DB::Manager::Customer->find_by_or_create(id => $_[0]->customer_id)->displayable_name }, visible => $self->is_sales },
     vendor_id             => { text => t8('Vendor'),        sub => sub { SL::DB::Manager::Vendor->find_by_or_create(id => $_[0]->vendor_id)->displayable_name }, visible => !$self->is_sales},
     contact               => { text => t8('Contact'),       sub => sub { $_[0]->contact ? $_[0]->contact->full_name : '' } },
@@ -514,21 +523,6 @@ sub set_greetings {
   $letter->greeting(t8('Dear Sir or Madam,'));
 }
 
-sub export_letter_to_form {
-  my ($self, $letter) = @_;
-  # nope, not pretty.
-
-  $letter ||= $self->letter;
-
-  for ($letter->meta->columns) {
-    if ((ref $_) =~ /Date/i) {
-      $::form->{$_->name} = $letter->$_->to_kivitendo;
-    } else {
-      $::form->{$_->name} = $letter->$_;
-    }
-  }
-}
-
 sub init_letter {
   my ($self) = @_;
 
@@ -578,7 +572,6 @@ sub init_webdav_objects {
     number   => $self->letter->letternumber,
   );
 
-  my $webdav_path = $webdav->webdav_path;
   my @all_objects = $webdav->get_all_objects;
 
   return [ map {
@@ -595,11 +588,13 @@ sub init_is_sales {
 }
 
 sub check_auth_edit {
-  $::auth->assert('sales_letter_edit');
+  $_[0]->is_sales ? $::auth->assert('sales_letter_edit')
+                  : $::auth->assert('purchase_letter_edit');
 }
 
 sub check_auth_report {
-  $::auth->assert('sales_letter_report');
+  $_[0]->is_sales ? $::auth->assert('sales_letter_report')
+                  : $::auth->assert('purchase_letter_report');
 }
 
 sub setup_load_letter_draft_action_bar {