From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 17 Feb 2015 12:39:04 +0000 (+0100)
Subject: SL::DB::CustomVariable: value_as_text() für customer/vendor/part vereinheitlicht
X-Git-Tag: release-3.2.0~32
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=b996f6ca8984a5c0983fd9541f607ee7307e7182;p=kivitendo-erp.git

SL::DB::CustomVariable: value_as_text() für customer/vendor/part vereinheitlicht
---

diff --git a/SL/DB/CustomVariable.pm b/SL/DB/CustomVariable.pm
index 3f1f7a2e3..03fd5cad5 100644
--- a/SL/DB/CustomVariable.pm
+++ b/SL/DB/CustomVariable.pm
@@ -95,24 +95,11 @@ sub value_as_text {
     return $::locale->reformat_date( { dateformat => 'yy-mm-dd' }, $self->timestamp_value->ymd, $::myconfig{dateformat});
   } elsif ($type eq 'number') {
     return $::form->format_amount(\%::myconfig, $self->number_value, $cfg->processed_options->{PRECISION});
-  } elsif ( $type eq 'customer' ) {
-    require SL::DB::Customer;
-
-    my $id = int($self->number_value);
-    my $customer =  $id ? SL::DB::Customer->new(id => $id)->load() : 0;
-    return $customer ? $customer->name : '';
-  } elsif ( $type eq 'vendor' ) {
-    require SL::DB::Vendor;
-
-    my $id = int($self->number_value);
-    my $vendor =  $id ? SL::DB::Vendor->new(id => $id)->load() : 0;
-    return $vendor ? $vendor->name : '';
-  } elsif ( $type eq 'part' ) {
-    require SL::DB::Part;
-
-    my $id = int($self->number_value);
-    my $part = $id ? SL::DB::Part->new(id => $id)->load() : 0;
-    return $part ? $part->description : '';
+  } elsif ( $type =~ m{^(?:customer|vendor|part)$}) {
+    my $class = "SL::DB::" . ucfirst($type);
+    eval "require $class";
+    my $object =  $class->_get_manager_class->find_by(id => int($self->number_value));
+    return $object ? $object->displayable_name : '';
   }
 
   goto &text_value; # text, textfield and select