Angebote: neue Felder Auftragswahrscheinlichkeit, Voraus. Abrechnungsdatum

[mfinanz.git] / SL / Controller / CustomerVendor.pm

diff --git a/SL/Controller/CustomerVendor.pm b/SL/Controller/CustomerVendor.pm
index 1acd528b096e13d674f25a356715a112f5340c15..f16ce6f80793b57b3a4ae166b54edff7d41e804b 100644 (file)
--- a/SL/Controller/CustomerVendor.pm
+++ b/SL/Controller/CustomerVendor.pm
@@ -69,6 +69,7 @@ sub action_add {
   my ($self) = @_;
 
   $self->_pre_render();
+  $self->{cv}->assign_attributes(hourly_rate => $::instance_conf->get_customer_hourly_rate) if $self->{cv}->is_customer;
   $self->render(
     'customer_vendor/form',
     title => ($self->is_vendor() ? $::locale->text('Add Vendor') : $::locale->text('Add Customer')),
@@ -550,6 +551,8 @@ sub action_ajaj_customer_autocomplete {
     $::form->{column} ? ($::form->{column} => $query) : (or => [ customernumber => $query, name => $query ])
   );
 
+  push @filter, (or => [ obsolete => undef, obsolete => 0 ]) if !$::form->{obsolete};
+
   my $customers = SL::DB::Manager::Customer->get_all(query => [ @filter ], limit => $limit);
   my $value_col = $::form->{column} || 'name';
 
@@ -641,7 +644,7 @@ sub _instantiate_args {
     $self->{cv}->taxincluded_checked(undef);
   }
 
-  $self->{cv}->hourly_rate($::lx_office_conf{'features/customer'}->{default_hourly_rate}) if $self->is_customer && !$self->{cv}->hourly_rate;
+  $self->{cv}->hourly_rate($::instance_conf->get_customer_hourly_rate) if $self->is_customer && !$self->{cv}->hourly_rate;
 
   foreach my $cvar (@{$self->{cv}->cvars_by_config()}) {
     my $value = $::form->{cv_cvars}->{$cvar->config->name};