From: Jan Büren <jan@lx-office-hosting.de>
Date: Tue, 8 Mar 2011 09:11:45 +0000 (+0100)
Subject: Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
X-Git-Tag: release-2.6.3~53
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/7b5835061e81d1af578e1572e435d6f3e61d2989?hp=-c

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

7b5835061e81d1af578e1572e435d6f3e61d2989
diff --combined SL/Form.pm
index 1db5a6541,1a2573960..33b3d04bf
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@@ -629,6 -629,8 +629,8 @@@ sub create_http_response 
    $cgi_params{'-charset'} = $params{charset} if ($params{charset});
    $cgi_params{'-cookie'}  = $session_cookie  if ($session_cookie);
  
+   map { $cgi_params{'-' . $_} = $params{$_} if exists $params{$_} } qw(content_disposition content_length);
+ 
    my $output = $cgi->header(%cgi_params);
  
    $main::lxdebug->leave_sub();
@@@ -2459,8 -2461,7 +2461,8 @@@ sub _get_warehouses 
    $self->{$key} = selectall_hashref_query($self, $dbh, $query);
  
    if ($bins_key) {
 -    $query = qq|SELECT id, description FROM bin WHERE warehouse_id = ?|;
 +    $query = qq|SELECT id, description FROM bin WHERE warehouse_id = ?
 +                ORDER BY description|;
      my $sth = prepare_query($self, $dbh, $query);
  
      foreach my $warehouse (@{ $self->{$key} }) {