Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp

diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm
index 8a8d5bbcf50263211e27b9a19ee0e73f392ee746..3bf120668f919f0d3b17cb83308795f57f981547 100644 (file)
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@ -231,11 +231,11 @@ sub handle_request {
   # cleanup
   $::locale   = undef;
   $::form     = undef;
-  $::auth     = undef;
   $::myconfig = ();
   Form::disconnect_standard_dbh;
   $::auth->expire_session_keys->save_session;
   $::auth->dbdisconnect;
+  $::auth     = undef;
 
   $::lxdebug->end_request;
   $::lxdebug->leave_sub;

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index e1076ef9cecce2b3459f38271686a6c968747f9f..9f57eabf92f2d4994f747473123d03cf95b3a6cd 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -332,7 +332,7 @@ sub form_header {
   my @values = map { $_       } @{ $form->{ALL_CURRENCIES} };
   my %labels = map { $_ => $_ } @{ $form->{ALL_CURRENCIES} };
   $form->{currency}            = $form->{defaultcurrency} unless $form->{currency};
-  $TMPL_VAR{show_exchangerate} = $form->{currency} ne $form->{defaultcurrency};
+  $form->{show_exchangerate}   = $form->{currency} ne $form->{defaultcurrency};
   $TMPL_VAR{currencies}        = NTI($::cgi->popup_menu('-name' => 'currency', '-default' => $form->{"currency"},
                                                       '-values' => \@values, '-labels' => \%labels)) if scalar @values;
   push @custom_hiddens, "forex";

diff --git a/templates/webpages/is/_payments.html b/templates/webpages/is/_payments.html
index 1c39b20e3a56fb7f571269e39fbcbd235fb8ae57..2809c38645cd52a6e3a4077fe8c538e82136fcec 100644 (file)
--- a/templates/webpages/is/_payments.html
+++ b/templates/webpages/is/_payments.html
@@ -49,7 +49,7 @@
   [% ELSE %]
         <input name="exchangerate_[% i %]" size="10" value="[% LxERP.format_amount($exchangerate, 2, 1) %]">
   [% END %]
-        <input type="hidden" name="forex_[% i %]" value="[% $forex %]">;
+        <input type="hidden" name="forex_[% i %]" value="[% $forex %]">
      </td>
 [% END %]
      <td align="center"><select name="AR_paid_[% i %]">[% $selectAR_paid_ref %]</select></td>