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

diff --git a/SL/Controller/DeliveryOrder.pm b/SL/Controller/DeliveryOrder.pm
index 80a0d2eb8..8f3d838c8 100644
--- a/SL/Controller/DeliveryOrder.pm
+++ b/SL/Controller/DeliveryOrder.pm
@@ -959,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);
     }
   }
@@ -1878,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"),
       ],
 
@@ -1887,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?'),
         ],
@@ -1895,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?'),
         ],