From: Moritz Bunkus Date: Mon, 15 Jul 2013 15:35:27 +0000 (+0200) Subject: Pflichtenheft -> Angebot: ungültige Attribute nicht ausführen X-Git-Tag: release-3.2.0beta~467^2~118 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=815cf361bd5ae8ae0e7002423be5d307993f69f5;p=kivitendo-erp.git Pflichtenheft -> Angebot: ungültige Attribute nicht ausführen --- diff --git a/SL/Controller/RequirementSpecOrder.pm b/SL/Controller/RequirementSpecOrder.pm index d54a173c3..fc0fbea41 100644 --- 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{<%}; - $description =~ s{<% (.+?) %>}{$section->$1}egx; + $description =~ s{<% (.+?) %>}{ $section->can($1) ? $section->$1 : '<' . t8('Invalid variable #1', $1) . '>' }egx; } $item->assign_attributes( diff --git a/locale/de/all b/locale/de/all index e5e937ef2..215e4c119 100755 --- 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 variable #1' => 'Ungültige Variable #1', 'Invdate' => 'Rechnungsdatum', 'Invdate from' => 'Rechnungen von', 'Inventory' => 'Inventar',