projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #6 from cwittmer/fixFSF
[kivitendo-erp.git]
/
SL
/
DB
/
Customer.pm
diff --git
a/SL/DB/Customer.pm
b/SL/DB/Customer.pm
index
55a1ee4
..
8dd2a31
100644
(file)
--- a/
SL/DB/Customer.pm
+++ b/
SL/DB/Customer.pm
@@
-2,9
+2,16
@@
package SL::DB::Customer;
use strict;
use strict;
+use Rose::DB::Object::Helpers qw(as_tree);
+
use SL::DB::MetaSetup::Customer;
use SL::DB::Manager::Customer;
use SL::DB::MetaSetup::Customer;
use SL::DB::Manager::Customer;
+use SL::DB::Helper::IBANValidation;
use SL::DB::Helper::TransNumberGenerator;
use SL::DB::Helper::TransNumberGenerator;
+use SL::DB::Helper::CustomVariables (
+ module => 'CT',
+ cvars_alias => 1,
+);
use SL::DB::VC;
use SL::DB::VC;
@@
-14,16
+21,16
@@
__PACKAGE__->meta->add_relationship(
class => 'SL::DB::Shipto',
column_map => { id => 'trans_id' },
manager_args => { sort_by => 'lower(shipto.shiptoname)' },
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');
__PACKAGE__->meta->initialize;
__PACKAGE__->before_save('_before_save_set_customernumber');
@@
-31,7
+38,18
@@
__PACKAGE__->before_save('_before_save_set_customernumber');
sub _before_save_set_customernumber {
my ($self) = @_;
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;
+}
+
+sub validate {
+ my ($self) = @_;
+
+ my @errors;
+ push @errors, $::locale->text('The customer name is missing.') if !$self->name;
+ push @errors, $self->validate_ibans;
+
+ return @errors;
}
sub short_address {
}
sub short_address {
@@
-40,4
+58,15
@@
sub short_address {
return join ', ', grep { $_ } $self->street, $self->zipcode, $self->city;
}
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 }
+sub number { goto &customernumber }
+
1;
1;