X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/72589ebeb899e839f353eac75d3788be4b32ff39..575baa0abd4cbd84f2f1aab53d858d1003a475cd:/SL/Controller/DeliveryOrder.pm

diff --git a/SL/Controller/DeliveryOrder.pm b/SL/Controller/DeliveryOrder.pm
index 3878e5a64..91af197da 100644
--- a/SL/Controller/DeliveryOrder.pm
+++ b/SL/Controller/DeliveryOrder.pm
@@ -26,6 +26,7 @@ use SL::DB::Language;
 use SL::DB::RecordLink;
 use SL::DB::Shipto;
 use SL::DB::Translation;
+use SL::DB::TransferType;
 
 use SL::Helper::CreatePDF qw(:all);
 use SL::Helper::PrintOptions;
@@ -406,7 +407,7 @@ sub action_save_and_show_email_dialog {
                                   email_form  => $email_form,
                                   show_bcc    => $::auth->assert('email_bcc', 'may fail'),
                                   FILES       => \%files,
-                                  is_customer => $self->cv eq 'customer',
+                                  is_customer => $self->type_data->is_customer,
                                   ALL_EMPLOYEES => $self->{all_employees},
   );
 
@@ -664,6 +665,7 @@ sub action_add_item {
                                      ITEM => $item,
                                      ID   => $item_id,
                                      SELF => $self,
+                                     in_out => $self->type_data->transfer,
   );
 
   if ($::form->{insert_before_item_id}) {
@@ -751,6 +753,7 @@ sub action_add_multi_items {
                                        ITEM => $item,
                                        ID   => $item_id,
                                        SELF => $self,
+                                       in_out => $self->type_data->transfer,
     );
 
     if ($::form->{insert_before_item_id}) {
@@ -950,6 +953,50 @@ sub action_update_row_from_master_data {
   $self->js->render();
 }
 
+sub action_transfer_stock {
+  my ($self) = @_;
+
+  if ($self->order->delivered) {
+    return $self->js->flash("error", t8('The parts for this order have already been transferred'))->render;
+  }
+
+  my $errors = $self->save;
+
+  if (@$errors) {
+    $self->js->flash('error', $_) for @$errors;
+    return $self->js->render;
+  }
+
+  my $order = $self->order;
+
+  # TODO move to type data
+  my $trans_type = $self->type_data->properties('transfer') eq 'in'
+    ? SL::DB::Manager::TransferType->find_by(direction => "id", description => "stock")
+    : SL::DB::Manager::TransferType->find_by(direction => "out", deescription => "shipped");
+
+  my @transfer_requests;
+
+  for my $item (@{ $order->items_sorted }) {
+    for my $stock (@{ $item->delivery_order_stock_entries }) {
+      my $transfer = SL::DB::Inventory->new_from($stock);
+      $transfer->trans_type($trans_type);
+
+      push @transfer_requests, $transfer;
+    };
+  }
+
+  if (!@transfer_requests) {
+    $self->js->flash("error", t8("No stock to transfer"))->render;
+  }
+
+  SL::DB->with_transaction(sub {
+    $_->save for @transfer_requests;
+    $self->order->update_attributes(deliverd => 1);
+  });
+
+  $self->js->flash("info", t8("Stock transfered"))->render;
+}
+
 sub js_load_second_row {
   my ($self, $item, $item_id, $do_parse) = @_;
 
@@ -1541,7 +1588,6 @@ sub workflow_sales_or_purchase_order {
   );
 }
 
-
 sub pre_render {
   my ($self) = @_;
 
@@ -1593,7 +1639,7 @@ sub pre_render {
                                                 } } @all_objects;
   }
 
-  $self->{template_args}{inout} = $self->type_data->properties('transfer');
+  $self->{template_args}{in_out} = $self->type_data->transfer;
 
   $self->get_item_cvpartnumber($_) for @{$self->order->items_sorted};
 
@@ -1707,6 +1753,23 @@ sub setup_edit_action_bar {
         only_if  => $self->type_data->show_menu("delete"),
       ],
 
+      combobox => [
+        action => [
+          t8('Transfer out'),
+          submit   => [ '#order_form', { action => "DeliveryOrder/transfer_stock" } ],
+          disabled => $self->order->delivered ? t8('The parts for this order have already been transferred') : undef,
+          only_if => $self->type_data->properties('transfer') eq 'out',
+          confirm  => t8('Do you really want to transfer the stock and set this order to delivered?'),
+        ],
+        action => [
+          t8('Transfer in'),
+          submit   => [ '#order_form', { action => "DeliveryOrder/transfer_stock" } ],
+          disabled => $self->order->delivered ? t8('The parts for this order have already been transferred') : undef,
+          only_if => $self->type_data->properties('transfer') eq 'in',
+          confirm  => t8('Do you really want to transfer the stock and set this order to delivered?'),
+        ],
+      ],
+
       combobox => [
         action => [
           t8('more')
@@ -1944,12 +2007,14 @@ sub store_pdf_to_webdav_and_filemanagement {
 sub calculate_stock_in_out {
   my ($self, $item) = @_;
 
-  return "" if !$item->part || !$item->part->unit;
+  return "" if !$item->part || !$item->part->unit || !$item->unit;
 
-  my $in_out   = $self->type_data->properties("transfer");
+  my $in_out   = $self->type_data->transfer;
 
   my $do_qty   = $item->qty;
-  my $sum      = sum0 map { $_->unit_obj->convert_to($_->qty, $item->unit_obj) } @{ $item->delivery_order_stock_entries };
+  my $sum      = sum0 map {
+    $_->unit_obj->convert_to($_->qty, $item->unit_obj)
+  } $item->delivery_order_stock_entries;
 
   my $matches  = $do_qty == $sum;
   my $content  = _format_number_units($sum, 2, $item->unit_obj, $item->part->unit_obj);