DeliveryOrder: calculate_stock_in_out liefert auch die Einheit mit

In do.pl wird hier auch hart die Standardeinheit mitübergeben und
ein Wechsel der Einheit in den Auslagermasken hat keine Auswirkung
TODO: Macht es Sinn überhaupt eine Auswahlliste für Einheit anzubieten?

diff --git a/SL/Controller/DeliveryOrder.pm b/SL/Controller/DeliveryOrder.pm
index 5ebbf9d68a199ed2d8acc8109c27867fee3fbfd6..c96bc42ac5b88e2e18655b295444596a9ff180d9 100644 (file)
--- a/SL/Controller/DeliveryOrder.pm
+++ b/SL/Controller/DeliveryOrder.pm
@@ -933,7 +933,6 @@ sub action_update_stock_information {
     stock_info => $yaml,
     stock_qty => $stock_qty,
   };
-
   $self->render(\ SL::JSON::to_json($response), { layout => 0, type => 'json', process => 0 });
 }
 
@@ -2154,7 +2153,7 @@ sub calculate_stock_in_out_from_stock_info {
     $units_by_name{$_->{unit}}->convert_to($_->{qty}, $units_by_name{$unit})
   } @$stock_info;
 
-  my $content  = _format_number($sum, 2);
+  my $content  = _format_number($sum, 2) . ' ' . $unit;
 
   return $content;
 }

diff --git a/templates/webpages/delivery_order/tabs/_row.html b/templates/webpages/delivery_order/tabs/_row.html
index 0e6e1294c7efd406a73597e32f97ebee3dc663b0..82422ef162cc783d89b766455a1062ca18821cf3 100644 (file)
--- a/templates/webpages/delivery_order/tabs/_row.html
+++ b/templates/webpages/delivery_order/tabs/_row.html
@@ -88,7 +88,7 @@
     </td>
 
     <td>
-      <span id="stock_[% ID %]" class="data-stock-qty">[% SELF.calculate_stock_in_out(ITEM) %]</span>
+      <span id="stock_[% ID %]" class="data-stock-qty">[% SELF.calculate_stock_in_out(ITEM) %] [% ITEM.unit %]</span>
       [% P.button_tag("kivi.DeliveryOrder.open_stock_in_out_dialog(this, '" _ in_out _"')", "?") %]
     </td>
   </tr>