X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/96ebad9d2e62a0aecef0c4436a9b5aa7d50f28e1..a32fcad2cf3fabf15c9dd10ddc83ce703db66ad8:/SL/Controller/DeliveryOrder.pm

diff --git a/SL/Controller/DeliveryOrder.pm b/SL/Controller/DeliveryOrder.pm
index 5687e2769..8f3d838c8 100644
--- a/SL/Controller/DeliveryOrder.pm
+++ b/SL/Controller/DeliveryOrder.pm
@@ -6,6 +6,7 @@ use parent qw(SL::Controller::Base);
 use SL::Helper::Flash qw(flash_later);
 use SL::Helper::Number qw(_format_number_units _parse_number);
 use SL::Presenter::Tag qw(select_tag hidden_tag div_tag);
+use SL::Presenter::DeliveryOrder qw(delivery_order_status_line);
 use SL::Locale::String qw(t8);
 use SL::SessionFile::Random;
 use SL::PriceSource;
@@ -958,8 +959,8 @@ sub merge_stock_data {
   } else {
     for my $sinfo (@{ $stock_info }) {
       my $bin = SL::DB::Bin->load_cached($sinfo->{bin_id});
-      $sinfo->{warehouse_description} = $bin->warehouse->description;
-      $sinfo->{bin_description}       = $bin->description;
+      $sinfo->{warehousedescription} = $bin->warehouse->description;
+      $sinfo->{bindescription}       = $bin->description;
       map { $sinfo->{"stock_$_"}      = $sinfo->{$_} } qw(qty unit);
     }
   }
@@ -1039,6 +1040,8 @@ sub action_transfer_stock {
     return $self->js->flash("error", t8('The parts for this order have already been transferred'))->render;
   }
 
+  my $inout = $self->type_data->properties('transfer');
+
   my $errors = $self->save;
 
   if (@$errors) {
@@ -1049,7 +1052,7 @@ sub action_transfer_stock {
   my $order = $self->order;
 
   # TODO move to type data
-  my $trans_type = $self->type_data->properties('transfer') eq 'in'
+  my $trans_type = $inout eq 'in'
     ? SL::DB::Manager::TransferType->find_by(direction => "id", description => "stock")
     : SL::DB::Manager::TransferType->find_by(direction => "out", description => "shipped");
 
@@ -1059,8 +1062,9 @@ sub action_transfer_stock {
     for my $stock (@{ $item->delivery_order_stock_entries }) {
       my $transfer = SL::DB::Inventory->new_from($stock);
       $transfer->trans_type($trans_type);
+      $transfer->qty($transfer->qty * -1) if $inout eq 'out';
 
-      push @transfer_requests, $transfer;
+      push @transfer_requests, $transfer if defined $transfer->qty && $transfer->qty != 0;
     };
   }
 
@@ -1077,6 +1081,7 @@ sub action_transfer_stock {
     ->flash("info", t8("Stock transfered"))
     ->run('kivi.ActionBar.setDisabled', '#transfer_out_action', t8('The parts for this order have already been transferred'))
     ->run('kivi.ActionBar.setDisabled', '#transfer_in_action', t8('The parts for this order have already been transferred'))
+    ->replaceWith('#data-status-line', delivery_order_status_line($self->order))
     ->render;
 
 }
@@ -1376,7 +1381,7 @@ sub make_item {
       $obj->$_($line->{$_}) for qw(bin_id warehouse_id chargenumber qty unit);
       $obj->bestbefore_as_date($line->{bestfbefore})
         if $line->{bestbefore} && $::instance_conf->get_show_bestbefore;
-      push @save, $obj;
+      push @save, $obj if $obj->qty;
     }
 
     $item->delivery_order_stock_entries(@save);
@@ -1873,7 +1878,8 @@ sub setup_edit_action_bar {
         t8('Delete'),
         call     => [ 'kivi.DeliveryOrder.delete_order' ],
         confirm  => $::locale->text('Do you really want to delete this object?'),
-        disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef,
+        disabled => !$self->order->id       ? t8('This object has not been saved yet.') :
+                    $self->order->delivered ? t8('The parts for this order have already been transferred') : undef,
         only_if  => $self->type_data->show_menu("delete"),
       ],
 
@@ -1882,7 +1888,8 @@ sub setup_edit_action_bar {
           t8('Transfer out'),
           id   => 'transfer_out_action',
           call   => [ 'kivi.DeliveryOrder.save', 'transfer_stock' ],
-          disabled => $self->order->delivered ? t8('The parts for this order have already been transferred') : undef,
+          disabled => !$self->order->id ? t8('This object has not been saved yet.') :
+                      $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?'),
         ],
@@ -1890,7 +1897,8 @@ sub setup_edit_action_bar {
           t8('Transfer in'),
           id   => 'transfer_in_action',
           call   => [ 'kivi.DeliveryOrder.save', 'transfer_stock' ],
-          disabled => $self->order->delivered ? t8('The parts for this order have already been transferred') : undef,
+          disabled => !$self->order->id ? t8('This object has not been saved yet.') :
+                      $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?'),
         ],