X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FPresenter%2FCustomerVendor.pm;h=5f41a2a509d2876eaa0c8c7834c6c2b493a12f02;hb=0b8b24545c98eb4cf22bda155d0e7efbf2bdcdb7;hp=4a370297040ce97f26d6bff3531eba7f51236166;hpb=e3810fbd565d14993f6b5a6fe89f0e4e27c95869;p=kivitendo-erp.git diff --git a/SL/Presenter/CustomerVendor.pm b/SL/Presenter/CustomerVendor.pm index 4a3702970..5f41a2a50 100644 --- a/SL/Presenter/CustomerVendor.pm +++ b/SL/Presenter/CustomerVendor.pm @@ -40,7 +40,7 @@ sub customer_vendor_picker { my ($self, $name, $value, %params) = @_; croak 'Unknown "type" parameter' unless $params{type} =~ m{^(?:customer|vendor)$}; - croak 'Unknown value class' if $value && (ref($value) !~ m{^SL::DB::(?:Customer|Vendor)$}); + croak 'Unknown value class' if $value && ref($value) && (ref($value) !~ m{^SL::DB::(?:Customer|Vendor)$}); if ($value && !ref $value) { my $class = $params{type} eq 'customer' ? 'SL::DB::Manager::Customer' : 'SL::DB::Manager::Vendor'; @@ -57,8 +57,9 @@ sub customer_vendor_picker { my $ret = $self->input_tag($name, (ref $value && $value->can('id') ? $value->id : ''), class => "@classes", type => 'hidden', id => $id) . join('', map { $params{$_} ? $self->input_tag("", delete $params{$_}, id => "${id}_${_}", type => 'hidden') : '' } qw(type)) . - $self->input_tag("", (ref $value && $value->can('name')) ? $value->name : '', id => "${id}_name", %params); + $self->input_tag("", ref $value ? $value->displayable_name : '', id => "${id}_name", %params); + $::request->layout->add_javascripts('autocomplete_customer.js'); $::request->presenter->need_reinit_widgets($id); $self->html_tag('span', $ret, class => 'customer_vendor_picker');