Auftrags-Controller: Workflow -> Rechnung (Speichern und Rechnung erfassen)

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

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index ab4401e..04319e0 100644 (file)
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -4,7 +4,7 @@ use strict;
 use parent qw(SL::Controller::Base);
 
 use SL::Helper::Flash qw(flash_later);
-use SL::Presenter;
+use SL::Presenter::Tag qw(select_tag);
 use SL::Locale::String qw(t8);
 use SL::SessionFile::Random;
 use SL::PriceSource;
@@ -39,10 +39,10 @@ use Rose::Object::MakeMethods::Generic
 __PACKAGE__->run_before('_check_auth');
 
 __PACKAGE__->run_before('_recalc',
-                        only => [ qw(save save_and_delivery_order print create_pdf send_email) ]);
+                        only => [ qw(save save_and_delivery_order save_and_invoice print create_pdf send_email) ]);
 
 __PACKAGE__->run_before('_get_unalterable_data',
-                        only => [ qw(save save_and_delivery_order print create_pdf send_email) ]);
+                        only => [ qw(save save_and_delivery_order save_and_invoice print create_pdf send_email) ]);
 
 #
 # actions
@@ -211,13 +211,18 @@ sub action_print {
     }
   }
   if ($self->order->ordnumber && $::instance_conf->get_doc_storage) {
-    SL::File->save(  object_id     => $self->order->id,
+    eval {
+      SL::File->save(object_id     => $self->order->id,
                      object_type   => $self->type,
                      mime_type     => 'application/pdf',
                      source        => 'created',
                      file_type     => 'document',
                      file_name     => $pdf_filename,
                      file_contents => $pdf);
+      1;
+    } or do {
+      $self->js->flash('error', t8('Storing PDF in storage backend failed: #1', $@));
+    }
   }
   $self->js->render;
 }
@@ -335,6 +340,28 @@ sub action_save_and_delivery_order {
   $self->redirect_to(@redirect_params);
 }
 
+# save the order and redirect to the frontend subroutine for a new
+# invoice
+sub action_save_and_invoice {
+  my ($self) = @_;
+
+  my $errors = $self->_save();
+
+  if (scalar @{ $errors }) {
+    $self->js->flash('error', $_) foreach @{ $errors };
+    return $self->js->render();
+  }
+  flash_later('info', $::locale->text('The order has been saved'));
+
+  my @redirect_params = (
+    controller => 'oe.pl',
+    action     => 'oe_invoice_from_order',
+    id         => $self->order->id,
+  );
+
+  $self->redirect_to(@redirect_params);
+}
+
 # set form elements in respect to a changed customer or vendor
 #
 # This action is called on an change of the customer/vendor picker.
@@ -361,6 +388,7 @@ sub action_customer_vendor_changed {
     $self->order->taxincluded(defined($self->order->$cv_method->taxincluded_checked)
                               ? $self->order->$cv_method->taxincluded_checked
                               : $::myconfig{taxincluded_checked});
+    $self->js->val('#order_salesman_id', $self->order->$cv_method->salesman_id);
   }
 
   $self->order->payment_id($self->order->$cv_method->payment_id);
@@ -512,7 +540,7 @@ sub action_add_multi_items {
 
         # set discount to 100% if item isn't supposed to be charged, overwriting any customer discount
         $item->discount(1) unless $assortment_item->charge;
-        push @items, $assortment_item;
+        push @items, $item;
       }
     }
   }
@@ -766,12 +794,12 @@ sub _check_auth {
 sub build_contact_select {
   my ($self) = @_;
 
-  $self->p->select_tag('order.cp_id', [ $self->order->{$self->cv}->contacts ],
-                       value_key  => 'cp_id',
-                       title_key  => 'full_name_dep',
-                       default    => $self->order->cp_id,
-                       with_empty => 1,
-                       style      => 'width: 300px',
+  select_tag('order.cp_id', [ $self->order->{$self->cv}->contacts ],
+    value_key  => 'cp_id',
+    title_key  => 'full_name_dep',
+    default    => $self->order->cp_id,
+    with_empty => 1,
+    style      => 'width: 300px',
   );
 }
 
@@ -781,12 +809,12 @@ sub build_contact_select {
 sub build_shipto_select {
   my ($self) = @_;
 
-  $self->p->select_tag('order.shipto_id', [ $self->order->{$self->cv}->shipto ],
-                       value_key  => 'shipto_id',
-                       title_key  => 'displayable_id',
-                       default    => $self->order->shipto_id,
-                       with_empty => 1,
-                       style      => 'width: 300px',
+  select_tag('order.shipto_id', [ $self->order->{$self->cv}->shipto ],
+    value_key  => 'shipto_id',
+    title_key  => 'displayable_id',
+    default    => $self->order->shipto_id,
+    with_empty => 1,
+    style      => 'width: 300px',
   );
 }
 
@@ -1116,7 +1144,10 @@ sub _setup_edit_action_bar {
         action => [
           t8('Save and Delivery Order'),
           call      => [ 'kivi.Order.save_and_delivery_order', $::instance_conf->get_order_warn_duplicate_parts ],
-          accesskey => 'enter',
+        ],
+        action => [
+          t8('Save and Invoice'),
+          call      => [ 'kivi.Order.save_and_invoice', $::instance_conf->get_order_warn_duplicate_parts ],
         ],
 
       ], # end of combobox "Save"
@@ -1344,7 +1375,7 @@ java script functions
 
 =item * credit limit
 
-=item * more workflows (save as new / invoice)
+=item * more workflows (save as new, quotation, purchase order)
 
 =item * price sources: little symbols showing better price / better discount
 
@@ -1358,8 +1389,6 @@ java script functions
 
 =item * access rights
 
-=item * preset salesman from customer
-
 =item * display weights
 
 =item * history
@@ -1382,6 +1411,8 @@ java script functions
 Customer discount is not displayed as a valid discount in price source popup
 (this might be a bug in price sources)
 
+(I cannot reproduce this (Bernd))
+
 =item *
 
 No indication that <shift>-up/down expands/collapses second row.
@@ -1445,6 +1476,13 @@ editor or on text processing application).
 
 A warning when leaving the page without saveing unchanged inputs.
 
+=item *
+
+Workflows for delivery order and invoice are in the menu "Save", because the
+order is saved before opening the new document form. Nevertheless perhaps these
+workflow buttons should be put under "Workflows".
+
+
 =back
 
 =head1 AUTHOR