Auf CustomerVendor auf currency_id umgestellt

diff --git a/SL/Controller/CustomerVendor.pm b/SL/Controller/CustomerVendor.pm
index 9becb61da3a0ac56a13f1e0bf92ad01615417c23..8d2f96a39f22a17221b9068fcbd051bfa374f68c 100644 (file)
--- a/SL/Controller/CustomerVendor.pm
+++ b/SL/Controller/CustomerVendor.pm
@@ -19,6 +19,7 @@ use SL::DB::Pricegroup;
 use SL::DB::Contact;
 use SL::DB::FollowUp;
 use SL::DB::History;
 use SL::DB::Contact;
 use SL::DB::FollowUp;
 use SL::DB::History;

+use SL::DB::Currency;

 
 # safety
 __PACKAGE__->run_before(
 
 # safety
 __PACKAGE__->run_before(


@@ -727,18 +728,7 @@ sub _pre_render {
     )
   ];
 
     )
   ];
 

-  $query =
-    'SELECT curr
-     FROM defaults';
-  my $curr = selectall_hashref_query($::form, $dbh, $query)->[0]->{curr};
-  my @currencies = grep(
-    { $_; }
-    map(
-      { s/\s//g; $_; }
-      split(m/:/, $curr)
-    )
-  );
-  $self->{all_currencies} = \@currencies;
+  $self->{all_currencies} = SL::DB::Manager::Currency->get_all();

 
   $self->{all_languages} = SL::DB::Manager::Language->get_all();
 
 
   $self->{all_languages} = SL::DB::Manager::Language->get_all();
 

diff --git a/templates/webpages/customer_vendor/form.html b/templates/webpages/customer_vendor/form.html
index bb84e9bb1372b97962e3b52db441cb96de015942..dd12e75eaa58c372dfc37eac953d172de2e4326b 100644 (file)
--- a/templates/webpages/customer_vendor/form.html
+++ b/templates/webpages/customer_vendor/form.html
@@ -293,7 +293,7 @@
             <th align="right">[% 'Currency' | $T8 %]</th>
 
             <td>
             <th align="right">[% 'Currency' | $T8 %]</th>
 
             <td>

-              [% L.select_tag('cv.curr', SELF.all_currencies, default = SELF.cv.curr, with_empty = 1) %]
+              [% L.select_tag('cv.currency_id', SELF.all_currencies, title_key = 'name', value_key = 'id', default = SELF.cv.currency_id, with_empty = 1) %]

             </td>
           [% END %]
         </tr>
             </td>
           [% END %]
         </tr>