X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FLetter.pm;h=553fe0a86a2dddb0341293a4e4f5acbba5ba117b;hb=4b65183fea159f1912c806b159cee0fbbcbe7f46;hp=7905cb759161a7dd4cf30b90665c7159e7fdbf83;hpb=3a91ef77385d9302a4669502695ef17fdd99c285;p=kivitendo-erp.git

diff --git a/SL/Controller/Letter.pm b/SL/Controller/Letter.pm
index 7905cb759..553fe0a86 100644
--- a/SL/Controller/Letter.pm
+++ b/SL/Controller/Letter.pm
@@ -36,7 +36,7 @@ my %sort_columns = (
   date                  => t8('Date'),
   subject               => t8('Subject'),
   letternumber          => t8('Letternumber'),
-  vc_id                 => t8('Customer'),
+  customer_id           => t8('Customer'),
   contact               => t8('Contact'),
 );
 
@@ -94,7 +94,7 @@ sub action_update_contacts {
 
   my $letter = $self->letter;
 
-  if (!$self->letter->vc_id || !$self->letter->customer) {
+  if (!$self->letter->customer_id || !$self->letter->customer) {
     return $self->js
       ->replaceWith(
         '#letter_cp_id',
@@ -108,7 +108,7 @@ sub action_update_contacts {
   my $default;
   if (   $letter->contact
       && $letter->contact->cp_cv_id
-      && $letter->contact->cp_cv_id == $letter->vc_id) {
+      && $letter->contact->cp_cv_id == $letter->customer_id) {
     $default = $letter->contact->cp_id;
   } else {
     $default = '';
@@ -178,37 +178,6 @@ sub action_print_letter {
   my $display_form = $::form->{display_form} || "display_form";
   my $letter       = $self->_update;
 
-  $self->export_letter_to_form($letter);
-  $::form->{formname} = "letter";
-  $::form->{type}     = "letter";
-  $::form->{format}   = "pdf";
-
-  my $language_saved      = $::form->{language_id};
-  my $greeting_saved      = $::form->{greeting};
-  my $cp_id_saved         = $::form->{cp_id};
-
-  $::form->{customer_id} = $self->letter->vc_id;
-  IS->customer_details(\%::myconfig, $::form);
-
-  if (!$cp_id_saved) {
-    # No contact was selected. Delete all contact variables because
-    # IS->customer_details() and IR->vendor_details() get the default
-    # contact anyway.
-    map({ delete($::form->{$_}); } grep(/^cp_/, keys(%{ $::form })));
-  }
-
-  $::form->{greeting} = $greeting_saved;
-  $::form->{language_id} = $language_saved;
-
-  if ($::form->{cp_id}) {
-    CT->get_contact(\%::myconfig, $::form);
-  }
-
-  $::form->{cp_contact_formal} = ($::form->{cp_greeting} ? "$::form->{cp_greeting} " : '') . ($::form->{cp_givenname} ? "$::form->{cp_givenname} " : '') . $::form->{cp_name};
-
-  $::form->get_employee_data('prefix' => 'employee', 'id' => $letter->{employee_id});
-  $::form->get_employee_data('prefix' => 'salesman', 'id' => $letter->{salesman_id});
-
   my ($template_file, @template_files) = SL::Helper::CreatePDF->find_template(
     name        => 'letter',
     printer_id  => $::form->{printer_id},
@@ -221,20 +190,29 @@ sub action_print_letter {
     $::form->error($::locale->text('Cannot find matching template for this print request. Please contact your template maintainer. I tried these: #1.', join ', ', map { "'$_'"} @template_files));
   }
 
-  my %create_params = (
-    template  => $template_file,
-    variables => $::form,
-    return    => 'file_name',
-    variable_content_types => {
-      body                 => 'html',
-    },
-  );
-
-  my $pdf_file_name;
+  my %result;
   eval {
-    $pdf_file_name          = SL::Helper::CreatePDF->create_pdf(%create_params);
+    %result = SL::Template::LaTeX->parse_and_create_pdf(
+      $template_file,
+      SELF          => $self,
+      FORM          => $::form,
+      letter        => $letter,
+      template_meta => {
+        formname  => 'letter',
+        language  => SL::DB::Language->new,
+        extension => 'pdf',
+        format    => $::form->{format},
+        media     => $::form->{media},
+        printer   => SL::DB::Manager::Printer->find_by_or_create(id => $::form->{printer_id} || undef),
+        today     => DateTime->today,
+      },
+    );
 
-    $::form->{letternumber} = $self->letter->letternumber;
+    die $result{error} if $result{error};
+
+    $::form->{type}         = 'letter';
+    $::form->{formname}     = 'letter';
+    $::form->{letternumber} = $letter->letternumber;
     my $attachment_name     = $::form->generate_attachment_filename;
 
     if ($::instance_conf->get_webdav_documents) {
@@ -242,11 +220,11 @@ sub action_print_letter {
         filename => $attachment_name,
         webdav   => SL::Webdav->new(
           type   => 'letter',
-          number => $self->letter->letternumber,
+          number => $letter->letternumber,
         ),
       );
 
-      $webdav_file->store(file => $pdf_file_name);
+      $webdav_file->store(file => $result{file_name});
     }
 
     # set some form defaults for printing webdav copy variables
@@ -255,23 +233,23 @@ sub action_print_letter {
       my $signature        = $::myconfig{signature};
       $mail->{$_}          = $params{email}->{$_} for qw(to cc subject message bcc);
       $mail->{from}        = qq|"$::myconfig{name}" <$::myconfig{email}>|;
-      $mail->{attachments} = [{ filename => $pdf_file_name,
+      $mail->{attachments} = [{ filename => $result{file_name},
                                 name     => $params{email}->{attachment_filename} }];
       $mail->{message}    .=  "\n-- \n$signature";
       $mail->{message}     =~ s/\r//g;
 
       $mail->send;
-      unlink $pdf_file_name;
+      unlink $result{file_name};
 
       flash_later('info', t8('The email has been sent.'));
-      $self->redirect_to(action => 'edit', 'letter.id' => $self->letter->id);
+      $self->redirect_to(action => 'edit', 'letter.id' => $letter->id);
 
       return 1;
     }
 
     if (!$::form->{printer_id} || $::form->{media} eq 'screen') {
-      $self->send_file($pdf_file_name, name => $attachment_name);
-      unlink $pdf_file_name;
+      $self->send_file($result{file_name}, name => $attachment_name);
+      unlink $result{file_name};
 
       return 1;
     }
@@ -279,16 +257,16 @@ sub action_print_letter {
     my $printer = SL::DB::Printer->new(id => $::form->{printer_id})->load;
     $printer->print_document(
       copies    => $::form->{copies},
-      file_name => $pdf_file_name,
+      file_name => $result{file_name},
     );
 
-    unlink $pdf_file_name;
+    unlink $result{file_name};
 
     flash_later('info', t8('The documents have been sent to the printer \'#1\'.', $printer->printer_description));
-    $self->redirect_to(action => 'edit', 'letter.id' => $self->letter->id, media => 'printer', printer_id => $::form->{printer_id});
+    $self->redirect_to(action => 'edit', 'letter.id' => $letter->id, media => 'printer', printer_id => $::form->{printer_id});
     1;
   } or do {
-    unlink $pdf_file_name if $pdf_file_name;
+    unlink $result{file_name} if $result{file_name};
     $::form->error(t8("Creating the PDF failed:") . " " . $@);
   };
 }
@@ -308,7 +286,10 @@ sub action_skip_draft {
 
 sub action_delete_drafts {
   my ($self) = @_;
-  delete_letter_drafts();
+
+  my @ids = @{ $::form->{ids} || [] };
+  SL::DB::Manager::LetterDraft->delete_all(where => [ id => \@ids ]) if @ids;
+
   $self->action_add(skip_drafts => 1);
 }
 
@@ -405,8 +386,8 @@ sub prepare_report {
   my $report      = SL::ReportGenerator->new(\%::myconfig, $::form);
   $self->{report} = $report;
 
-  my @columns  = qw(date subject letternumber vc_id contact date);
-  my @sortable = qw(date subject letternumber vc_id contact date);
+  my @columns  = qw(date subject letternumber customer_id contact date);
+  my @sortable = qw(date subject letternumber customer_id contact date);
 
   my %column_defs = (
     date                  => { text => t8('Date'),         sub => sub { $_[0]->date_as_date } },
@@ -414,7 +395,7 @@ sub prepare_report {
                                obj_link => sub { $self->url_for(action => 'edit', 'letter.id' => $_[0]->id, 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) }  },
-    vc_id                 => { text => t8('Customer'),      sub => sub { SL::DB::Manager::Customer->find_by_or_create(id => $_[0]->vc_id)->displayable_name } },
+    customer_id           => { text => t8('Customer'),      sub => sub { SL::DB::Manager::Customer->find_by_or_create(id => $_[0]->customer_id)->displayable_name } },
     contact               => { text => t8('Contact'),       sub => sub { $_[0]->contact ? $_[0]->contact->full_name : '' } },
   );
 
@@ -571,7 +552,7 @@ sub init_letter {
                                            ->assign_attributes(%{ $::form->{letter} });
 
   if ($letter->cp_id) {
-#     $letter->vc_id($letter->contact->cp_cv_id);
+#     $letter->customer_id($letter->contact->cp_cv_id);
       # contacts don't have language_id yet
 #     $letter->greeting(GenericTranslations->get(
 #       translation_type => 'greetings::' . ($letter->contact->cp_gender eq 'f' ? 'female' : 'male'),