X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FCustomer.pm;h=55a1ee4345591e6cd623042d3ddf9fbb0053656d;hb=930e5ecb0d071e20e9fc57e6050859a0a7a5a98d;hp=fd5f66ef6d60cc8ba8f796232c6da84093b98631;hpb=f9676efea9ccfa01df2a57dca9c45cc8fde0d09e;p=kivitendo-erp.git

diff --git a/SL/DB/Customer.pm b/SL/DB/Customer.pm
index fd5f66ef6..55a1ee434 100644
--- a/SL/DB/Customer.pm
+++ b/SL/DB/Customer.pm
@@ -3,6 +3,8 @@ package SL::DB::Customer;
 use strict;
 
 use SL::DB::MetaSetup::Customer;
+use SL::DB::Manager::Customer;
+use SL::DB::Helper::TransNumberGenerator;
 
 use SL::DB::VC;
 
@@ -12,7 +14,7 @@ __PACKAGE__->meta->add_relationship(
     class        => 'SL::DB::Shipto',
     column_map   => { id      => 'trans_id' },
     manager_args => { sort_by => 'lower(shipto.shiptoname)' },
-    query_args   => [ 'shipto.module' => 'CT' ],
+    query_args   => [ 'module' => 'CT' ],
   },
   business => {
     type         => 'one to one',
@@ -24,4 +26,18 @@ __PACKAGE__->meta->add_relationship(
 __PACKAGE__->meta->make_manager_class;
 __PACKAGE__->meta->initialize;
 
+__PACKAGE__->before_save('_before_save_set_customernumber');
+
+sub _before_save_set_customernumber {
+  my ($self) = @_;
+
+  $self->create_trans_number if $self->customernumber eq '';
+}
+
+sub short_address {
+  my ($self) = @_;
+
+  return join ', ', grep { $_ } $self->street, $self->zipcode, $self->city;
+}
+
 1;