From: Bernd Blessmann <bibi@online.de>
Date: Wed, 12 Oct 2011 13:51:17 +0000 (+0200)
Subject: Merge branch 'master' of git@vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-2.7.0beta1~230^2~1^2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/80b36869dd9b1ff2ed9063fabe79ca5001dc276e?ds=inline;hp=-c

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

80b36869dd9b1ff2ed9063fabe79ca5001dc276e
diff --combined SL/Form.pm
index a5c2abec9,6226017f2..a1bb2b1f3
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@@ -697,13 -697,13 +697,13 @@@ sub header 
    push @header, "<link rel='shortcut icon' href='$self->{favicon}' type='image/x-icon'>" if -f $self->{favicon};
    push @header, '<script type="text/javascript" src="js/jquery.js"></script>',
                  '<script type="text/javascript" src="js/common.js"></script>',
-                 '<style type="text/css">@import url(js/jscalendar/calendar-win2k-1.css);</style>',
+                 '<link rel="stylesheet" type="text/css" href="js/jscalendar/calendar-win2k-1.css">',
                  '<script type="text/javascript" src="js/jscalendar/calendar.js"></script>',
                  '<script type="text/javascript" src="js/jscalendar/lang/calendar-de.js"></script>',
                  '<script type="text/javascript" src="js/jscalendar/calendar-setup.js"></script>',
                  '<script type="text/javascript" src="js/part_selection.js"></script>',
                  '<script type="text/javascript" src="js/jquery-ui.js"></script>',
-                 '<style "type=text/css">@import url("css/ui-lightness/jquery-ui-1.8.12.custom.css")</style>';
+                 '<link rel="stylesheet" type="text/css" href="css/ui-lightness/jquery-ui-1.8.12.custom.css">';
    push @header, $self->{javascript} if $self->{javascript};
    push @header, map { $_->show_javascript } @{ $self->{AJAX} || [] };
    push @header, "<script type='text/javascript'>function fokus(){ document.$self->{fokus}.focus(); }</script>" if $self->{fokus};
@@@ -2968,9 -2968,6 +2968,9 @@@ sub create_links 
        $self->{$key} = $ref->{$key};
      }
  
 +    # remove any trailing whitespace
 +    $self->{currency} =~ s/\s*$//;
 +
      my $transdate = "current_date";
      if ($self->{transdate}) {
        $transdate = $dbh->quote($self->{transdate});
@@@ -3147,9 -3144,6 +3147,9 @@@ sub lastname_used 
  
    map { $self->{$_} = $ref->{$_} } values %column_map;
  
 +  # remove any trailing whitespace
 +  $self->{currency} =~ s/\s*$// if $self->{currency};
 +
    $main::lxdebug->leave_sub();
  }