X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/e0f5deeae4cdcf3faf3bc68a202f20ec6cd9af2e..1ce68041a1923c60a6608a2ed6365f5915bacd9a:/SL/Controller/CustomerVendor.pm

diff --git a/SL/Controller/CustomerVendor.pm b/SL/Controller/CustomerVendor.pm
index d12fc6edf..112e751d1 100644
--- a/SL/Controller/CustomerVendor.pm
+++ b/SL/Controller/CustomerVendor.pm
@@ -901,11 +901,14 @@ sub _pre_render {
     $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_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
@@ -937,6 +940,7 @@ sub _pre_render {
 
   $::request->{layout}->add_javascripts('autocomplete_customer.js');
   $::request->{layout}->add_javascripts('kivi.CustomerVendor.js');
+  $::request->{layout}->add_javascripts('kivi.File.js');
 }
 
 sub _prepare_cvar_configs_for_ajaj {