Lieferplan: Warenwert der ausgelagerten Warenmenge anzeigen

diff --git a/SL/Controller/DeliveryPlan.pm b/SL/Controller/DeliveryPlan.pm
index 1ea6d7c7c124141b5e4072799f59c2e9fc910dcb..07581c428ed23623a03614b834cffa14b319069a 100644 (file)
--- a/SL/Controller/DeliveryPlan.pm
+++ b/SL/Controller/DeliveryPlan.pm
@@ -28,7 +28,7 @@ my %sort_columns = (
   ordnumber         => t8('Order'),
   customer          => t8('Customer'),
   vendor            => t8('Vendor'),
   ordnumber         => t8('Order'),
   customer          => t8('Customer'),
   vendor            => t8('Vendor'),

-  value_of_goods    => t8('Value of goods'),
+  value_of_goods    => t8('Value of transferred goods'),

 );
 
 
 );
 
 

diff --git a/SL/DB/OrderItem.pm b/SL/DB/OrderItem.pm
index 058d04bfe5409151e0b32c43658d1987feb47125..65772955fd6418cb2ee8135a2b670ab121abeed1 100644 (file)
--- a/SL/DB/OrderItem.pm
+++ b/SL/DB/OrderItem.pm
@@ -44,7 +44,8 @@ sub delivered_qty {
   my @doi_delivered      = grep { $_->parts_id == $self->parts_id } map { $_->orderitems } @d_orders_delivered;
 
   require SL::AM;
   my @doi_delivered      = grep { $_->parts_id == $self->parts_id } map { $_->orderitems } @d_orders_delivered;
 
   require SL::AM;

-  return sum(map { AM->convert_unit($_->unit => $self->unit) * $_->qty } @doi_delivered);
+  $self->{delivered_qty} =  sum(map { AM->convert_unit($_->unit => $self->unit) * $_->qty } @doi_delivered);
+  return $self->{delivered_qty};

 }
 
 sub value_of_goods {
 }
 
 sub value_of_goods {


@@ -52,7 +53,7 @@ sub value_of_goods {
 
   my $price_factor = $self->price_factor || 1;
 
 
   my $price_factor = $self->price_factor || 1;
 

-  return ($self->qty * $self->sellprice * (1 - $self->discount ) / $price_factor);
+  return ($self->{delivered_qty} * $self->sellprice * (1 - $self->discount ) / $price_factor);

 }
 
 sub taxincluded {
 }
 
 sub taxincluded {

diff --git a/locale/de/all b/locale/de/all
index c093608841f697d331c27854ac374b690f651805..3c78fa244d9be3a9326a554790208d3daf7500f6 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -2805,7 +2805,7 @@ $self->{texts} = {
   'Valid until'                 => 'gültig bis',
   'Valid/Obsolete'              => 'Gültig/ungültig',
   'Value'                       => 'Wert',
   'Valid until'                 => 'gültig bis',
   'Valid/Obsolete'              => 'Gültig/ungültig',
   'Value'                       => 'Wert',

-  'Value of goods'              => 'Warenverkaufswert',
+  'Value of transferred goods'  => 'Verkaufswert der ausgelagerten Waren',

   'Variable'                    => 'Variable',
   'Variable Description'        => 'Datenfeldbezeichnung',
   'Variable Name'               => 'Datenfeldname (intern)',
   'Variable'                    => 'Variable',
   'Variable Description'        => 'Datenfeldbezeichnung',
   'Variable Name'               => 'Datenfeldname (intern)',