X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FDB%2FCustomer.pm;h=71c762a5e96327d161eae2ba823336cbd8e7c01a;hb=429a7c2179e2c3c4fe9bfcbb52ebb22e55c8519a;hp=d15f5ecd0127f17c55c7dd849d8bdb6d54d9b1c1;hpb=41cceb1e99fa9d9dbf7977772e16e23646208608;p=kivitendo-erp.git

diff --git a/SL/DB/Customer.pm b/SL/DB/Customer.pm
index d15f5ecd0..71c762a5e 100644
--- a/SL/DB/Customer.pm
+++ b/SL/DB/Customer.pm
@@ -4,15 +4,27 @@ use strict;
 
 use Rose::DB::Object::Helpers qw(as_tree);
 
+use SL::Locale::String qw(t8);
 use SL::DBUtils ();
 use SL::DB::MetaSetup::Customer;
 use SL::DB::Manager::Customer;
 use SL::DB::Helper::IBANValidation;
 use SL::DB::Helper::TransNumberGenerator;
+use SL::DB::Helper::VATIDNrValidation;
 use SL::DB::Helper::CustomVariables (
   module      => 'CT',
   cvars_alias => 1,
 );
+use SL::DB::Helper::DisplayableNamePreferences (
+  title   => t8('Customer'),
+  options => [ {name => 'customernumber', title => t8('Customer Number') },
+               {name => 'name',           title => t8('Name')   },
+               {name => 'street',         title => t8('Street') },
+               {name => 'city',           title => t8('City') },
+               {name => 'zipcode',        title => t8('Zipcode')},
+               {name => 'email',          title => t8('E-Mail') },
+               {name => 'phone',          title => t8('Phone')  }, ]
+);
 
 use SL::DB::VC;
 
@@ -36,6 +48,7 @@ __PACKAGE__->meta->initialize;
 
 __PACKAGE__->before_save('_before_save_set_customernumber');
 
+
 sub _before_save_set_customernumber {
   my ($self) = @_;
 
@@ -49,6 +62,7 @@ sub validate {
   my @errors;
   push @errors, $::locale->text('The customer name is missing.') if !$self->name;
   push @errors, $self->validate_ibans;
+  push @errors, $self->validate_vat_id_numbers;
 
   return @errors;
 }
@@ -59,12 +73,6 @@ 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 last_used_ar_chart {
   my ($self) = @_;
 
@@ -92,4 +100,12 @@ sub is_vendor   { 0 };
 sub payment_terms { goto &payment }
 sub number { goto &customernumber }
 
+sub create_zugferd_invoices_for_this_customer {
+  my ($self) = @_;
+
+  no warnings 'once';
+  return $::instance_conf->get_create_zugferd_invoices if $self->create_zugferd_invoices == -1;
+  return $self->create_zugferd_invoices;
+}
+
 1;