DeliveryOrder: _make_record für den alten Controller

[mfinanz.git] / SL / Controller / DeliveryOrder.pm

diff --git a/SL/Controller/DeliveryOrder.pm b/SL/Controller/DeliveryOrder.pm
index 7997d3e6dc082f3c4d24e192ba924fc55073ed8d..8f3d838c8365668deb365390a2ccf10996346fc4 100644 (file)
--- 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});
   } 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);
     }
   }
       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?'),
         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"),
       ],
 
         only_if  => $self->type_data->show_menu("delete"),
       ],