X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FCustomer.pm;h=e3e30ddff6c2e59115579703d207050cecab7daf;hb=a28a585e4cc989f4428d47352ef5f118035c237f;hp=186ad9750161fc0729507c6e54929a2c03edff24;hpb=72b340de2352eec7d3f99a00e2141a2df35f07f3;p=kivitendo-erp.git

diff --git a/SL/DB/Customer.pm b/SL/DB/Customer.pm
index 186ad9750..e3e30ddff 100644
--- a/SL/DB/Customer.pm
+++ b/SL/DB/Customer.pm
@@ -2,9 +2,15 @@ package SL::DB::Customer;
 
 use strict;
 
+use Rose::DB::Object::Helpers qw(as_tree);
+
 use SL::DB::MetaSetup::Customer;
 use SL::DB::Manager::Customer;
 use SL::DB::Helper::TransNumberGenerator;
+use SL::DB::Helper::CustomVariables (
+  module      => 'CT',
+  cvars_alias => 1,
+);
 
 use SL::DB::VC;
 
@@ -22,17 +28,6 @@ __PACKAGE__->meta->add_relationship(
     column_map   => { id      => 'cp_cv_id' },
     manager_args => { sort_by => 'lower(contacts.cp_name)' },
   },
-  business => {
-    type         => 'one to one',
-    class        => 'SL::DB::Business',
-    column_map   => { business_id => 'id' },
-  },
-  custom_variables => {
-    type           => 'one to many',
-    class          => 'SL::DB::CustomVariable',
-    column_map     => { id => 'trans_id' },
-    query_args     => [ config_id => [ \"(SELECT custom_variable_configs.id FROM custom_variable_configs WHERE custom_variable_configs.module = 'CT')" ] ],
-  },
 );
 
 __PACKAGE__->meta->initialize;
@@ -42,7 +37,7 @@ __PACKAGE__->before_save('_before_save_set_customernumber');
 sub _before_save_set_customernumber {
   my ($self) = @_;
 
-  $self->create_trans_number if $self->customernumber eq '';
+  $self->create_trans_number if !defined $self->customernumber || $self->customernumber eq '';
   return 1;
 }
 
@@ -52,4 +47,14 @@ sub short_address {
   return join ', ', grep { $_ } $self->street, $self->zipcode, $self->city;
 }
 
+sub displayable_name {
+  my $self = shift;
+
+  return join ' ', grep $_, $self->customernumber, $self->name;
+}
+
+sub is_customer { 1 };
+sub is_vendor   { 0 };
+sub payment_terms { goto &payment }
+
 1;