X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCustomerVendor.pm;h=91994a1c3002f14b913139557152b9e1cc6db476;hb=6e6038682b1a2b6e6bc74f1eee40eba21afcb7e9;hp=3b6db2903a4a5db4bcb57869274b53580f2f6539;hpb=54006a889326c54c68cfe55142dc44b55c2a3bd1;p=kivitendo-erp.git

diff --git a/SL/Controller/CustomerVendor.pm b/SL/Controller/CustomerVendor.pm
index 3b6db2903..91994a1c3 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')),
@@ -469,7 +470,8 @@ sub action_get_delivery {
        ON p.id = i.parts_id
 
      LEFT JOIN oe
-       ON (oe.ordnumber = ${arap}.ordnumber AND NOT ${arap}.ordnumber = '')
+       ON (oe.ordnumber = ${arap}.ordnumber AND NOT ${arap}.ordnumber = ''
+           AND ". ($arap eq 'ar' ? 'oe.customer_id IS NOT NULL' : 'oe_vendor_id IS NOT NULL') ." )
 
      ${where}
      ORDER BY ${arap}.transdate DESC LIMIT 15";
@@ -550,6 +552,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,6 +645,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};
@@ -876,4 +881,15 @@ sub normalize_name {
   $self->{cv}->name($name);
 }
 
+sub home_address_for_google_maps {
+  my ($self)  = @_;
+
+  my $address = $::instance_conf->get_address // '';
+  $address    =~ s{^\s+|\s+$|\r+}{}g;
+  $address    =~ s{\n+}{,}g;
+  $address    =~ s{\s+}{ }g;
+
+  return $address;
+}
+
 1;