Preisquelle Preisgruppe: Fallback für entfernte Preise.

diff --git a/SL/PriceSource/Pricegroup.pm b/SL/PriceSource/Pricegroup.pm
index 62fabf5185c2fba4f04c76518cb7e09407614a7b..3bae2d0d5a525e9f2f55569e4d5264fc5adcb387 100644 (file)
--- a/SL/PriceSource/Pricegroup.pm
+++ b/SL/PriceSource/Pricegroup.pm
@@ -51,7 +51,13 @@ sub price_from_source {
 
   my $price = SL::DB::Manager::Price->find_by(pricegroup_id => $spec, parts_id => $self->part->id);
 
 
   my $price = SL::DB::Manager::Price->find_by(pricegroup_id => $spec, parts_id => $self->part->id);
 

-  # TODO: if someone deletes the prices entry, this fails. add a fallback
+  if (!$price) {
+    return SL::PriceSource::Price->new(
+      price_source => $self,
+      missing      => t8('Could not find an entry for this part in the pricegroup.'),
+    );
+  }
+

   return $self->make_price($price);
 }
 
   return $self->make_price($price);
 }
 

diff --git a/locale/de/all b/locale/de/all
index 95291289892785f0a0c8ed06fa5f3ba627fc32f1..f8c5dcd4246ec0bc68674b1a7788ca091d4291fa 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -635,6 +635,7 @@ $self->{texts} = {
   'Copy template'               => 'Vorlage kopieren',
   'Correct taxkey'              => 'Richtiger Steuerschlüssel',
   'Costs'                       => 'Kosten',
   'Copy template'               => 'Vorlage kopieren',
   'Correct taxkey'              => 'Richtiger Steuerschlüssel',
   'Costs'                       => 'Kosten',

+  'Could not find an entry for this part in the pricegroup.' => 'Konnte keine Eintrag für diesen Artikel in der Preisgruppe finden.',

   'Could not load class #1 (#2): "#3"' => 'Konnte Klasse #1 (#2) nicht laden: "#3"',
   'Could not load class #1, #2' => 'Konnte Klasse #1 nicht laden: "#2"',
   'Could not load employee'     => 'Konnte Benutzer nicht laden',
   'Could not load class #1 (#2): "#3"' => 'Konnte Klasse #1 (#2) nicht laden: "#3"',
   'Could not load class #1, #2' => 'Konnte Klasse #1 nicht laden: "#2"',
   'Could not load employee'     => 'Konnte Benutzer nicht laden',

diff --git a/locale/en/all b/locale/en/all
index 10c54b08deb9267cc7468156f1e74b9ff64e74cd..e3269a1a11813918a8794e484a4e083cdf9eea1a 100644 (file)
--- a/locale/en/all
+++ b/locale/en/all
@@ -633,6 +633,7 @@ $self->{texts} = {
   'Copy template'               => '',
   'Correct taxkey'              => '',
   'Costs'                       => '',
   'Copy template'               => '',
   'Correct taxkey'              => '',
   'Costs'                       => '',

+  'Could not find an entry for this part in the pricegroup.' => '',

   'Could not load class #1 (#2): "#3"' => '',
   'Could not load class #1, #2' => '',
   'Could not load employee'     => '',
   'Could not load class #1 (#2): "#3"' => '',
   'Could not load class #1, #2' => '',
   'Could not load employee'     => '',