Merge branch 'cvar_partsgroup_filter'

[kivitendo-erp.git] / SL / DB / Customer.pm

diff --git a/SL/DB/Customer.pm b/SL/DB/Customer.pm
index 85d6999..6f37c52 100644 (file)
--- a/SL/DB/Customer.pm
+++ b/SL/DB/Customer.pm
@@ -5,6 +5,10 @@ use strict;
 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;
 
@@ -14,16 +18,16 @@ __PACKAGE__->meta->add_relationship(
     class        => 'SL::DB::Shipto',
     column_map   => { id      => 'trans_id' },
     manager_args => { sort_by => 'lower(shipto.shiptoname)' },
-    query_args   => [ 'module' => 'CT' ],
+    query_args   => [ module   => 'CT' ],
   },
-  business => {
-    type         => 'one to one',
-    class        => 'SL::DB::Business',
-    column_map   => { business_id => 'id' },
+  contacts => {
+    type         => 'one to many',
+    class        => 'SL::DB::Contact',
+    column_map   => { id      => 'cp_cv_id' },
+    manager_args => { sort_by => 'lower(contacts.cp_name)' },
   },
 );
 
-__PACKAGE__->meta->make_manager_class;
 __PACKAGE__->meta->initialize;
 
 __PACKAGE__->before_save('_before_save_set_customernumber');
@@ -31,7 +35,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;
 }
 
@@ -41,4 +45,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;