Pflichtenheft -> Angebot: ungültige Attribute nicht ausführen

diff --git a/SL/Controller/RequirementSpecOrder.pm b/SL/Controller/RequirementSpecOrder.pm
index d54a173c3b462189a08dfc4014462577c522e4e7..fc0fbea41924dd4ef822d205bc35c3b4c0b2626d 100644 (file)
--- a/SL/Controller/RequirementSpecOrder.pm
+++ b/SL/Controller/RequirementSpecOrder.pm
@@ -241,7 +241,7 @@ sub create_order_item {
 
   if (!$section->{keep_description}) {
     $description =  '<%fb_number%> <%title%>' unless $description =~ m{<%};
 
   if (!$section->{keep_description}) {
     $description =  '<%fb_number%> <%title%>' unless $description =~ m{<%};

-    $description =~ s{<% (.+?) %>}{$section->$1}egx;
+    $description =~ s{<% (.+?) %>}{ $section->can($1) ? $section->$1 : '<' . t8('Invalid variable #1', $1) . '>' }egx;

   }
 
   $item->assign_attributes(
   }
 
   $item->assign_attributes(

diff --git a/locale/de/all b/locale/de/all
index e5e937ef2b32ad9b9c1a6a650d62a2437177dd14..215e4c119bd0ed6e5cf61c7669689e23497e4154 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1235,6 +1235,7 @@ $self->{texts} = {
   'Invalid quantity.'           => 'Die Mengenangabe ist ungültig.',
   'Invalid request type \'#1\'' => 'Ungültiger Request-Typ \'#1\'',
   'Invalid transactions'        => 'Ungültige Buchungen',
   'Invalid quantity.'           => 'Die Mengenangabe ist ungültig.',
   'Invalid request type \'#1\'' => 'Ungültiger Request-Typ \'#1\'',
   'Invalid transactions'        => 'Ungültige Buchungen',

+  'Invalid variable #1'         => 'Ungültige Variable #1',

   'Invdate'                     => 'Rechnungsdatum',
   'Invdate from'                => 'Rechnungen von',
   'Inventory'                   => 'Inventar',
   'Invdate'                     => 'Rechnungsdatum',
   'Invdate from'                => 'Rechnungen von',
   'Inventory'                   => 'Inventar',