Merge branch 'master' of github.com:kivitendo/kivitendo-erp

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

diff --git a/SL/Controller/CustomerVendor.pm b/SL/Controller/CustomerVendor.pm
index 79379494a7acaf150e731614876fa88444e19715..b64c121afe499137d4e4b834bb710e32f0e8410f 100644 (file)
--- a/SL/Controller/CustomerVendor.pm
+++ b/SL/Controller/CustomerVendor.pm
@@ -577,6 +577,11 @@ sub _instantiate_args {
   }
   $self->{cv}->assign_attributes(%{$::form->{cv}});
 
+  if ( $self->is_customer() && $::form->{cv}->{taxincluded_checked} eq '' ) {
+    $self->{cv}->taxincluded_checked(undef);
+  }
+
+
   foreach my $cvar (@{$self->{cv}->cvars_by_config()}) {
     my $value = $::form->{cv_cvars}->{$cvar->config->name};
 
@@ -668,6 +673,7 @@ sub _create_customer_vendor {
   } else {
     $self->{cv} = SL::DB::Customer->new();
   }
+  $self->{cv}->currency_id($::instance_conf->get_currency_id());
 
   $self->{note} = SL::DB::Note->new();
 
@@ -681,8 +687,6 @@ sub _create_customer_vendor {
 sub _pre_render {
   my ($self) = @_;
 
-  $self->{template_args}->{conf_vertreter} = $::instance_conf->get_vertreter();
-
   my $dbh = $::form->get_standard_dbh();
 
   my $query;
@@ -732,7 +736,7 @@ sub _pre_render {
        WHERE salesman';
     my $business_ids = [
       map(
-        { $_->{id} }
+        { $_->{id}; }
         selectall_hashref_query($::form, $dbh, $query)
       )
     ];
@@ -771,6 +775,7 @@ sub _pre_render {
   $self->{template_args} ||= {};
 
   $::request->{layout}->add_javascripts('autocomplete_customer.js');
+  $::request->{layout}->add_javascripts('kivi.CustomerVendor.js');
 }
 
 1;