From: Thomas Heck <theck@linet-services.de>
Date: Wed, 16 Oct 2013 14:34:25 +0000 (+0200)
Subject: Waren- und Lieferanten-CVars richtig speichern
X-Git-Tag: release-3.1.0beta1~31^2~4
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=ec8179667b1859d134b86ae79d1ba7c169d2b126;p=kivitendo-erp.git

Waren- und Lieferanten-CVars richtig speichern

fixt #2374
---

diff --git a/SL/DB/CustomVariable.pm b/SL/DB/CustomVariable.pm
index 60955e40f..144acef00 100644
--- a/SL/DB/CustomVariable.pm
+++ b/SL/DB/CustomVariable.pm
@@ -18,18 +18,29 @@ sub value {
   goto &bool_value      if $type eq 'boolean';
   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 {
-      require SL::DB::Customer;
-
-      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 and select
+
+  goto &text_value; # text, textfield, date and select
 }
 
 sub is_valid {