ActionBar.js: accesskey normalisierung robuster gemacht

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

diff --git a/SL/Controller/CustomerVendor.pm b/SL/Controller/CustomerVendor.pm
index dcb8b2d6cf279348c4573323b658c7cb5e8182f4..e27b3618e54651abca7d8426fe716613d312ca70 100644 (file)
--- a/SL/Controller/CustomerVendor.pm
+++ b/SL/Controller/CustomerVendor.pm
@@ -3,10 +3,13 @@ package SL::Controller::CustomerVendor;
 use strict;
 use parent qw(SL::Controller::Base);
 
 use strict;
 use parent qw(SL::Controller::Base);
 

+use List::MoreUtils qw(any);
+

 use SL::JSON;
 use SL::DBUtils;
 use SL::Helper::Flash;
 use SL::Locale::String;
 use SL::JSON;
 use SL::DBUtils;
 use SL::Helper::Flash;
 use SL::Locale::String;

+use SL::Controller::Helper::GetModels;

 
 use SL::DB::Customer;
 use SL::DB::Vendor;
 
 use SL::DB::Customer;
 use SL::DB::Vendor;


@@ -23,6 +26,10 @@ use SL::DB::FollowUpLink;
 use SL::DB::History;
 use SL::DB::Currency;
 
 use SL::DB::History;
 use SL::DB::Currency;
 

+use Rose::Object::MakeMethods::Generic (
+  'scalar --get_set_init' => [ qw(customer_models vendor_models) ],
+);
+

 # safety
 __PACKAGE__->run_before(
   sub {
 # safety
 __PACKAGE__->run_before(
   sub {


@@ -50,11 +57,35 @@ __PACKAGE__->run_before(
   '_load_customer_vendor',
   only => [
     'edit',
   '_load_customer_vendor',
   only => [
     'edit',

+    'show',

     'update',
     'ajaj_get_shipto',
     'ajaj_get_contact',
   ]
 );
     'update',
     'ajaj_get_shipto',
     'ajaj_get_contact',
   ]
 );

+
+# make sure this comes after _load_customer_vendor
+__PACKAGE__->run_before(
+  '_check_customer_vendor_all_edit',
+  only => [
+    'edit',
+    'show',
+    'update',
+    'delete',
+    'save',
+    'save_and_ap_transaction',
+    'save_and_ar_transaction',
+    'save_and_close',
+    'save_and_invoice',
+    'save_and_order',
+    'save_and_quotation',
+    'save_and_rfq',
+    'delete',
+    'delete_contact',
+    'delete_shipto',
+  ]
+);
+

 __PACKAGE__->run_before(
   '_create_customer_vendor',
   only => [
 __PACKAGE__->run_before(
   '_create_customer_vendor',
   only => [


@@ -69,6 +100,8 @@ sub action_add {
   my ($self) = @_;
 
   $self->_pre_render();
   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')),
   $self->render(
     'customer_vendor/form',
     title => ($self->is_vendor() ? $::locale->text('Add Vendor') : $::locale->text('Add Customer')),


@@ -87,12 +120,40 @@ sub action_edit {
   );
 }
 
   );
 }
 

+sub action_show {
+  my ($self) = @_;
+
+  if ($::request->type eq 'json') {
+    my $cv_hash;
+    if (!$self->{cv}) {
+      # TODO error
+    } else {
+      $cv_hash          = $self->{cv}->as_tree;
+      $cv_hash->{cvars} = $self->{cv}->cvar_as_hashref;
+    }
+
+    $self->render(\ SL::JSON::to_json($cv_hash), { layout => 0, type => 'json', process => 0 });
+  }
+}
+

 sub _save {
   my ($self) = @_;
 
 sub _save {
   my ($self) = @_;
 

+  my @errors = $self->{cv}->validate;
+  if (@errors) {
+    flash('error', @errors);
+    $self->_pre_render();
+    $self->render(
+      'customer_vendor/form',
+      title => ($self->is_vendor() ? t8('Edit Vendor') : t8('Edit Customer')),
+      %{$self->{template_args}}
+    );
+    $::dispatcher->end_request;
+  }
+

   my $db = $self->{cv}->db;
 
   my $db = $self->{cv}->db;
 

-  $db->do_transaction(sub {
+  $db->with_transaction(sub {

     my $cvs_by_nr;
     if ( $self->is_vendor() ) {
       if ( $self->{cv}->vendornumber ) {
     my $cvs_by_nr;
     if ( $self->is_vendor() ) {
       if ( $self->{cv}->vendornumber ) {


@@ -117,7 +178,7 @@ sub _save {
 
     $self->{contact}->cp_cv_id($self->{cv}->id);
     if( $self->{contact}->cp_name ne '' || $self->{contact}->cp_givenname ne '' ) {
 
     $self->{contact}->cp_cv_id($self->{cv}->id);
     if( $self->{contact}->cp_name ne '' || $self->{contact}->cp_givenname ne '' ) {

-      $self->{contact}->save();
+      $self->{contact}->save(cascade => 1);

     }
 
     if( $self->{note}->subject ne '' && $self->{note}->body ne '' ) {
     }
 
     if( $self->{note}->subject ne '' && $self->{note}->body ne '' ) {


@@ -139,8 +200,8 @@ sub _save {
     }
 
     $self->{shipto}->trans_id($self->{cv}->id);
     }
 
     $self->{shipto}->trans_id($self->{cv}->id);

-    if( $self->{shipto}->shiptoname ne '' ) {
-      $self->{shipto}->save();
+    if(any { $self->{shipto}->$_ ne '' } qw(shiptoname shiptodepartment_1 shiptodepartment_2 shiptostreet shiptozipcode shiptocity shiptocountry shiptogln shiptocontact shiptophone shiptofax shiptoemail)) {
+      $self->{shipto}->save(cascade => 1);

     }
 
     my $snumbers = $self->is_vendor() ? 'vendornumber_'. $self->{cv}->vendornumber : 'customernumber_'. $self->{cv}->customernumber;
     }
 
     my $snumbers = $self->is_vendor() ? 'vendornumber_'. $self->{cv}->vendornumber : 'customernumber_'. $self->{cv}->customernumber;


@@ -163,6 +224,8 @@ sub _save {
         $note->delete(cascade => 'delete');
       }
     }
         $note->delete(cascade => 'delete');
       }
     }

+
+    1;

   }) || die($db->error);
 
 }
   }) || die($db->error);
 
 }


@@ -170,34 +233,23 @@ sub _save {
 sub action_save {
   my ($self) = @_;
 
 sub action_save {
   my ($self) = @_;
 

-  if (!$self->{cv}->name) {
-    flash('error', t8('Customer missing!'));
-    $self->_pre_render();
-    $self->render(
-      'customer_vendor/form',
-      title => ($self->is_vendor() ? t8('Edit Vendor') : t8('Edit Customer')),
-      %{$self->{template_args}}
-    );
-  } else {
-
-    $self->_save();
-
-    my @redirect_params = (
-      action => 'edit',
-      id     => $self->{cv}->id,
-      db     => ($self->is_vendor() ? 'vendor' : 'customer'),
-    );
+  $self->_save();

 
 

-    if ( $self->{contact}->cp_id ) {
-      push(@redirect_params, contact_id => $self->{contact}->cp_id);
-    }
+  my @redirect_params = (
+    action => 'edit',
+    id     => $self->{cv}->id,
+    db     => ($self->is_vendor() ? 'vendor' : 'customer'),
+  );

 
 

-    if ( $self->{shipto}->shipto_id ) {
-      push(@redirect_params, shipto_id => $self->{shipto}->shipto_id);
-    }
+  if ( $self->{contact}->cp_id ) {
+    push(@redirect_params, contact_id => $self->{contact}->cp_id);
+  }

 
 

-    $self->redirect_to(@redirect_params);
+  if ( $self->{shipto}->shipto_id ) {
+    push(@redirect_params, shipto_id => $self->{shipto}->shipto_id);

   }
   }

+
+  $self->redirect_to(@redirect_params);

 }
 
 sub action_save_and_close {
 }
 
 sub action_save_and_close {


@@ -212,12 +264,12 @@ sub action_save_and_close {
 sub _transaction {
   my ($self, $script) = @_;
 
 sub _transaction {
   my ($self, $script) = @_;
 

-  $::auth->assert('general_ledger         | invoice_edit         | vendor_invoice_edit | ' .
+  $::auth->assert('gl_transactions | ap_transactions | ar_transactions'.
+                    '| invoice_edit         | vendor_invoice_edit | ' .

                  ' request_quotation_edit | sales_quotation_edit | sales_order_edit    | purchase_order_edit');
 
   $self->_save();
 
                  ' request_quotation_edit | sales_quotation_edit | sales_order_edit    | purchase_order_edit');
 
   $self->_save();
 

-  my $callback = $::form->escape($::form->{callback}, 1);

   my $name = $::form->escape($self->{cv}->name, 1);
   my $db = $self->is_vendor() ? 'vendor' : 'customer';
 
   my $name = $::form->escape($self->{cv}->name, 1);
   my $db = $self->is_vendor() ? 'vendor' : 'customer';
 


@@ -228,7 +280,7 @@ sub _transaction {
     $db .'_id' => $self->{cv}->id,
     $db        => $name,
     type       => $::form->{type},
     $db .'_id' => $self->{cv}->id,
     $db        => $name,
     type       => $::form->{type},

-    callback   => $callback,
+    callback   => $::form->{callback},

   );
 
   print $::form->redirect_header($url);
   );
 
   print $::form->redirect_header($url);


@@ -237,7 +289,7 @@ sub _transaction {
 sub action_save_and_ar_transaction {
   my ($self) = @_;
 
 sub action_save_and_ar_transaction {
   my ($self) = @_;
 

-  $main::auth->assert('general_ledger');
+  $main::auth->assert('ar_transactions');

 
   $self->_transaction('ar.pl');
 }
 
   $self->_transaction('ar.pl');
 }


@@ -245,7 +297,7 @@ sub action_save_and_ar_transaction {
 sub action_save_and_ap_transaction {
   my ($self) = @_;
 
 sub action_save_and_ap_transaction {
   my ($self) = @_;
 

-  $main::auth->assert('general_ledger');
+  $main::auth->assert('ap_transactions');

 
   $self->_transaction('ap.pl');
 }
 
   $self->_transaction('ap.pl');
 }


@@ -303,7 +355,7 @@ sub action_delete {
     $self->action_edit();
   } else {
 
     $self->action_edit();
   } else {
 

-    $db->do_transaction(sub {
+    $db->with_transaction(sub {

       $self->{cv}->delete(cascade => 1);
 
       my $snumbers = $self->is_vendor() ? 'vendornumber_'. $self->{cv}->vendornumber : 'customernumber_'. $self->{cv}->customernumber;
       $self->{cv}->delete(cascade => 1);
 
       my $snumbers = $self->is_vendor() ? 'vendornumber_'. $self->{cv}->vendornumber : 'customernumber_'. $self->{cv}->customernumber;


@@ -331,7 +383,7 @@ sub action_delete_contact {
     SL::Helper::Flash::flash('error', $::locale->text('No contact selected to delete'));
   } else {
 
     SL::Helper::Flash::flash('error', $::locale->text('No contact selected to delete'));
   } else {
 

-    $db->do_transaction(sub {
+    $db->with_transaction(sub {

       if ( $self->{contact}->used ) {
         $self->{contact}->detach();
         $self->{contact}->save();
       if ( $self->{contact}->used ) {
         $self->{contact}->detach();
         $self->{contact}->save();


@@ -340,9 +392,11 @@ sub action_delete_contact {
         $self->{contact}->delete(cascade => 1);
         SL::Helper::Flash::flash('info', $::locale->text('Contact deleted.'));
       }
         $self->{contact}->delete(cascade => 1);
         SL::Helper::Flash::flash('info', $::locale->text('Contact deleted.'));
       }

+
+      1;

     }) || die($db->error);
 
     }) || die($db->error);
 

-    $self->{contact} = SL::DB::Contact->new();
+    $self->{contact} = $self->_new_contact_object;

   }
 
   $self->action_edit();
   }
 
   $self->action_edit();


@@ -357,7 +411,7 @@ sub action_delete_shipto {
     SL::Helper::Flash::flash('error', $::locale->text('No shipto selected to delete'));
   } else {
 
     SL::Helper::Flash::flash('error', $::locale->text('No shipto selected to delete'));
   } else {
 

-    $db->do_transaction(sub {
+    $db->with_transaction(sub {

       if ( $self->{shipto}->used ) {
         $self->{shipto}->detach();
         $self->{shipto}->save(cascade => 1);
       if ( $self->{shipto}->used ) {
         $self->{shipto}->detach();
         $self->{shipto}->save(cascade => 1);


@@ -366,6 +420,8 @@ sub action_delete_shipto {
         $self->{shipto}->delete(cascade => 1);
         SL::Helper::Flash::flash('info', $::locale->text('Shipto deleted.'));
       }
         $self->{shipto}->delete(cascade => 1);
         SL::Helper::Flash::flash('info', $::locale->text('Shipto deleted.'));
       }

+
+      1;

     }) || die($db->error);
 
     $self->{shipto} = SL::DB::Shipto->new();
     }) || die($db->error);
 
     $self->{shipto} = SL::DB::Shipto->new();


@@ -469,7 +525,8 @@ sub action_get_delivery {
        ON p.id = i.parts_id
 
      LEFT JOIN oe
        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";
 
      ${where}
      ORDER BY ${arap}.transdate DESC LIMIT 15";


@@ -482,16 +539,19 @@ sub action_get_delivery {
 sub action_ajaj_get_shipto {
   my ($self) = @_;
 
 sub action_ajaj_get_shipto {
   my ($self) = @_;
 

-  my $data = {
+  my $data = {};
+  $data->{shipto} = {

     map(
       {
         my $name = 'shipto'. $_;
         $name => $self->{shipto}->$name;
       }
     map(
       {
         my $name = 'shipto'. $_;
         $name => $self->{shipto}->$name;
       }

-      qw(_id name department_1 department_2 street zipcode city country contact phone fax email)
+      qw(_id name department_1 department_2 street zipcode city gln country contact phone fax email)

     )
   };
 
     )
   };
 

+  $data->{shipto_cvars} = $self->_prepare_cvar_configs_for_ajaj($self->{shipto}->cvars_by_config);
+

   $self->render(\SL::JSON::to_json($data), { type => 'json', process => 0 });
 }
 
   $self->render(\SL::JSON::to_json($data), { type => 'json', process => 0 });
 }
 


@@ -518,57 +578,70 @@ sub action_ajaj_get_contact {
     )
   };
 
     )
   };
 

-  $data->{contact_cvars} = {
-    map(
-      {
-        if ( $_->config->type eq 'number' ) {
-          $_->config->name => $::form->format_amount(\%::myconfig, $_->value, -2);
-        } else {
-          $_->config->name => $_->value;
-        }
-      }
-      grep(
-        { $_->is_valid; }
-        @{$self->{contact}->cvars_by_config}
-      )
-    )
-  };
+  $data->{contact_cvars} = $self->_prepare_cvar_configs_for_ajaj($self->{contact}->cvars_by_config);

 
   $self->render(\SL::JSON::to_json($data), { type => 'json', process => 0 });
 }
 
 
   $self->render(\SL::JSON::to_json($data), { type => 'json', process => 0 });
 }
 

-sub action_ajaj_customer_autocomplete {
+sub action_ajaj_autocomplete {

   my ($self, %params) = @_;
 
   my ($self, %params) = @_;
 

-  my $limit = $::form->{limit} || 20;
-  my $type  = $::form->{type}  || {};
-  my $query = { ilike => '%'. $::form->{term} .'%' };
+  my ($model, $manager, $number, $matches);
+
+  # first see if this is customer or vendor picking
+  if ($::form->{type} eq 'customer') {
+     $model   = $self->customer_models;
+     $manager = 'SL::DB::Manager::Customer';
+     $number  = 'customernumber';
+  } elsif ($::form->{type} eq 'vendor')  {
+     $model   = $self->vendor_models;
+     $manager = 'SL::DB::Manager::Vendor';
+     $number  = 'vendornumber';
+  } else {
+     die "unknown type $::form->{type}";
+  }

 
 

-  my @filter;
-  push(
-    @filter,
-    $::form->{column} ? ($::form->{column} => $query) : (or => [ customernumber => $query, name => $query ])
-  );
+  # if someone types something, and hits enter, assume he entered the full name.
+  # if something matches, treat that as sole match
+  # unfortunately get_models can't do more than one per package atm, so we d it
+  # the oldfashioned way.
+  if ($::form->{prefer_exact}) {
+    my $exact_matches;
+    if (1 == scalar @{ $exact_matches = $manager->get_all(
+      query => [
+        obsolete => 0,
+        (salesman_id => SL::DB::Manager::Employee->current->id) x !$::auth->assert('customer_vendor_all_edit', 1),
+        or => [
+          name    => { ilike => $::form->{filter}{'all:substr:multi::ilike'} },
+          $number => { ilike => $::form->{filter}{'all:substr:multi::ilike'} },
+        ]
+      ],
+      limit => 2,
+    ) }) {
+      $matches = $exact_matches;
+    }
+  }

 
 

-  my $customers = SL::DB::Manager::Customer->get_all(query => [ @filter ], limit => $limit);
-  my $value_col = $::form->{column} || 'name';
+  $matches //= $model->get;
+
+  my @hashes = map {
+   +{
+     value       => $_->displayable_name,
+     label       => $_->displayable_name,
+     id          => $_->id,
+     $number     => $_->$number,
+     name        => $_->name,
+     type        => $::form->{type},
+     cvars       => { map { ($_->config->name => { value => $_->value_as_text, is_valid => $_->is_valid }) } @{ $_->cvars_by_config } },
+    }
+  } @{ $matches };

 
 

-  my $data = [
-    map(
-      {
-        {
-          value => $_->can($value_col)->($_),
-          label => $_->displayable_name,
-          id    => $_->id,
-          customernumber => $_->customernumber,
-          name  => $_->name,
-        }
-      }
-      @{$customers}
-    )
-  ];
+  $self->render(\ SL::JSON::to_json(\@hashes), { layout => 0, type => 'json', process => 0 });
+}

 
 

-  $self->render(\SL::JSON::to_json($data), { layout => 0, type => 'json' });
+sub action_test_page {
+  $::request->{layout}->add_javascripts('autocomplete_customer.js');
+  $_[0]->render('customer_vendor/test_page');

 }
 
 sub is_vendor {
 }
 
 sub is_vendor {


@@ -587,7 +660,7 @@ sub is_orphaned {
   }
 
   my $arap      = $self->is_vendor ? 'ap' : 'ar';
   }
 
   my $arap      = $self->is_vendor ? 'ap' : 'ar';

-  my $num_args  = 2;
+  my $num_args  = 3;

 
   my $cv = $self->is_vendor ? 'vendor' : 'customer';
 
 
   my $cv = $self->is_vendor ? 'vendor' : 'customer';
 


@@ -602,6 +675,13 @@ sub is_orphaned {
     SELECT a.id
     FROM oe a
     JOIN '. $cv .' ct ON (a.'. $cv .'_id = ct.id)
     SELECT a.id
     FROM oe a
     JOIN '. $cv .' ct ON (a.'. $cv .'_id = ct.id)

+    WHERE ct.id = ?
+
+    UNION
+
+    SELECT a.id
+    FROM delivery_orders a
+    JOIN '. $cv .' ct ON (a.'. $cv .'_id = ct.id)

     WHERE ct.id = ?';
 
 
     WHERE ct.id = ?';
 
 


@@ -617,6 +697,17 @@ sub is_orphaned {
   return $self->{_is_orphaned} = !$dummy;
 }
 
   return $self->{_is_orphaned} = !$dummy;
 }
 

+sub _copy_form_to_cvars {
+  my ($self, %params) = @_;
+
+  foreach my $cvar (@{ $params{target}->cvars_by_config }) {
+    my $value = $params{source}->{$cvar->config->name};
+    $value    = $::form->parse_amount(\%::myconfig, $value) if $cvar->config->type eq 'number';
+
+    $cvar->value($value);
+  }
+}
+

 sub _instantiate_args {
   my ($self) = @_;
 
 sub _instantiate_args {
   my ($self) = @_;
 


@@ -629,11 +720,7 @@ sub _instantiate_args {
       $self->{cv} = SL::DB::Customer->new(id => $::form->{cv}->{id})->load();
     }
   } else {
       $self->{cv} = SL::DB::Customer->new(id => $::form->{cv}->{id})->load();
     }
   } else {

-    if ( $self->is_vendor() ) {
-      $self->{cv} = SL::DB::Vendor->new();
-    } else {
-      $self->{cv} = SL::DB::Customer->new();
-    }
+    $self->{cv} = $self->_new_customer_vendor_object;

   }
   $self->{cv}->assign_attributes(%{$::form->{cv}});
 
   }
   $self->{cv}->assign_attributes(%{$::form->{cv}});
 


@@ -641,16 +728,7 @@ sub _instantiate_args {
     $self->{cv}->taxincluded_checked(undef);
   }
 
     $self->{cv}->taxincluded_checked(undef);
   }
 

-
-  foreach my $cvar (@{$self->{cv}->cvars_by_config()}) {
-    my $value = $::form->{cv_cvars}->{$cvar->config->name};
-
-    if ( $cvar->config->type eq 'number' ) {
-      $value = $::form->parse_amount(\%::myconfig, $value);
-    }
-
-    $cvar->value($value);
-  }
+  $self->{cv}->hourly_rate($::instance_conf->get_customer_hourly_rate) if $self->is_customer && !$self->{cv}->hourly_rate;

 
   if ( $::form->{note}->{id} ) {
     $self->{note} = SL::DB::Note->new(id => $::form->{note}->{id})->load();
 
   if ( $::form->{note}->{id} ) {
     $self->{note} = SL::DB::Note->new(id => $::form->{note}->{id})->load();


@@ -684,19 +762,13 @@ sub _instantiate_args {
   if ( $::form->{contact}->{cp_id} ) {
     $self->{contact} = SL::DB::Contact->new(cp_id => $::form->{contact}->{cp_id})->load();
   } else {
   if ( $::form->{contact}->{cp_id} ) {
     $self->{contact} = SL::DB::Contact->new(cp_id => $::form->{contact}->{cp_id})->load();
   } else {

-    $self->{contact} = SL::DB::Contact->new();
+    $self->{contact} = $self->_new_contact_object;

   }
   $self->{contact}->assign_attributes(%{$::form->{contact}});
 
   }
   $self->{contact}->assign_attributes(%{$::form->{contact}});
 

-  foreach my $cvar (@{$self->{contact}->cvars_by_config()}) {
-    my $value = $::form->{contact_cvars}->{$cvar->config->name};
-
-    if ( $cvar->config->type eq 'number' ) {
-      $value = $::form->parse_amount(\%::myconfig, $value);
-    }
-
-    $cvar->value($value);
-  }
+  $self->_copy_form_to_cvars(target => $self->{cv},      source => $::form->{cv_cvars});
+  $self->_copy_form_to_cvars(target => $self->{contact}, source => $::form->{contact_cvars});
+  $self->_copy_form_to_cvars(target => $self->{shipto},  source => $::form->{shipto_cvars});

 }
 
 sub _load_customer_vendor {
 }
 
 sub _load_customer_vendor {


@@ -735,18 +807,24 @@ sub _load_customer_vendor {
       die($::locale->text('Error'));
     }
   } else {
       die($::locale->text('Error'));
     }
   } else {

-    $self->{contact} = SL::DB::Contact->new();
+    $self->{contact} = $self->_new_contact_object;

   }
 }
 
   }
 }
 

+sub _check_customer_vendor_all_edit {
+  my ($self) = @_;
+
+  unless ($::auth->assert('customer_vendor_all_edit', 1)) {
+    die($::locale->text("You don't have the rights to edit this customer.") . "\n")
+      if $self->{cv}->is_customer and
+         SL::DB::Manager::Employee->current->id != $self->{cv}->salesman_id;
+  };
+};
+

 sub _create_customer_vendor {
   my ($self) = @_;
 
 sub _create_customer_vendor {
   my ($self) = @_;
 

-  if ( $self->is_vendor() ) {
-    $self->{cv} = SL::DB::Vendor->new();
-  } else {
-    $self->{cv} = SL::DB::Customer->new();
-  }
+  $self->{cv} = $self->_new_customer_vendor_object;

   $self->{cv}->currency_id($::instance_conf->get_currency_id());
 
   $self->{note} = SL::DB::Note->new();
   $self->{cv}->currency_id($::instance_conf->get_currency_id());
 
   $self->{note} = SL::DB::Note->new();


@@ -755,7 +833,7 @@ sub _create_customer_vendor {
 
   $self->{shipto} = SL::DB::Shipto->new();
 
 
   $self->{shipto} = SL::DB::Shipto->new();
 

-  $self->{contact} = SL::DB::Contact->new();
+  $self->{contact} = $self->_new_contact_object;

 }
 
 sub _pre_render {
 }
 
 sub _pre_render {


@@ -801,7 +879,7 @@ sub _pre_render {
 
   $self->{all_languages} = SL::DB::Manager::Language->get_all();
 
 
   $self->{all_languages} = SL::DB::Manager::Language->get_all();
 

-  $self->{all_taxzones} = SL::DB::Manager::TaxZone->get_all();
+  $self->{all_taxzones} = SL::DB::Manager::TaxZone->get_all_sorted();

 
   if ( $::instance_conf->get_vertreter() ) {
     $query =
 
   if ( $::instance_conf->get_vertreter() ) {
     $query =


@@ -824,11 +902,14 @@ sub _pre_render {
     $self->{all_salesmen} = SL::DB::Manager::Employee->get_all(query => [ or => [ id => $self->{cv}->salesman_id,  deleted => 0 ] ]);
   }
 
     $self->{all_salesmen} = SL::DB::Manager::Employee->get_all(query => [ or => [ id => $self->{cv}->salesman_id,  deleted => 0 ] ]);
   }
 

-  $self->{all_payment_terms} = SL::DB::Manager::PaymentTerm->get_all();
+  $self->{all_payment_terms} = SL::DB::Manager::PaymentTerm->get_all_sorted(where => [ or => [ id       => $self->{cv}->payment_id,
+                                                                                               obsolete => 0 ] ]);

 
   $self->{all_delivery_terms} = SL::DB::Manager::DeliveryTerm->get_all();
 
 
   $self->{all_delivery_terms} = SL::DB::Manager::DeliveryTerm->get_all();
 

-  $self->{all_pricegroups} = SL::DB::Manager::Pricegroup->get_all();
+  if ($self->{cv}->is_customer) {
+    $self->{all_pricegroups} = SL::DB::Manager::Pricegroup->get_all_sorted(query => [ or => [ id => $self->{cv}->pricegroup_id, obsolete => 0 ] ]);
+  }

 
   $query =
     'SELECT DISTINCT(cp_abteilung) AS department
 
   $query =
     'SELECT DISTINCT(cp_abteilung) AS department


@@ -860,11 +941,96 @@ sub _pre_render {
 
   $::request->{layout}->add_javascripts('autocomplete_customer.js');
   $::request->{layout}->add_javascripts('kivi.CustomerVendor.js');
 
   $::request->{layout}->add_javascripts('autocomplete_customer.js');
   $::request->{layout}->add_javascripts('kivi.CustomerVendor.js');

+  $::request->{layout}->add_javascripts('kivi.File.js');
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add_actions("combobox");
+    $bar->actions->[-1]->add_actions([ t8('Save'),
+      submit => [ '#form', { action_save           => 1 } ],
+      checks => [ 'check_taxzone_and_ustid' ],
+    ]);
+     $bar->actions->[-1]->add_actions([ t8('Save and Close'),
+      submit => [ '#form', { action_save_and_close => 1 } ],
+      checks => [ 'check_taxzone_and_ustid' ],
+    ]);
+    $bar->add_actions('combobox');
+    $bar->actions->[-1]->add_actions([ t8('Workflow'),
+      disabled => 1,
+    ]);
+    $bar->actions->[-1]->add_actions([ t8('Save and AP Transaction'),
+      submit => [ '#form', { action_save_and_ap_transaction => 1 } ],
+      checks => [ 'check_taxzone_and_ustid' ],
+    ]) if $self->is_vendor;
+    $bar->actions->[-1]->add_actions([ t8('Save and AR Transaction'),
+      submit => [ '#form', { action_save_and_ar_transaction => 1 } ],
+      checks => [ 'check_taxzone_and_ustid' ],
+    ]) if !$self->is_vendor;
+    $bar->actions->[-1]->add_actions([ t8('Save and Invoice'),
+      submit => [ '#form', { action_save_and_invoice => 1 } ],
+      checks => [ 'check_taxzone_and_ustid' ],
+    ]);
+    $bar->actions->[-1]->add_actions([ t8('Save and Order'),
+      submit => [ '#form', { action_save_and_order => 1 } ],
+      checks => [ 'check_taxzone_and_ustid' ],
+    ]);
+    $bar->actions->[-1]->add_actions([ t8('Save and RFQ'),
+      submit => [ '#form', { action_save_and_rfq => 1 } ],
+      checks => [ 'check_taxzone_and_ustid' ],
+    ]) if $self->is_vendor;
+    $bar->actions->[-1]->add_actions([ t8('Save and Quotation'),
+      submit => [ '#form', { action_save_and_quotation => 1 } ],
+      checks => [ 'check_taxzone_and_ustid' ],
+    ]) if !$self->is_vendor;
+    $bar->add_actions([ t8('Delete'),
+      submit => [ '#form', { action_delete         => 1 } ],
+      confirm => t8('Do you really want to delete this object?'),
+      disabled => !$self->{cv}->id || !$self->is_orphaned,
+    ]);
+    $bar->add_actions('separator');
+    $bar->add_actions([ t8('History'),
+      call     => [ 'kivi.CustomerVendor.showHistoryWindow', $self->{cv}->id ],
+      disabled => !$self->{cv}->id,
+    ]);
+  }
+}
+
+sub _prepare_cvar_configs_for_ajaj {
+  my ($self, $cvars) = @_;
+
+  return {
+    map {
+      my $cvar   = $_;
+      my $result = { type => $cvar->config->type };
+
+      if ($cvar->config->type eq 'number') {
+        $result->{value} = $::form->format_amount(\%::myconfig, $cvar->value, -2);
+
+      } elsif ($result->{type} eq 'date') {
+        $result->{value} = $cvar->value ? $cvar->value->to_kivitendo : undef;
+
+      } elsif ($result->{type} =~ m{customer|vendor|part}) {
+        my $object       = $cvar->value;
+        my $method       = $result->{type} eq 'part' ? 'description' : 'name';
+
+        $result->{id}    = int($cvar->number_value) || undef;
+        $result->{value} = $object ? $object->$method // '' : '';
+
+      } else {
+        $result->{value} = $cvar->value;
+      }
+
+      ( $cvar->config->name => $result )
+
+    } grep { $_->is_valid } @{ $cvars }
+  };

 }
 
 sub normalize_name {
   my ($self) = @_;
 
 }
 
 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+$//;
   return unless $self->{cv};
   my $name = $self->{cv}->name;
   $name =~ s/\s+$//;


@@ -873,4 +1039,67 @@ sub normalize_name {
   $self->{cv}->name($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;
+}
+
+sub init_customer_models {
+  my ($self) = @_;
+
+  SL::Controller::Helper::GetModels->new(
+    controller   => $self,
+    model        => 'Customer',
+    sorted => {
+      _default  => {
+        by => 'customernumber',
+        dir  => 1,
+      },
+      customernumber => t8('Customer Number'),
+    },
+    query => [
+     ( salesman_id => SL::DB::Manager::Employee->current->id) x !$::auth->assert('customer_vendor_all_edit', 1),
+    ],
+  );
+}
+
+sub init_vendor_models {
+  my ($self) = @_;
+
+  SL::Controller::Helper::GetModels->new(
+    controller => $self,
+    model      => 'Vendor',
+    sorted => {
+      _default  => {
+        by => 'vendornumber',
+        dir  => 1,
+      },
+      vendornumber => t8('Vendor Number'),
+    },
+  );
+}
+
+sub _new_customer_vendor_object {
+  my ($self) = @_;
+
+  my $class  = 'SL::DB::' . ($self->is_vendor ? 'Vendor' : 'Customer');
+  return $class->new(
+    contacts         => [],
+    shipto           => [],
+    custom_variables => [],
+  );
+}
+
+sub _new_contact_object {
+  my ($self) = @_;
+
+  return SL::DB::Contact->new(custom_variables => []);
+}
+

 1;
 1;