Kreditorenbuchungen: Währungs-Drop-Down nicht als Hidden mitschleifen

diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index ca88e920cf7c9f8ca93c92102034f56796b2f71b..5388714eb1239831c5d63f8209e9d3c649ef52e7 100644 (file)
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -42,6 +42,7 @@ use SL::GL;
 use SL::IR;
 use SL::IS;
 use SL::ReportGenerator;
 use SL::IR;
 use SL::IS;
 use SL::ReportGenerator;

+use SL::DB::Currency;

 use SL::DB::Default;
 use SL::DB::PurchaseInvoice;
 use SL::Webdav;
 use SL::DB::Default;
 use SL::DB::PurchaseInvoice;
 use SL::Webdav;


@@ -185,9 +186,6 @@ sub create_links {
   # currencies
   $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
 
   # currencies
   $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
 

-  $form->{selectcurrency} = "";
-  map { my $quoted = H($_); $form->{selectcurrency} .= "<option value=\"${quoted}\">${quoted}\n" } $form->get_all_currencies(\%myconfig);
-

   # vendors
   if (@{ $form->{all_vendor} || [] }) {
     $form->{vendor} = qq|$form->{vendor}--$form->{vendor_id}|;
   # vendors
   if (@{ $form->{all_vendor} || [] }) {
     $form->{vendor} = qq|$form->{vendor}--$form->{vendor_id}|;


@@ -248,7 +246,7 @@ sub form_header {
   # type=submit $locale->text('Edit Accounts Payables Transaction')
 
   # set option selected
   # type=submit $locale->text('Edit Accounts Payables Transaction')
 
   # set option selected

-  foreach my $item (qw(vendor currency)) {
+  foreach my $item (qw(vendor)) {

     my $to_replace         =  H($form->{$item});
     $form->{"select$item"} =~ s/ selected//;
     $form->{"select$item"} =~ s/>\Q${to_replace}\E/ selected>${to_replace}/;
     my $to_replace         =  H($form->{$item});
     $form->{"select$item"} =~ s/ selected//;
     $form->{"select$item"} =~ s/>\Q${to_replace}\E/ selected>${to_replace}/;


@@ -427,6 +425,7 @@ sub form_header {
 
   print $form->parse_html_template('ap/form_header', {
     today => DateTime->today,
 
   print $form->parse_html_template('ap/form_header', {
     today => DateTime->today,

+    currencies => SL::DB::Manager::Currency->get_all_sorted,

   });
 
   $main::lxdebug->leave_sub();
   });
 
   $main::lxdebug->leave_sub();

diff --git a/templates/webpages/ap/form_header.html b/templates/webpages/ap/form_header.html
index 9623a712b1ef344be89128c1a6a3979e4c846859..9f4ee97d71f33ca87d760f3c39b0a1da7a4f830f 100644 (file)
--- a/templates/webpages/ap/form_header.html
+++ b/templates/webpages/ap/form_header.html
@@ -6,7 +6,6 @@
 <form method="post" action="[% script | html %]">
 
 <input type="hidden" name="selectvendor" value="[% selectvendor | html %]">
 <form method="post" action="[% script | html %]">
 
 <input type="hidden" name="selectvendor" value="[% selectvendor | html %]">

-<input type="hidden" name="selectcurrency" value="[% selectcurrency | html %]">

 
 <input type="hidden" name="oldvendor" value="[% oldvendor | html %]">
 <input type="hidden" name="vendor_id" value="[% vendor_id | html %]">
 
 <input type="hidden" name="oldvendor" value="[% oldvendor | html %]">
 <input type="hidden" name="vendor_id" value="[% vendor_id | html %]">


@@ -113,7 +112,7 @@
 
               <tr>
                 <th align="right" nowrap>[% 'Currency' | $T8 %]</th>
 
               <tr>
                 <th align="right" nowrap>[% 'Currency' | $T8 %]</th>

-                <td><select name="currency">[% selectcurrency %]</select></td>
+                <td>[% L.select_tag("currency", currencies, default=currency, value_key="name", title_key="name") %]</td>

 
                 [% IF ( defaultcurrency && (currency != defaultcurrency) ) %]
                   <th align=right>[% 'Exchangerate' | $T8 %]</th>
 
                 [% IF ( defaultcurrency && (currency != defaultcurrency) ) %]
                   <th align=right>[% 'Exchangerate' | $T8 %]</th>