X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCustomerVendor.pm;h=f59fd07b54a3411970187744a5b3afce921d0a4f;hb=76105d1596c47e6883d527d21de683baa65c9c90;hp=dcb8b2d6cf279348c4573323b658c7cb5e8182f4;hpb=3ea3a6039063f35a5dffc726d5f0e9a1ab85ef11;p=kivitendo-erp.git

diff --git a/SL/Controller/CustomerVendor.pm b/SL/Controller/CustomerVendor.pm
index dcb8b2d6c..f59fd07b5 100644
--- 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')),
@@ -641,6 +642,7 @@ sub _instantiate_args {
     $self->{cv}->taxincluded_checked(undef);
   }
 
+  $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};
@@ -865,6 +867,9 @@ sub _pre_render {
 sub normalize_name {
   my ($self) = @_;
 
+  # check if feature is enabled (select normalize_vc_names from defaults)
+  return unless ($::instance_conf->get_normalize_vc_names);
+
   return unless $self->{cv};
   my $name = $self->{cv}->name;
   $name =~ s/\s+$//;