Order-Controller: Historienfunktion implementiert (aufzeichnen & anzeigen)

[kivitendo-erp.git] / SL / Controller / Letter.pm

diff --git a/SL/Controller/Letter.pm b/SL/Controller/Letter.pm
index beb1a46..32e3768 100644 (file)
--- a/SL/Controller/Letter.pm
+++ b/SL/Controller/Letter.pm
@@ -106,7 +106,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;
   }
@@ -151,7 +151,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;
   }
 
@@ -184,8 +184,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',
@@ -208,7 +207,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},
@@ -314,7 +313,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);
 
   my $letter = $self->letter;
 
@@ -512,21 +511,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) = @_;