X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FVendor.pm;h=c88b9f7315840343aaf96789bbb12f9e59a278f6;hb=0d34b38184fdd6a6f1dd1bc7ce509c560e326b4e;hp=53ac297b5f3182dfe4d2917a81c994502674afe6;hpb=39e13b0fb4b323c1d8c691b0e55c37d0ca1becc5;p=kivitendo-erp.git

diff --git a/SL/DB/Vendor.pm b/SL/DB/Vendor.pm
index 53ac297b5..c88b9f731 100644
--- a/SL/DB/Vendor.pm
+++ b/SL/DB/Vendor.pm
@@ -2,8 +2,16 @@ package SL::DB::Vendor;
 
 use strict;
 
+use Rose::DB::Object::Helpers qw(as_tree);
+
 use SL::DB::MetaSetup::Vendor;
+use SL::DB::Manager::Vendor;
+use SL::DB::Helper::IBANValidation;
 use SL::DB::Helper::TransNumberGenerator;
+use SL::DB::Helper::CustomVariables (
+  module      => 'CT',
+  cvars_alias => 1,
+);
 
 use SL::DB::VC;
 
@@ -21,20 +29,8 @@ __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->make_manager_class;
 __PACKAGE__->meta->initialize;
 
 __PACKAGE__->before_save('_before_save_set_vendornumber');
@@ -42,8 +38,28 @@ __PACKAGE__->before_save('_before_save_set_vendornumber');
 sub _before_save_set_vendornumber {
   my ($self) = @_;
 
-  $self->create_trans_number if $self->vendornumber eq '';
+  $self->create_trans_number if !defined $self->vendornumber || $self->vendornumber eq '';
   return 1;
 }
 
+sub validate {
+  my ($self) = @_;
+
+  my @errors;
+  push @errors, $::locale->text('The vendor name is missing.') if !$self->name;
+  push @errors, $self->validate_ibans;
+
+  return @errors;
+}
+
+sub displayable_name {
+  my $self = shift;
+
+  return join ' ', grep $_, $self->vendornumber, $self->name;
+}
+
+sub is_customer { 0 };
+sub is_vendor   { 1 };
+sub payment_terms { goto &payment }
+
 1;