X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FCustomVariable.pm;h=dd32ef9cbc404faf37136c911a9a88ba6efba4c0;hb=b2e1809f6b6d8852ab0086dcc61ae9540c18b83f;hp=c90e03800b935487d079dc2c5c32aa71c9bb0394;hpb=5eff8cd02d21a0d8b6be7d055df3910fdd86c3a9;p=kivitendo-erp.git

diff --git a/SL/DB/CustomVariable.pm b/SL/DB/CustomVariable.pm
index c90e03800..dd32ef9cb 100644
--- a/SL/DB/CustomVariable.pm
+++ b/SL/DB/CustomVariable.pm
@@ -4,10 +4,7 @@
 package SL::DB::CustomVariable;
 
 use strict;
-
 use SL::DB::MetaSetup::CustomVariable;
-use SL::DB::CustomVariableValidity;
-use SL::DB::Customer;
 
 __PACKAGE__->meta->initialize;
 
@@ -18,25 +15,75 @@ sub value {
   my $self = $_[0];
   my $type = $self->config->type;
 
-  goto &bool_value      if $type eq 'boolean';
+  goto &bool_value      if $type eq 'bool';
   goto &timestamp_value if $type eq 'timestamp';
   goto &number_value    if $type eq 'number';
+
+  if ( $_[1] && ($type eq 'customer' || $type eq 'vendor' || $type eq 'part') ) {
+    $self->number_value($_[1]);
+  }
+
   if ( $type eq 'customer' ) {
-    if ( defined($_[1]) && $_[1] ) {
-      goto &number_value;
-    }
-    else {
-      my $id = int($self->number_value);
-      return $id ? SL::DB::Customer->new(id => $id)->load() : 0;
-    }
+    require SL::DB::Customer;
+
+    my $id = int($self->number_value);
+    return $id ? SL::DB::Customer->new(id => $id)->load() : 0;
+  } elsif ( $type eq 'vendor' ) {
+    require SL::DB::Vendor;
+
+    my $id = int($self->number_value);
+    return $id ? SL::DB::Vendor->new(id => $id)->load() : 0;
+  } elsif ( $type eq 'part' ) {
+    require SL::DB::Part;
+
+    my $id = int($self->number_value);
+    return $id ? SL::DB::Part->new(id => $id)->load() : 0;
+  }
+
+  goto &text_value; # text, textfield, date and select
+}
+
+sub value_as_text {
+  my $self = $_[0];
+  my $type = $self->config->type;
+
+  die 'not an accessor' if @_ > 1;
+
+  if ($type eq 'boolean') {
+    return $self->bool_value ? $::locale->text('Yes') : $::locale->text('No');
+  } elsif ($type eq 'timestamp') {
+    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, $self->config->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);
+    return $id ? SL::DB::Vendor->new(id => $id)->load() : 0;
+  } 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 : '';
   }
-  goto &text_value; # text and select
+
+  goto &text_value; # text, textfield, date and select
 }
 
 sub is_valid {
   my ($self) = @_;
 
-  return SL::DB::Manager::CustomVariableValidity->get_all_count(config_id => $self->config_id, trans_id => $self->trans_id) == 0;
+  require SL::DB::CustomVariableValidity;
+
+  my $query = [config_id => $self->config_id, trans_id => $self->trans_id];
+  return SL::DB::Manager::CustomVariableValidity->get_all_count(query => $query) == 0;
 }
 
 1;